aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Diagnostics
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2020-10-19 17:15:51 +0300
committerShlomo Hecht <shlomo@twine-s.com>2020-10-19 17:15:51 +0300
commitd158d2e52229c221d1d475ced6b1ff048d6519ad (patch)
treeacd1b09d50ce9c6356b17fe73a02ceec66279178 /Software/Embedded_SW/Embedded/Modules/Diagnostics
parentb732167cbc51f0b19447d67687af5c514cf4f65a (diff)
downloadTango-d158d2e52229c221d1d475ced6b1ff048d6519ad.tar.gz
Tango-d158d2e52229c221d1d475ced6b1ff048d6519ad.zip
change RAM FLASH SIZE and location. some progress on the machine
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Diagnostics')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index d27ab05f7..36bcc0c3b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -129,8 +129,8 @@ double OverallTemperature;
DoubleArray DispenserFreq[MAX_SYSTEM_DISPENSERS];
DoubleArray DiagnosticsDispenserPressure[MAX_SYSTEM_DISPENSERS];
-DoubleArray DispenserInkLevel[MAX_SYSTEM_DISPENSERS];
-DoubleArray DiagnosticsMidTankInkLevel[MAX_SYSTEM_DISPENSERS];
+//DoubleArray DispenserInkLevel[MAX_SYSTEM_DISPENSERS];
+//DoubleArray DiagnosticsMidTankInkLevel[MAX_SYSTEM_DISPENSERS];
HeaterState **heatersstates;
HeaterState HeaterInfo[HEATER_TYPE_MAX_HEATERS];
@@ -426,9 +426,9 @@ void LoadChillerState(HeaterType HeaterType,HeaterState *HeaterState)
HeaterState->has_heatertype = true;
HeaterState->heatertype = HeaterType;
HeaterState->has_setpoint = true;
- HeaterState->setpoint = ShinkoTempDeg.Read_Setup;
+ HeaterState->setpoint = (float)(ShinkoTempDeg.Read_Setup)/10;
HeaterState->has_currentvalue = true;
- HeaterState->currentvalue = ShinkoTempDeg.Read_value;//Shinko_Temperature;//MillisecGetTemperatures(HeaterId2PT100Id[HeaterId])/100;
+ HeaterState->currentvalue = (float)(ShinkoTempDeg.Read_value)/10;
return;
}
@@ -926,7 +926,7 @@ void DiagnosticOneSecCollection(void)
}
else
{
- DiagnosticsMonitor.chillertemperature = &ShinkoTempDeg.Read_value;//Shinko_Temperature;
+ DiagnosticsMonitor.chillertemperature = ShinkoTempDeg.Read_value;//Shinko_Temperature;
}
DiagnosticsMonitor.n_chillertemperature = 1;
DiagnosticsMonitor.n_wastelevel = 1;