From 4f3366a19988c2fe5ff2d7645b4198ae440f7255 Mon Sep 17 00:00:00 2001 From: gerald <gerald.moesenlechner@univie.ac.at> Date: Wed, 13 Sep 2023 16:16:13 +0200 Subject: [PATCH] Cleanup of duplicate files --- matlab_model/HFS_Wrapper.cpp | 87 ----------------------------------- matlab_model/HFS_Wrapper.hpp | 9 ---- src/HFS_Wrapper.m | 28 ----------- src/HFS_bus.mat | Bin 2737 -> 0 bytes 4 files changed, 124 deletions(-) delete mode 100644 matlab_model/HFS_Wrapper.cpp delete mode 100644 matlab_model/HFS_Wrapper.hpp delete mode 100644 src/HFS_Wrapper.m delete mode 100644 src/HFS_bus.mat diff --git a/matlab_model/HFS_Wrapper.cpp b/matlab_model/HFS_Wrapper.cpp deleted file mode 100644 index cc0ed8e..0000000 --- a/matlab_model/HFS_Wrapper.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/** -* @file HFS_Wrapper.cpp -* @author Gerald Mösenlechner (gerald.moesenlechner@univie.ac.at) -* @date May, 2022 -* -* @copyright -* This program is free software; you can redistribute it and/or modify it -* under the terms and conditions of the GNU General Public License, -* version 2, as published by the Free Software Foundation. -* -* This program is distributed in the hope it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* @brief Code for the Matlab Simulink S-function implementation example -* -* -* ## Overview -* This file contains functions to be used for the implementation of the HFS -* using the Matlab legacy code tool -* -*/ - -#include "../src/HFS_API.hpp" - -FGS* fgsSim; - -/** - * @brief Method to be used in legacy code tool of Matlab for creating FGS obj. - * - * @param config: Configuration file - * - */ - -void createFGS() -{ - fgsSim = new FGS("./HFS_config_model.xml"); -} - -/** - * @brief Method to be used in legacy code tool of Matlab for deleting FGS obj. - * - */ - -void deleteFGS() -{ - delete fgsSim; -} - -/** - * @brief Method to be used in legacy code tool of Matlab - * - * @param fgs: FGS object to store state of simulation - * @param update: hfs parameters for update of state - * - * @return centroid packet containing the measurement - */ - -void updateFGS(hfs_parameters *update, centroid_packet *output) -{ - hfs_parameters u_new; - - u_new.mode = update -> mode; - u_new.channel = update -> channel; - u_new.ang_rate[0] = update -> ang_rate[0]; - u_new.ang_rate[1] = update -> ang_rate[1]; - u_new.ang_rate[2] = update -> ang_rate[2]; - u_new.position_quat[0] = update -> position_quat[0]; - u_new.position_quat[1] = update -> position_quat[1]; - u_new.position_quat[2] = update -> position_quat[2]; - u_new.position_quat[3] = update -> position_quat[3]; - u_new.time = update -> time; - u_new.reset = update -> reset; - u_new.save = update -> save; - u_new.set_invalid = update -> set_invalid; - u_new.validation_signal = update -> validation_signal; - u_new.set_error = update -> set_error; - u_new.add_shift_x = update -> add_shift_x; - u_new.add_shift_y = update -> add_shift_y; - u_new.mult_shift_x = update -> mult_shift_x; - u_new.mult_shift_y = update -> mult_shift_y; - u_new.target_pos_x = update -> target_pos_x; - u_new.target_pos_y = update -> target_pos_y; - - fgsSim -> set_params(u_new, output); - -} diff --git a/matlab_model/HFS_Wrapper.hpp b/matlab_model/HFS_Wrapper.hpp deleted file mode 100644 index b9b4692..0000000 --- a/matlab_model/HFS_Wrapper.hpp +++ /dev/null @@ -1,9 +0,0 @@ -#include "../src/HFS_API.hpp" - -extern FGS *fgsSim; - -extern void createFGS(); - -extern void deleteFGS(); - -extern void updateFGS(hfs_parameters*, centroid_packet*); diff --git a/src/HFS_Wrapper.m b/src/HFS_Wrapper.m deleted file mode 100644 index fac6b2c..0000000 --- a/src/HFS_Wrapper.m +++ /dev/null @@ -1,28 +0,0 @@ -%% Example Simulink S-Function block of the HFS using the legacy code tool. -% The function block will have an input and an output bus that are based on the -% hfs_parameters and centroid_packet structs definded in the HFS_API. The buses -% are imported from HFS_bus.mat. The definition of the methos 'createFGS()', -% 'updateFGS' and 'deleteFGS' are given in HFS_Wrapper.cpp and HFS_Wrapper.hpp. -% Note that this example was tested in Matlab Version 2019a under Ubuntu 20.4 -% and might need modification of include paths to work. - -evalin('base','load HFS_bus.mat'); -def = legacy_code('initialize'); -def.SFunctionName = 'FGS_HFS'; -def.StartFcnSpec = 'createFGS()'; -def.OutputFcnSpec = 'void updateFGS(hfs_parameters u1[1], centroid_packet y1[1])'; -def.TerminateFcnSpec = 'deleteFGS()'; -def.HeaderFiles = {'HFS_Wrapper.hpp'}; -def.SourceFiles = {'HFS_Wrapper.cpp'}; -def.IncPaths = {'/usr/include'}; -def.SrcPaths = {'./'}; -def.HostLibFiles = {'libHFS_API.so'} -def.Options.language = 'C++'; -def.Options.useTlcWithAccel = false; - - -legacy_code('generate_for_sim', def); - -legacy_code('rtwmakecfg_generate', def); - -legacy_code('slblock_generate', def); diff --git a/src/HFS_bus.mat b/src/HFS_bus.mat deleted file mode 100644 index 71c5c6015783dd6b76241e1dc990e31d512d3c3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2737 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 -- GitLab