Commit 85c1e1c7 authored by Pavel Vainerman's avatar Pavel Vainerman

(SM): немного подправил логи, а также добавил вывод названий таймеров.

parent 21849ef5
...@@ -225,6 +225,26 @@ namespace uniset ...@@ -225,6 +225,26 @@ namespace uniset
} }
} }
} }
// ------------------------------------------------------------------------------------------
string SharedMemory::getTimerName( int id ) const
{
if( id == tmHeartBeatCheck )
return "HeartBeatCheckTimer";
if( id == tmEvent )
return "EventTimer";
if( id == tmHistory )
return "HistoryTimer";
if( id == tmPulsar )
return "PulsarTimer";
if( id == tmLastOfTimerID )
return "??LastOfTimerID??";
return IONotifyController::getTimerName(id);
}
// ------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------
void SharedMemory::sysCommand( const SystemMessage* sm ) void SharedMemory::sysCommand( const SystemMessage* sm )
......
...@@ -429,6 +429,8 @@ namespace uniset ...@@ -429,6 +429,8 @@ namespace uniset
virtual void sysCommand( const uniset::SystemMessage* sm ) override; virtual void sysCommand( const uniset::SystemMessage* sm ) override;
virtual void timerInfo( const uniset::TimerMessage* tm ) override; virtual void timerInfo( const uniset::TimerMessage* tm ) override;
virtual void askSensors( UniversalIO::UIOCommand cmd ) {}; virtual void askSensors( UniversalIO::UIOCommand cmd ) {};
virtual std::string getTimerName(int id) const override;
void sendEvent( uniset::SystemMessage& sm ); void sendEvent( uniset::SystemMessage& sm );
void initFromReserv(); void initFromReserv();
bool initFromSM( uniset::ObjectId sm_id, uniset::ObjectId sm_node ); bool initFromSM( uniset::ObjectId sm_id, uniset::ObjectId sm_node );
......
...@@ -299,8 +299,8 @@ long IOController::localSetValue( std::shared_ptr<USensorInfo>& usi, ...@@ -299,8 +299,8 @@ long IOController::localSetValue( std::shared_ptr<USensorInfo>& usi,
if( changed || blockChanged ) if( changed || blockChanged )
{ {
ulog4 << myname << ": save sensor value (" << usi->si.id << ")" ulog4 << myname << "(localSetValue): (" << usi->si.id << ")"
<< " name: " << uniset_conf()->oind->getNameById(usi->si.id) << uniset_conf()->oind->getNameById(usi->si.id)
<< " newvalue=" << value << " newvalue=" << value
<< " value=" << usi->value << " value=" << usi->value
<< " blocked=" << usi->blocked << " blocked=" << usi->blocked
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment