diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2021-01-05 22:44:30 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2021-01-05 22:44:30 +0200 |
| commit | e8578185b85e3957adc627c414d9ab3cc9bda463 (patch) | |
| tree | 7ec83305ea016664cbec8ba93dec90df68612bf1 | |
| parent | 0567570ce97b80f264c7b9f4a632b99eb80c1a17 (diff) | |
| download | Tango-e8578185b85e3957adc627c414d9ab3cc9bda463.tar.gz Tango-e8578185b85e3957adc627c414d9ab3cc9bda463.zip | |
smal fixes from 1.5.3.6
3 files changed, 5 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c index e6c596d15..5bce161ae 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c +++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c @@ -263,7 +263,7 @@ uint32_t CartridgeStateUpdate(CartridgeSlot Slot, int32_t index, CartridgeState CartridgeStatus.has_state = true; CartridgeStatus.state = State; CartridgeStatus.cartridge = &CartData; - if (percentage>1) + //if (percentage>0.1) { CartridgeStatus.has_progresspercentage = true; CartridgeStatus.progresspercentage = percentage; diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c index b8f7024fb..374977065 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c @@ -274,9 +274,9 @@ bool RdWasteTankOverFlowSensor() return 0; } -int WHS_GetCartridgeFillPercent() +float WHS_GetCartridgeFillPercent() { - return (((wasteLevel - wasteLevelEmpty) * 100) / WASTE_CARTRIDGE_SIZE); + return (100 - (((wasteLevel - wasteLevelEmpty) * 100) / WASTE_CARTRIDGE_SIZE)); } int WHS_GetCartridgeFill() { diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c index 06dac8fdc..a5440db21 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c @@ -784,13 +784,13 @@ uint32_t PowerUpUpdate(MACHINE_STATE_STAGES_ENUM stage) response.state = POWER_UP_STATE__BuiltInTest; response.progresspercentage = 15.0; response.message = "Built In Test"; + response.message = "Built In Test failed"; + Error = ERROR_CODE__POWER_UP_BUILT_IN_FAILED; break; case MACHINE_STATE_BUILT_IN_TEST: response.state = POWER_UP_STATE__BuiltInTest; response.progresspercentage = 15.0; response.message = "Built In Test"; - //response.message = "Built In Test failed"; - //Error = ERROR_CODE__POWER_UP_BUILT_IN_FAILED; break; case MACHINE_STATE_INITIAL_BLOWER_ACTIVATION: response.state = POWER_UP_STATE__InitialBlowerActivation; |