diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-14 14:54:51 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-10-14 14:54:51 +0300 |
| commit | ef535ea84ac5b6db3d1f0736ec50ede4f74ef7e7 (patch) | |
| tree | cec24e5cca9df6678cd19cb81d28ec1fff563a95 /Software/Embedded_SW/Embedded | |
| parent | 89428e7ea1fb949a2f121ec7384e056e0fa32903 (diff) | |
| download | Tango-ef535ea84ac5b6db3d1f0736ec50ede4f74ef7e7.tar.gz Tango-ef535ea84ac5b6db3d1f0736ec50ede4f74ef7e7.zip | |
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded')
| -rw-r--r-- | Software/Embedded_SW/Embedded/DataDef.h | 4 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h index 548f725e1..81fa87902 100644 --- a/Software/Embedded_SW/Embedded/DataDef.h +++ b/Software/Embedded_SW/Embedded/DataDef.h @@ -20,7 +20,7 @@ #define NO_INITIAL_HEATING #define MAX_STRING_LEN 255 //Embedded version + filter.c -//#define WATCHDOG +#define WATCHDOG //#define DISPESER_TEST //#define FPGA_WATCHDOG_DISABLE @@ -33,7 +33,7 @@ //#define EMC_FORCE_MOT_CLOCK_INTERNAL //#define VAC_TEST -#define DISPENSER_VALVES_OPEN +//#define DISPENSER_VALVES_OPEN //#define USE_TUNNEL_PT100 //#define SPECIAL_DISPENSERS diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index b61201992..c46d62ade 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1552,7 +1552,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue) if ((readValue < (HeaterCmd[index].targettemperatue * AcHeatersLoweroperationLimit/1000))||(readValue > (HeaterCmd[index].targettemperatue * AcHeatersUpperoperationLimit/1000)))//read value within 0.5 percent from target { //InitialHeating = false; - ReportWithPackageFilter(HeatersFilter,"AC NOTReady",__FILE__,index,readValue,RpWarning,(HeaterCmd[index].targettemperatue), 0); + ReportWithPackageFilter(HeatersFilter,"AC NOT Ready",__FILE__,index,readValue,RpWarning,(HeaterCmd[index].targettemperatue), 0); HeaterAtTemp[index] = false; HeaterPrepareReady(); } |