增加了数据库功能,采用直接编译源码的方式,不使用动态库链接
This commit is contained in:
@@ -57,16 +57,8 @@ PowerManger::PowerManger()
|
||||
//
|
||||
|
||||
//初始化数据库
|
||||
// string dbPath = "/home/zjk/project/H100/H100PowerManger/data/power_data.db";
|
||||
// m_db = new SQLiteDB(dbPath);
|
||||
// m_db->createPowerDataTables();
|
||||
// m_db->createStateTables();
|
||||
// m_db->createDisCcuSysTables();
|
||||
// m_db->createDriversTables(VAR_TO_STR(m_currentDriverState));
|
||||
// m_db->createDriversTables(VAR_TO_STR(m_subDisSysState));
|
||||
// m_db->createDriversTables(VAR_TO_STR(m_subDisSysCmd));
|
||||
// m_db->createDriversTables(VAR_TO_STR(m_MSDriverCmd));
|
||||
|
||||
m_db = new SQLite("power_data.db");
|
||||
m_db->createTable();
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
@@ -74,7 +66,7 @@ PowerManger::PowerManger()
|
||||
|
||||
PowerManger::~PowerManger()
|
||||
{
|
||||
// delete m_db;
|
||||
delete m_db;
|
||||
delete m_lowerCommManager;
|
||||
}
|
||||
|
||||
@@ -134,12 +126,15 @@ bool PowerManger::Iterate()
|
||||
{
|
||||
AppCastingMOOSApp::Iterate();
|
||||
// 打印当前状态
|
||||
// cout << " Current State : " << (int)PowerManagerFsm::current_state_ptr->getCurrentState();
|
||||
CycleTriggeredEvent cycleEvent;
|
||||
PowerManagerFsm::dispatch(cycleEvent);
|
||||
faultLevel = getFaultLevel();
|
||||
//打印信息大小
|
||||
// cout << sizeof(m_CcuColCmd) << endl;
|
||||
//更新数据库
|
||||
m_db->insertData(m_pmCurrentState.ccustate);
|
||||
m_db->insertData(m_pmCurrentState.bus1State);
|
||||
m_db->insertData(m_pmCurrentState.bus2State);
|
||||
m_db->insertData(m_pmCurrentState.bus3State);
|
||||
m_db->insertData(m_pmCurrentState.bus4State);
|
||||
if (m_ticker++ % 5 == 0)
|
||||
{
|
||||
m_CcuColCmd.heartbeat++;
|
||||
@@ -362,4 +357,4 @@ unsigned char PowerManger::getFaultLevel()
|
||||
}
|
||||
}
|
||||
return maxLevel;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user