diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2019-04-08 00:45:08 +0300 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2019-04-08 00:45:08 +0300 |
| commit | 1608e69a417bc5e40a607c3958c4a60f19f66f1a (patch) | |
| tree | c04d78e2abb5aac8c22350c90cb8b469f6eca30d /Software/Embedded_SW | |
| parent | 08dd6000fe3a218221003876a699f448835b62e4 (diff) | |
| parent | b4a71931ea52636c6b36376aa9d71697ccf73524 (diff) | |
| download | Tango-1608e69a417bc5e40a607c3958c4a60f19f66f1a.tar.gz Tango-1608e69a417bc5e40a607c3958c4a60f19f66f1a.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Main.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c index 00ee77251..046f8291e 100644 --- a/Software/Embedded_SW/Embedded/Main.c +++ b/Software/Embedded_SW/Embedded/Main.c @@ -197,7 +197,7 @@ int main(void) MotorsInit(); //Shai WHS_HW_test(); // for WHS sensor test // WHS_init(); - Buttons_Init(); +// Buttons_Init(); //IDS_ModuleInit(); Valve_Set(VALVE_MIXCHIP_WASTECH, Mixer_Waste); diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c index 22b30748f..7d42ad8f5 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c @@ -75,7 +75,7 @@ uint32_t PowerIdleCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag) { Report("PowerIdle Idle activated ",__FILE__,__LINE__,(int)powerIdleSecondsLimit,RpWarning,(int)powerIdleSecondsCounter,0); powerIdleState = true; - //SetPowerMachineState(sttIDLE); + SetPowerMachineState(sttIDLE); //move to idle state PowerIdleSetIdle(); } @@ -103,7 +103,7 @@ void PowerIdleOutOfIdleState(void) if (powerIdleState == true) { powerIdleState = false; - //SetPowerMachineState(sttON); + SetPowerMachineState(sttON); if (HandleProcessParameters(&ActiveProcessParameters)!= OK) { LOG_ERROR (1, "Turn Heaters active failed"); |