diff --git a/src/pPowerManger/CMakeLists.txt b/src/pPowerManger/CMakeLists.txt index b55eeff..f025f84 100644 --- a/src/pPowerManger/CMakeLists.txt +++ b/src/pPowerManger/CMakeLists.txt @@ -25,6 +25,7 @@ SET(SRC fsm.cpp main.cpp SQLiteDB.cpp + driver.cpp ) ADD_EXECUTABLE(pPowerManger ${SRC}) @@ -49,5 +50,13 @@ SET(SQLITEDB_SRC SQLiteDB.cpp ) +SET(FSMLIB_SRC + fsm.cpp) + +SET(DRIVER_SRC + driver.cpp) + ADD_LIBRARY(SQLiteDB STATIC ${SQLITEDB_SRC}) ADD_LIBRARY(UDPComm STATIC ${UDPCOMM_SRC}) +ADD_LIBRARY(FSMLib STATIC ${FSMLIB_SRC}) +ADD_LIBRARY(Driver STATIC ${DRIVER_SRC}) diff --git a/src/pPowerManger/PowerManger.h b/src/pPowerManger/PowerManger.h index 3348a80..887a530 100644 --- a/src/pPowerManger/PowerManger.h +++ b/src/pPowerManger/PowerManger.h @@ -31,6 +31,7 @@ #include "pmSysvariable.h" #include "fsm.h" #include "SQLiteDB.h" +#include "driver.h" #define VAR_TO_STR(var) #var @@ -66,7 +67,7 @@ class PowerManger : public AppCastingMOOSApp protected: // app function // bool _ListenCB(); - bool updatePmState(); + bool updatePmState(); void updateTime(){m_current_time = MOOSTime();} bool IsSkewed(double dfTimeNow, double * pdfSkew = NULL); string getTypeName(const string typeName); diff --git a/src/pPowerManger/ccuUdpMsg.h b/src/pPowerManger/ccuUdpMsg.h index 46607ad..4674d11 100644 --- a/src/pPowerManger/ccuUdpMsg.h +++ b/src/pPowerManger/ccuUdpMsg.h @@ -8,7 +8,6 @@ #define DIS_MSG_HEAD1 0x40 #define DIS_MSG_HEAD2 0x40 - #define CCU_STATE_FB_ID 0x0051 #define CCU_SET_PARM_FB_ID 0x0040 #define DIS_HVBUS_FB_ID 0x0005 diff --git a/src/pPowerManger/driver.cpp b/src/pPowerManger/driver.cpp new file mode 100644 index 0000000..ab30ec2 --- /dev/null +++ b/src/pPowerManger/driver.cpp @@ -0,0 +1,11 @@ +#include "driver.h" + +Driver::Driver() +{ + +} + +Driver::~Driver() +{ + +} \ No newline at end of file diff --git a/src/pPowerManger/driver.h b/src/pPowerManger/driver.h new file mode 100644 index 0000000..577fc70 --- /dev/null +++ b/src/pPowerManger/driver.h @@ -0,0 +1,14 @@ +#ifndef DRIVER_H +#define DRIVER_H + + +class Driver +{ +public: + Driver(); + ~Driver(); +}; + + + +#endif // DRIVER_H \ No newline at end of file diff --git a/src/pPowerManger/pmSysvariable.h b/src/pPowerManger/pmSysvariable.h index bbd722f..3ff1017 100644 --- a/src/pPowerManger/pmSysvariable.h +++ b/src/pPowerManger/pmSysvariable.h @@ -384,4 +384,6 @@ enum disBreakerOpt{ }; + + #endif \ No newline at end of file diff --git a/test/SQLiteDBTest.cpp b/test/SQLiteDBTest.cpp index b172a59..6399016 100644 --- a/test/SQLiteDBTest.cpp +++ b/test/SQLiteDBTest.cpp @@ -33,6 +33,10 @@ TEST_CASE("SQLiteDB Test", "[SQLiteDB]") { REQUIRE(stateDataForGet.event_id == 1); REQUIRE(stateDataForGet.fault_code == 1); REQUIRE(stateDataForGet.note == "test"); + + //REQUIRE(db.clearPowerData(stateDataForGet) == true); } + + }