aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-04-29 14:10:49 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-04-29 14:10:49 +0300
commitfd7196c48de7ca02e9461b08022bb5538b0ec42e (patch)
tree0caa9702fccf511123f5e08bc0f9a4108ec1890f /Software/Embedded_SW/Embedded
parent2b838164abd4f282a29a7ec9ad3a38d474b241fc (diff)
downloadTango-fd7196c48de7ca02e9461b08022bb5538b0ec42e.tar.gz
Tango-fd7196c48de7ca02e9461b08022bb5538b0ec42e.zip
dispenser dtat writing disabled (potential disconnect cause). heaters bug.
Diffstat (limited to 'Software/Embedded_SW/Embedded')
-rw-r--r--Software/Embedded_SW/Embedded/Main.c6
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c2
3 files changed, 4 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index 64bac419e..379c45f76 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -262,8 +262,8 @@ int main(void)
Heaters_Init();
MotorsInit();
//Shai WHS_HW_test(); // for WHS sensor test
- //WHS_init();
- //Buttons_Init();
+ WHS_init();
+ Buttons_Init();
//IDS_ModuleInit();
Valve_Set(VALVE_MIXCHIP_WASTECH, Mixer_Waste);
@@ -310,8 +310,6 @@ int main(void)
IDLE_TASK_package_init();
-// HWControlId = AddControlCallback( MainHWInitCallBackFunction, 2* eOneSecond/*eHundredMillisecond*/, MainDummyFunction,0,0, 0 );
-
Start_InitSequence();
PowerIdleInit();
BIOS_start();
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index b09e47b45..f2b629c51 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -819,7 +819,7 @@ void DiagnosticsTask(UArg arg0, UArg arg1)
DiagnosticTenMsecCollection();
break;
case DispensersCollectionTrigger:
- DispensersCollectionCall();
+ //DispensersCollectionCall(); //suspended for ITMA
break;
default:
break;
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 8fe0a9fd8..7a013f49f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -875,7 +875,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
Control_Voltage_To_Blower(BlowerCfg.voltage);
}
}
- if ((HeaterCmd[index].targettemperatue * AcHeatersLoweroperationLimit/1000)&&(readValue < (HeaterCmd[index].targettemperatue * AcHeatersUpperoperationLimit/1000)))//read value within 0.5 percent from target
+ if ((readValue > HeaterCmd[index].targettemperatue * AcHeatersLoweroperationLimit/1000)&&(readValue < (HeaterCmd[index].targettemperatue * AcHeatersUpperoperationLimit/1000)))//read value within 0.5 percent from target
{
//////////////////
//InitialHeating = false;