From 0e69ee24b34869e04140bb0edfef7b7459135709 Mon Sep 17 00:00:00 2001 From: andre Ebersold Date: Sat, 18 Nov 2023 09:39:36 +0100 Subject: [PATCH] Removed unsued files related to ParameterHandling --- Application/ShutterCtrl/TouchScrHandler.cpp | 2 +- Platform/DCMotorParameterHandler.cpp | 96 --------------------- Platform/DCMotorParameterHandler.h | 50 ----------- Platform/PowerswitchParameterHandler.cpp | 92 -------------------- Platform/PowerswitchParameterHandler.h | 37 -------- Platform/ShutterCtrlParameterHandler.cpp | 92 -------------------- Platform/ShutterCtrlParameterHandler.h | 37 -------- 7 files changed, 1 insertion(+), 405 deletions(-) delete mode 100644 Platform/DCMotorParameterHandler.cpp delete mode 100644 Platform/DCMotorParameterHandler.h delete mode 100644 Platform/PowerswitchParameterHandler.cpp delete mode 100644 Platform/PowerswitchParameterHandler.h delete mode 100644 Platform/ShutterCtrlParameterHandler.cpp delete mode 100644 Platform/ShutterCtrlParameterHandler.h diff --git a/Application/ShutterCtrl/TouchScrHandler.cpp b/Application/ShutterCtrl/TouchScrHandler.cpp index 75429e7..972a594 100644 --- a/Application/ShutterCtrl/TouchScrHandler.cpp +++ b/Application/ShutterCtrl/TouchScrHandler.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include diff --git a/Platform/DCMotorParameterHandler.cpp b/Platform/DCMotorParameterHandler.cpp deleted file mode 100644 index d7e4f5f..0000000 --- a/Platform/DCMotorParameterHandler.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include - -#include -#include -#include -#include - -#if 0 -DCMotorParameterHandler::ParameterValue -DCMotorParameterHandler::m_Values[PID_MAX] = { 0 }; -#endif -DCMotorParameterHandler::DCMotorParameterHandler() -{ - -} -/// -void -DCMotorParameterHandler::readValue(const uint8_t paramID,uint8_t &_val) -{ - if (paramID < PID_MAX) - { - _val = m_Values[paramID].u.m_U8; - } -} - -/// -void -DCMotorParameterHandler::writeValue(const uint8_t paramID,const uint8_t _val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].u.m_U8 = _val; - if (m_Values[paramID].m_Listener != 0 ) - { - m_Values[paramID].m_Listener->onWriteValue(paramID,_val); - } - } -} - -/// Handle UInt16_t -void -DCMotorParameterHandler::readValue(const uint8_t paramID,uint16_t &_val) -{ - if (paramID < PID_MAX) - { - _val = m_Values[paramID].u.m_U16; - } -} - -/// -void -DCMotorParameterHandler::writeValue(const uint8_t paramID,const uint16_t _val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].u.m_U16 = _val; - if (m_Values[paramID].m_Listener != 0 ) - { - m_Values[paramID].m_Listener->onWriteValue(paramID,m_Values[paramID].u.m_U8); - } - } -} - -/// Handle Float32_t -void -DCMotorParameterHandler::readValue(const uint8_t paramID,Float32_t &_val) -{ - if (paramID < PID_MAX) - { - _val = m_Values[paramID].u.m_Float; - } -} - -/// -void -DCMotorParameterHandler::writeValue(const uint8_t paramID,const Float32_t _val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].u.m_Float = _val; - if (m_Values[paramID].m_Listener != 0 ) - { - m_Values[paramID].m_Listener->onWriteValue(paramID,m_Values[paramID].u.m_Float); - } - } -} - -void -DCMotorParameterHandler::registerListener(const uint8_t paramID,IParameterListener *_val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].m_Listener = _val; - } - -} diff --git a/Platform/DCMotorParameterHandler.h b/Platform/DCMotorParameterHandler.h deleted file mode 100644 index 1b0cd4a..0000000 --- a/Platform/DCMotorParameterHandler.h +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef __DCMOTOR_PARAMETERHANDLER_H__ -#define __DCMOTOR_PARAMETERHANDLER_H__ - - -/** - * @brief storage class - * - */ -class DCMotorParameterHandler : public IParameterHandler -{ -#if 0 - typedef struct _ParameterValue_t - { - union ParameterValue - { - uint8_t m_U8; - uint16_t m_U16; - uint32_t m_U32; - Float32_t m_Float; - } u; - IParameterListener *m_Listener; - } ParameterValue; -#endif - public: - DCMotorParameterHandler(); - /// - virtual void readValue(const uint8_t paramID,uint8_t &_val); - /// - virtual void writeValue(const uint8_t paramID,const uint8_t _val); - /// - virtual void readValue(const uint8_t paramID,uint16_t &_val); - /// - virtual void writeValue(const uint8_t paramID,const uint16_t _val); - /// - virtual void readValue(const uint8_t paramID,uint32_t &_val) {}; - /// - virtual void writeValue(const uint8_t paramID,const uint32_t _val) {}; - /// - virtual void readValue(const uint8_t paramID,Float32_t &_val) ; - /// - virtual void writeValue(const uint8_t paramID,const Float32_t _val) ; - /// - /// - virtual void registerListener(const uint8_t paramID,IParameterListener *_val); - - - private: -}; - -#endif diff --git a/Platform/PowerswitchParameterHandler.cpp b/Platform/PowerswitchParameterHandler.cpp deleted file mode 100644 index 7797a0c..0000000 --- a/Platform/PowerswitchParameterHandler.cpp +++ /dev/null @@ -1,92 +0,0 @@ -#include - -#include -#include -#include -#include - -PowerswitchParameterHandler::PowerswitchParameterHandler() -{ - -} -/// -void -PowerswitchParameterHandler::readValue(const uint8_t paramID,uint8_t &_val) -{ - if (paramID < PID_MAX) - { - _val = m_Values[paramID].u.m_U8; - } -} - -/// -void -PowerswitchParameterHandler::writeValue(const uint8_t paramID,const uint8_t _val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].u.m_U8 = _val; - if (m_Values[paramID].m_Listener != 0 ) - { - m_Values[paramID].m_Listener->onWriteValue(paramID,_val); - } - } -} - -/// Handle UInt16_t -void -PowerswitchParameterHandler::readValue(const uint8_t paramID,uint16_t &_val) -{ - if (paramID < PID_MAX) - { - _val = m_Values[paramID].u.m_U16; - } -} - -/// -void -PowerswitchParameterHandler::writeValue(const uint8_t paramID,const uint16_t _val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].u.m_U16 = _val; - if (m_Values[paramID].m_Listener != 0 ) - { - m_Values[paramID].m_Listener->onWriteValue(paramID,m_Values[paramID].u.m_U8); - } - } -} - -/// Handle Float32_t -void -PowerswitchParameterHandler::readValue(const uint8_t paramID,Float32_t &_val) -{ - if (paramID < PID_MAX) - { - _val = m_Values[paramID].u.m_Float; - } -} - -/// -void -PowerswitchParameterHandler::writeValue(const uint8_t paramID,const Float32_t _val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].u.m_Float = _val; - if (m_Values[paramID].m_Listener != 0 ) - { - m_Values[paramID].m_Listener->onWriteValue(paramID,m_Values[paramID].u.m_Float); - } - } -} - -void -PowerswitchParameterHandler::registerListener(const uint8_t paramID,IParameterListener *_val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].m_Listener = _val; - } - -} diff --git a/Platform/PowerswitchParameterHandler.h b/Platform/PowerswitchParameterHandler.h deleted file mode 100644 index 9ead971..0000000 --- a/Platform/PowerswitchParameterHandler.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef __DCMOTOR_PARAMETERHANDLER_H__ -#define __DCMOTOR_PARAMETERHANDLER_H__ - - -/** - * @brief storage class - * - */ -class PowerswitchParameterHandler : public IParameterHandler -{ - public: - PowerswitchParameterHandler(); - /// - virtual void readValue(const uint8_t paramID,uint8_t &_val); - /// - virtual void writeValue(const uint8_t paramID,const uint8_t _val); - /// - virtual void readValue(const uint8_t paramID,uint16_t &_val); - /// - virtual void writeValue(const uint8_t paramID,const uint16_t _val); - /// - virtual void readValue(const uint8_t paramID,uint32_t &_val) {}; - /// - virtual void writeValue(const uint8_t paramID,const uint32_t _val) {}; - /// - virtual void readValue(const uint8_t paramID,Float32_t &_val) ; - /// - virtual void writeValue(const uint8_t paramID,const Float32_t _val) ; - /// - /// - virtual void registerListener(const uint8_t paramID,IParameterListener *_val); - - - private: -}; - -#endif diff --git a/Platform/ShutterCtrlParameterHandler.cpp b/Platform/ShutterCtrlParameterHandler.cpp deleted file mode 100644 index 1d2d863..0000000 --- a/Platform/ShutterCtrlParameterHandler.cpp +++ /dev/null @@ -1,92 +0,0 @@ -#include - -#include -#include -#include -#include - -ShutterCtrlParameterHandler::ShutterCtrlParameterHandler() -{ - -} -/// -void -ShutterCtrlParameterHandler::readValue(const uint8_t paramID,uint8_t &_val) -{ - if (paramID < PID_MAX) - { - _val = m_Values[paramID].u.m_U8; - } -} - -/// -void -ShutterCtrlParameterHandler::writeValue(const uint8_t paramID,const uint8_t _val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].u.m_U8 = _val; - if (m_Values[paramID].m_Listener != 0 ) - { - m_Values[paramID].m_Listener->onWriteValue(paramID,_val); - } - } -} - -/// Handle UInt16_t -void -ShutterCtrlParameterHandler::readValue(const uint8_t paramID,uint16_t &_val) -{ - if (paramID < PID_MAX) - { - _val = m_Values[paramID].u.m_U16; - } -} - -/// -void -ShutterCtrlParameterHandler::writeValue(const uint8_t paramID,const uint16_t _val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].u.m_U16 = _val; - if (m_Values[paramID].m_Listener != 0 ) - { - m_Values[paramID].m_Listener->onWriteValue(paramID,m_Values[paramID].u.m_U8); - } - } -} - -/// Handle Float32_t -void -ShutterCtrlParameterHandler::readValue(const uint8_t paramID,Float32_t &_val) -{ - if (paramID < PID_MAX) - { - _val = m_Values[paramID].u.m_Float; - } -} - -/// -void -ShutterCtrlParameterHandler::writeValue(const uint8_t paramID,const Float32_t _val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].u.m_Float = _val; - if (m_Values[paramID].m_Listener != 0 ) - { - m_Values[paramID].m_Listener->onWriteValue(paramID,m_Values[paramID].u.m_Float); - } - } -} - -void -ShutterCtrlParameterHandler::registerListener(const uint8_t paramID,IParameterListener *_val) -{ - if (paramID < PID_MAX) - { - m_Values[paramID].m_Listener = _val; - } - -} diff --git a/Platform/ShutterCtrlParameterHandler.h b/Platform/ShutterCtrlParameterHandler.h deleted file mode 100644 index da0de14..0000000 --- a/Platform/ShutterCtrlParameterHandler.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef __DCMOTOR_PARAMETERHANDLER_H__ -#define __DCMOTOR_PARAMETERHANDLER_H__ - - -/** - * @brief storage class - * - */ -class ShutterCtrlParameterHandler : public IParameterHandler -{ - public: - ShutterCtrlParameterHandler(); - /// - virtual void readValue(const uint8_t paramID,uint8_t &_val); - /// - virtual void writeValue(const uint8_t paramID,const uint8_t _val); - /// - virtual void readValue(const uint8_t paramID,uint16_t &_val); - /// - virtual void writeValue(const uint8_t paramID,const uint16_t _val); - /// - virtual void readValue(const uint8_t paramID,uint32_t &_val) {}; - /// - virtual void writeValue(const uint8_t paramID,const uint32_t _val) {}; - /// - virtual void readValue(const uint8_t paramID,Float32_t &_val) ; - /// - virtual void writeValue(const uint8_t paramID,const Float32_t _val) ; - /// - /// - virtual void registerListener(const uint8_t paramID,IParameterListener *_val); - - - private: -}; - -#endif -- 2.30.2