From 845360c46b28de953a994936f587bf8c69f38a54 Mon Sep 17 00:00:00 2001
From: zhaojingkui <1553836110@qq.com>
Date: Thu, 13 Feb 2025 22:24:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86driver=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6,=E5=B9=B6=E4=B8=94=E5=88=A0=E9=99=A4=E4=BA=86?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E8=BF=87=E7=A8=8B=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pPowerManger/CMakeLists.txt  |  9 +++++++++
 src/pPowerManger/PowerManger.h   |  3 ++-
 src/pPowerManger/ccuUdpMsg.h     |  1 -
 src/pPowerManger/driver.cpp      | 11 +++++++++++
 src/pPowerManger/driver.h        | 14 ++++++++++++++
 src/pPowerManger/pmSysvariable.h |  2 ++
 test/SQLiteDBTest.cpp            |  4 ++++
 7 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 src/pPowerManger/driver.cpp
 create mode 100644 src/pPowerManger/driver.h

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);
         }
+
+        
     
 }