aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2019-08-29 16:30:09 +0300
committerAvi Levkovich <avi@twine-s.com>2019-08-29 16:30:09 +0300
commit8dd7b8d63adf21c2f872074f140d9908c0925fc4 (patch)
tree8d1e43e612358d2f809b7b1817ec3bcd2cebbd23 /Software/Embedded_SW/Embedded/Modules
parent15620f78cff693ba3fcf8fd22ed1ece72213f814 (diff)
downloadTango-8dd7b8d63adf21c2f872074f140d9908c0925fc4.tar.gz
Tango-8dd7b8d63adf21c2f872074f140d9908c0925fc4.zip
Remove auto homing + changing the midtank pressure calculation
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c3
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c14
2 files changed, 17 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
index 3a5588d60..da497b2e8 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_init.c
@@ -72,6 +72,9 @@ float CalculateDispenserPressure (int DispenserId)
DispenserPressure[DispenserId] *= 10; //MPascal -> Bar
+ if(DispenserPressure[DispenserId] < 0 )
+ DispenserPressure[DispenserId] = 0;
+
return(DispenserPressure[DispenserId]);
}
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index b47c49cc0..f0fdaa212 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -37,6 +37,20 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
response.has_progress = true;
}
else
+ if((request->amount == 0xAD) && (request->delay == 0xAD01)) //undef AUTO_HOME_DISPENSERS
+ {
+ #undef AUTO_HOME_DISPENSERS
+ response.progress = 01;
+ response.has_progress = true;
+ }
+ else
+ if((request->amount == 0xAD) && (request->delay == 0xAD00)) //define AUTO_HOME_DISPENSERS
+ {
+ #define AUTO_HOME_DISPENSERS
+ response.progress = 01;
+ response.has_progress = true;
+ }
+ else
if((request->amount == 0x01) && ((request->delay &0x010000) == 0x010000)) //change mode powerset01
{
response.progress = Power_Step_01_Mode(((request->delay &0x00FF00)>>8), request->delay &0x0000FF);