From ca56f16a2048af628c114f1698ce91d0a283fb69 Mon Sep 17 00:00:00 2001 From: jas <1790731762@qq.com> Date: Tue, 9 Jan 2024 10:44:49 +0800 Subject: [PATCH] =?UTF-8?q?[zhoulongyu]:=20=E5=AE=8C=E5=96=84Led=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81(?= =?UTF-8?q?=E6=B2=A1=E6=9C=89LedTimer)=E5=90=8E=E7=BC=96=E8=AF=91=E9=80=9A?= =?UTF-8?q?=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hal/include/IHalCpp.h | 46 +++++++++---------- hal/src/HalCpp.h | 1 - .../DeviceManager/include/IDeviceManager.h | 29 ++++++++++-- .../DeviceManager/src/DeviceManager.cpp | 25 ++++------ middleware/DeviceManager/src/DeviceManager.h | 9 +--- middleware/DeviceManager/src/LedManager.cpp | 21 +++------ middleware/DeviceManager/src/LedManager.h | 27 +++++------ test/utils/SharedData/src/SharedData_Test.cpp | 2 +- 8 files changed, 80 insertions(+), 80 deletions(-) diff --git a/hal/include/IHalCpp.h b/hal/include/IHalCpp.h index e9c9891e..5d8f3b54 100644 --- a/hal/include/IHalCpp.h +++ b/hal/include/IHalCpp.h @@ -16,8 +16,8 @@ #define IHALCPP_H #include "StatusCode.h" #include -#include #include +#include constexpr int INVALID_PERIOD = -1; constexpr int PERIPHERAL_CHECK_PERIOD_MS = 100; constexpr int IMEI_LEN = 15; @@ -46,34 +46,34 @@ public: virtual const std::string GetKeyName(void) { return "undefine"; } }; - -enum class LedState +enum HalLedState { - LED_STATE_OFF = 0, - LED_STATE_ON, - LED_STATE_GREEN, - LED_STATE_RED, - LED_STATE_YELLOW, - LED_STATE_LEVEL_0, - LED_STATE_LEVEL_1, - LED_STATE_LEVEL_2, - LED_STATE_LEVEL_3, - LED_STATE_LEVEL_4, - LED_STATE_LEVEL_END, - LED_STATE_END + HAL_LED_STATE_OFF = 0, + HAL_LED_STATE_ON, + HAL_LED_STATE_GREEN, + HAL_LED_STATE_RED, + HAL_LED_STATE_YELLOW, + HAL_LED_STATE_LEVEL_0, + HAL_LED_STATE_LEVEL_1, + HAL_LED_STATE_LEVEL_2, + HAL_LED_STATE_LEVEL_3, + HAL_LED_STATE_LEVEL_4, + HAL_LED_STATE_LEVEL_END, + HAL_LED_STATE_END }; - class VLedHal { public: VLedHal() = default; ~VLedHal() = default; - virtual StatusCode SetLedState(const LedState &state) { return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); } + virtual StatusCode SetHalLedState(const HalLedState &state) + { + return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); + } virtual StatusCode GetLedName(std::string &LedName) { return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); } }; - #if 0 class WifiLed : public VLedHalOwner, public VLedHal { @@ -82,7 +82,7 @@ public: ~WifiLed() = default; // StatusCode SetLedHalOwner(std::shared_ptr owner) override; - StatusCode SetLedState(const LedState &state) override; + StatusCode SetHalLedState(const HalLedState &state) override; StatusCode GetLedName(std::string &LedName) override; private: @@ -93,7 +93,6 @@ private: } #endif - class IHalCpp { public: @@ -102,10 +101,11 @@ public: static std::shared_ptr &GetInstance(std::shared_ptr *impl = nullptr); virtual StatusCode Init(void) { return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); } virtual StatusCode UnInit(void) { return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); } - virtual StatusCode GetLedHal(std::vector> &ledHals) { return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); } + virtual StatusCode GetLedHal(std::vector> &ledHals) + { + return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); + } }; void CreateHalCppModule(void); - #endif - diff --git a/hal/src/HalCpp.h b/hal/src/HalCpp.h index ead32f5b..09191f7b 100644 --- a/hal/src/HalCpp.h +++ b/hal/src/HalCpp.h @@ -26,6 +26,5 @@ public: private: std::vector> mLedHals; - }; #endif \ No newline at end of file diff --git a/middleware/DeviceManager/include/IDeviceManager.h b/middleware/DeviceManager/include/IDeviceManager.h index 74fa4940..2545fa0d 100644 --- a/middleware/DeviceManager/include/IDeviceManager.h +++ b/middleware/DeviceManager/include/IDeviceManager.h @@ -15,8 +15,9 @@ #ifndef IDEVICEMANAGER_H #define IDEVICEMANAGER_H #include "StatusCode.h" +#include #include -#include "IHalCpp.h" +#include enum class IpcMission { TEST = 0, @@ -31,12 +32,32 @@ enum class KeyAction END }; +enum LedState +{ + LED_STATE_OFF = 0, + LED_STATE_ON, + LED_STATE_GREEN, + LED_STATE_RED, + LED_STATE_YELLOW, + LED_STATE_LEVEL_0, + LED_STATE_LEVEL_1, + LED_STATE_LEVEL_2, + LED_STATE_LEVEL_3, + LED_STATE_LEVEL_4, + LED_STATE_LEVEL_END, + LED_STATE_END +}; + class VLedManager { public: VLedManager() = default; ~VLedManager() = default; - virtual StatusCode SetLedState(LedState CurrentState, unsigned int KeepAliveTime) {return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); } + virtual StatusCode SetLedState(std::string ledName, LedState &CurrentState, const unsigned int &KeepAliveTime, + const unsigned int &BlinkPeriod) + { + return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); + } }; class IDeviceManager @@ -48,8 +69,8 @@ public: virtual const StatusCode Init(void) { return CreateStatusCode(STATUS_CODE_OK); } virtual const StatusCode UnInit(void) { return CreateStatusCode(STATUS_CODE_OK); } virtual const IpcMission GetIpcMissiony(void) { return IpcMission::END; } - virtual const StatusCode GetLedManager(std::vector> &ledManagers) { return CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); } - + // virtual const StatusCode GetLedManager(std::vector> &ledManagers) { return + // CreateStatusCode(STATUS_CODE_VIRTUAL_FUNCTION); } }; bool CreateDeviceManagerModule(void); #endif \ No newline at end of file diff --git a/middleware/DeviceManager/src/DeviceManager.cpp b/middleware/DeviceManager/src/DeviceManager.cpp index 7dc23035..7ebd0174 100644 --- a/middleware/DeviceManager/src/DeviceManager.cpp +++ b/middleware/DeviceManager/src/DeviceManager.cpp @@ -14,36 +14,27 @@ */ #include "DeviceManager.h" +#include -const StatusCode DeviceManager::Init(void) +const StatusCode DeviceManager::Init(void) { std::vector> ledHals; IHalCpp::GetInstance()->GetLedHal(ledHals); - for (auto it = ledHals.begin(); it != ledHals.end(); ++it) - { + for (auto it = ledHals.begin(); it != ledHals.end(); ++it) { std::shared_ptr ledHal = *it; - std::shared_ptr ledOut = std::make_shared(ledHal, NEW_LED_STATE, DEFAULT_KEEP_ALIVE_TIME, BLINKING_FAST_MS); + std::shared_ptr ledOut = + std::make_shared(ledHal, NEW_LED_STATE, DEFAULT_KEEP_ALIVE_TIME, BLINKING_FAST_MS); mLedManagers.push_back(ledOut); - } + } return CreateStatusCode(STATUS_CODE_OK); } const StatusCode DeviceManager::UnInit(void) { - if (!mLedManagers.empty()) - { + if (!mLedManagers.empty()) { mLedManagers.clear(); } return CreateStatusCode(STATUS_CODE_OK); } -const IpcMission DeviceManager::GetIpcMissiony(void) -{ - return IpcMission::TEST; -} -const StatusCode DeviceManager::GetLedManager(std::vector> &ledManagers) -{ - ledManagers = mLedManagers; - return CreateStatusCode(STATUS_CODE_OK); -} - +const IpcMission DeviceManager::GetIpcMissiony(void) { return IpcMission::TEST; } diff --git a/middleware/DeviceManager/src/DeviceManager.h b/middleware/DeviceManager/src/DeviceManager.h index d431bd5c..c810df1d 100644 --- a/middleware/DeviceManager/src/DeviceManager.h +++ b/middleware/DeviceManager/src/DeviceManager.h @@ -14,9 +14,8 @@ */ #ifndef DEVICEMANAGER_H #define DEVICEMANAGER_H -#include "LedManager.h" #include "IDeviceManager.h" - +#include "LedManager.h" class DeviceManager : public IDeviceManager { @@ -27,13 +26,9 @@ public: const StatusCode Init(void) override; const StatusCode UnInit(void) override; const IpcMission GetIpcMissiony(void) override; - const StatusCode GetLedManager(std::vector> &ledManagers) override; + // const StatusCode GetLedManager(std::vector> &ledManagers) override; private: std::vector> mLedManagers; }; - - - #endif - diff --git a/middleware/DeviceManager/src/LedManager.cpp b/middleware/DeviceManager/src/LedManager.cpp index c32e4442..b23ac376 100644 --- a/middleware/DeviceManager/src/LedManager.cpp +++ b/middleware/DeviceManager/src/LedManager.cpp @@ -16,8 +16,6 @@ #include "LedManager.h" #include "ILog.h" - - LedManager::LedManager() { mLedHal = nullptr; @@ -27,21 +25,22 @@ LedManager::LedManager() mStateAliveTime = 0; } LedManager::LedManager(std::shared_ptr &LedHal, const LedState &CurrentState, - const unsigned int &KeepAliveTime, const unsigned int &BlinkPeriod) - : mLedHal(LedHal), mCurrentState(CurrentState), mKeepAliveTime(KeepAliveTime), mBlinkPeriod(BlinkPeriod) + const unsigned int &KeepAliveTime, const unsigned int &BlinkPeriod) { + mLedHal = LedHal; + mCurrentState = CurrentState; + mKeepAliveTime = KeepAliveTime; + mBlinkPeriod = BlinkPeriod; mStateAliveTime = 0; } - -StatusCode LedManager::SetLedState(LedState CurrentState, unsigned int KeepAliveTime) +StatusCode LedManager::SetLedState(std::string ledName, LedState &CurrentState, const unsigned int &KeepAliveTime, + const unsigned int &BlinkPeriod) { mCurrentState = CurrentState; mKeepAliveTime = KeepAliveTime; return CreateStatusCode(STATUS_CODE_OK); } - - StatusCode LedManager::GetLedState(LedState &CurrentState) { CurrentState = mCurrentState; @@ -59,9 +58,3 @@ StatusCode LedManager::BlinkOff(void) mCurrentState = LedState::LED_STATE_OFF; return CreateStatusCode(STATUS_CODE_OK); } - - - - - - diff --git a/middleware/DeviceManager/src/LedManager.h b/middleware/DeviceManager/src/LedManager.h index e258e2da..57faa811 100644 --- a/middleware/DeviceManager/src/LedManager.h +++ b/middleware/DeviceManager/src/LedManager.h @@ -16,6 +16,7 @@ #define LED_MANAGER_H #include "IDeviceManager.h" +#include "IHalCpp.h" #include #include @@ -33,25 +34,25 @@ public: LedManager(); LedManager(std::shared_ptr &LedHal, const LedState &CurrentState, const unsigned int &KeepAliveTime = DEFAULT_KEEP_ALIVE_TIME, - const unsigned int &BlinkPeriod = BLINKING_FAST_MS - ); + const unsigned int &BlinkPeriod = BLINKING_FAST_MS); ~LedManager() = default; - StatusCode Init(void) {return CreateStatusCode(STATUS_CODE_NOT_OK); } - StatusCode Unit(void) {return CreateStatusCode(STATUS_CODE_NOT_OK); } - StatusCode SetLedState(LedState CurrentState, unsigned int KeepAliveTime) override; + StatusCode Init(void) { return CreateStatusCode(STATUS_CODE_NOT_OK); } + StatusCode Unit(void) { return CreateStatusCode(STATUS_CODE_NOT_OK); } + StatusCode SetLedState(std::string ledName, LedState &CurrentState, + const unsigned int &KeepAliveTime = DEFAULT_KEEP_ALIVE_TIME, + const unsigned int &BlinkPeriod = LED_NOT_BLINK) override; public: - StatusCode GetLedState(LedState &CurrentState) {return CreateStatusCode(STATUS_CODE_NOT_OK); } - StatusCode BlinkOn(LedState CurrentState, unsigned int KeepAliveTime) {return CreateStatusCode(STATUS_CODE_NOT_OK); } - StatusCode BlinkOff(void) {return CreateStatusCode(STATUS_CODE_NOT_OK); } + StatusCode GetLedState(LedState &CurrentState); + StatusCode BlinkOn(LedState CurrentState, unsigned int KeepAliveTime); + StatusCode BlinkOff(void); private: std::shared_ptr mLedHal; - LedState mCurrentState; // 当前状态 - unsigned int mBlinkPeriod; // 闪烁频率 - unsigned int mKeepAliveTime; // 保持存活时间 - unsigned int mStateAliveTime; // 状态保持时间 + LedState mCurrentState; // 当前状态 + unsigned int mBlinkPeriod; // 闪烁频率 + unsigned int mKeepAliveTime; // 保持存活时间 + unsigned int mStateAliveTime; // 状态保持时间 }; #endif - diff --git a/test/utils/SharedData/src/SharedData_Test.cpp b/test/utils/SharedData/src/SharedData_Test.cpp index 6ce7efdc..b419d96e 100644 --- a/test/utils/SharedData/src/SharedData_Test.cpp +++ b/test/utils/SharedData/src/SharedData_Test.cpp @@ -12,8 +12,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "SharedData.h" #include "ILog.h" +#include "SharedData.h" #include #include namespace SharedDataTest