Index: sources/StateController.h =================================================================== diff -u -rc5b453debecfb1b22e40f073537077792fad4ab1 -rce5cfa527a7f05d77a42a05c859d5de4571de84f --- sources/StateController.h (.../StateController.h) (revision c5b453debecfb1b22e40f073537077792fad4ab1) +++ sources/StateController.h (.../StateController.h) (revision ce5cfa527a7f05d77a42a05c859d5de4571de84f) @@ -28,14 +28,20 @@ void timerEvent(QTimerEvent *) override; private: - #define DEFAULT_TIMEOUT_S 10 - #define TRANSITION_EVENT_INDEX 0 - #define RESP_MSG_START_INDEX 3 - #define IS_TIMER_INDEX 0 - #define IS_WAIT_NEEDED_INDEX 1 - #define NEXT_AUTO_TRANSITION_INDEX 2 - #define COUNT_DOWN_TIMER_INDEX 6 + #define DEFAULT_TIMEOUT_S 10 + #define TRANSITION_EVENT_INDEX 0 + #define RESP_MSG_START_INDEX 3 + #define IS_TIMER_INDEX 0 + #define IS_WAIT_NEEDED_INDEX 1 + #define NEXT_AUTO_TRANSITION_INDEX 2 + #define COUNT_DOWN_TIMER_INDEX 6 + #define UI_MSG_BB_PAYLOAD_ID 0x63 + #define QOBJECT_TIMER_TIMEOUT_MS 1000 + #define PROGRESS_TIME_BC_INTERVAL_MS 1000 + #define NUM_OF_COUNTS_TIMER_BC_EMIT (PROGRESS_TIME_BC_INTERVAL_MS / QOBJECT_TIMER_TIMEOUT_MS) + #define NUM_OF_COUNTS_TO_BC_MSG 3 + enum User_Command_ID { CMD_NONE = -1, CMD_TX_PARAMS = 0 , @@ -54,15 +60,13 @@ QHash > _dryDemoCmds; quint16 _index; quint16 _broadcastMsgCount; + quint16 _timerBroadcastCount; User_Command_ID _dryDemoCurrentCmd; drydemoXMLstates _dryDemo; - //QHash _dryDemoMsgTable; // TODO remove - //QHash _dryDemoBroadcast; // TODo remove - //Can::MessageID _activeMessageID = Can::ID_NONE; // TODO remove - void initMessagesHashTable(); void transitionApplicationToStandBy(); + void resetVariables(); void onIdleStateChange(bool active); void onTreatmentParamsStateChange(bool active);