diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-07 17:20:42 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-06-07 17:20:42 +0300 |
| commit | a39a1234c9f574b6365f3e8940e6256f2daeca5a (patch) | |
| tree | 7292e9f4cc8062c945368ebbf8c62f04ec3a858e /Software | |
| parent | aa2a2f4b7e157525bbb8ffb2dd180ef1dc8e6f62 (diff) | |
| download | Tango-a39a1234c9f574b6365f3e8940e6256f2daeca5a.tar.gz Tango-a39a1234c9f574b6365f3e8940e6256f2daeca5a.zip | |
Version 1.4.6.30
Diffstat (limited to 'Software')
3 files changed, 15 insertions, 7 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c index c55b1fe1f..0af8fb729 100644 --- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c +++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c @@ -20,7 +20,7 @@ typedef struct } TangoVersion_t; -TangoVersion_t _gTangoVersion = {1,4,6,29}; +TangoVersion_t _gTangoVersion = {1,4,6,30}; #define BUILD_DATE __DATE__ char Dat[50] = BUILD_DATE; char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d diff --git a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_DispPressSens.c b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_DispPressSens.c index 191653c64..6b5f7b4fe 100644 --- a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_DispPressSens.c +++ b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC_DispPressSens.c @@ -64,7 +64,8 @@ float CalculateDispenserPressure (int DispenserId) if(data<Bits_Min) { data = Bits_Min;//40mA 0Bar - Report("Dispenser - Reading wrong data from ADC",__FILE__,__LINE__,DispenserId,RpWarning,(int)data,0); + if (isDispenserInConfig()) + Report("Dispenser - Reading wrong data from ADC",__FILE__,__LINE__,DispenserId,RpWarning,(int)data,0); } temp = a[DispenserId] * data + b[DispenserId]; diff --git a/Software/Embedded_SW/Embedded/Software Release Notes.txt b/Software/Embedded_SW/Embedded/Software Release Notes.txt index 8a76e6ee4..6e176581e 100644 --- a/Software/Embedded_SW/Embedded/Software Release Notes.txt +++ b/Software/Embedded_SW/Embedded/Software Release Notes.txt @@ -1,18 +1,25 @@ Embedded SW Release note - Version 1.4.6.30 - Pack 2+ ============================================================= +fix bug in SW update fix firmware update when no files -add main CPU EEPROM Read/Write from stub -support new FPGA - different clocks (EMC) remove ADC interrupt - polling only -read air flow from arc head - prepare fix head identification on head hw failure improve WHS air flow control fix FlashInitAndLoad() (although not in use) -fix (?) dryer heating. lots of logs added, VAC control - histeresys added -start blower increase a bit later to solve the temerature alarms preventing jobs +fix (?) dryer heating. lots of logs added, VAC control - hysteresis added +start blower increase a bit later to solve the temperature alarms preventing jobs maximal pressure buildup 2.5 prevent job when head/drier wide open thread load - skip head lid and actuators according to head type +thread load - fix error messages +thread load - support "try" message from PPC on problem +drivers: + add main CPU EEPROM Read/Write from stub + new dispenser pressure sensors (based on EEPROM) + EMC support - external clock / internal clock in motors + read air flow in arc head + + Embedded SW Release note - Version 1.4.6.29 - Pack 2 ============================================================= |