diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-03-06 13:12:43 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-03-06 13:12:43 +0200 |
| commit | 9aab05cf66c58ae6f444ddcece0aa02e0fa54a3a (patch) | |
| tree | 039696e14e78cacd15819bb7aeaae86cb30e378d /Software/Embedded_SW | |
| parent | 745cb5da6ddf2418258892fa49f4e03b28645bed (diff) | |
| download | Tango-9aab05cf66c58ae6f444ddcece0aa02e0fa54a3a.tar.gz Tango-9aab05cf66c58ae6f444ddcece0aa02e0fa54a3a.zip | |
update the function Read_Head_MixChip_Heaters_Current
+
stub for HeatersEnd
Diffstat (limited to 'Software/Embedded_SW')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c | 12 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Heater.c | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c index 53fa64db4..94db2e3f4 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c @@ -305,27 +305,27 @@ uint32_t Read_Head_MixChip_Heaters_Current(HEATERS_CURRENT Heater_ID) //0-5 { case HEAD_ZONE_1: I2C_Slave_Add = 0x40; - Channel = 0x08; + Channel = 0x10; break; case HEAD_ZONE_2: I2C_Slave_Add = 0x40; - Channel = 0x10; + Channel = 0x08; break; case HEAD_ZONE_3: I2C_Slave_Add = 0x40; - Channel = 0x20; + Channel = 0x04; break; case HEAD_ZONE_4: I2C_Slave_Add = 0x44; - Channel = 0x01; + Channel = 0x80; break; case HEAD_ZONE_5_6: I2C_Slave_Add = 0x44; - Channel = 0x02; + Channel = 0x40; break; case MIXCHIP: I2C_Slave_Add = 0x46; - Channel = 0x20; + Channel = 0x08; break; default: diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Heater.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Heater.c index 47e1bda34..7735c9955 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Heater.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Heater.c @@ -25,7 +25,7 @@ void Stub_HeaterRequest(MessageContainer* requestContainer) { - uint32_t status = NOT_SUPPORTED; + uint32_t status = PASSED; MessageContainer responseContainer; StubHeaterRequest* request = stub_heater_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); @@ -35,6 +35,11 @@ void Stub_HeaterRequest(MessageContainer* requestContainer) request->heatergroupon */ + if((request->heatergroupid == 0xff) && (request->heatergroupon == false) && (request->heatertemperaturereq == 0)) + { + HeatersEnd(); + } + else if (request->heatergroupon ) status = ActivateHeater(request->heatergroupid); else |