aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-02-04 12:29:16 +0200
committerShlomo Hecht <shlomo@twine-s.com>2020-02-04 12:29:16 +0200
commit90c80f9838c308cd28aca07e5e863b9d2efa7d40 (patch)
treead50971b420902227ea6d7d41f777202221bcc74 /Software/Embedded_SW/Embedded/Modules
parentc6a0f97efd7fc804e761086db3179443d1414df7 (diff)
downloadTango-90c80f9838c308cd28aca07e5e863b9d2efa7d40.tar.gz
Tango-90c80f9838c308cd28aca07e5e863b9d2efa7d40.zip
some real time investigations
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c2
-rw-r--r--Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 6d92e06c9..c8b4a306c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -778,7 +778,7 @@ uint32_t MillisecLowLoop(uint32_t tick)
}*/
midtankDisplay = 1-midtankDisplay;
Gas_PPM_Info = Calculate_Gas_Power_Consumption();
- Trigger_WHS_MAX11614_Read_allADC();
+ //Trigger_WHS_MAX11614_Read_allADC();
}
if (OneHourTick)
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h
index 5fd8588af..76e4d4414 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.h
@@ -16,7 +16,7 @@ extern uint32_t MachineCalibrationDataRequestFunc(MessageContainer* requestConta
extern void HWSystemResetRequest(MessageContainer* requestContainer);
uint32_t HWConfigurationInit(void);
void FlashInitAndLoad(void);
-uint32_t LoadConfigurationParamsFromFile(bool Initialize);
+uint32_t LoadConfigurationParamsFromFile(bool);
extern HardwareBlower BlowerCfg;
extern bool DataUpdated;