diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-21 08:51:24 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-21 08:51:24 +0200 |
| commit | fab9ae9a672bf7ca083f5042facf914295a20b50 (patch) | |
| tree | 88935a669d6cf3f3e53daae18dd2c0d8e1b6b3dc /Software/Embedded_SW/Embedded | |
| parent | 1452b0fd34fc4dbf5c8a421b50dd3eeb031a5493 (diff) | |
| download | Tango-fab9ae9a672bf7ca083f5042facf914295a20b50.tar.gz Tango-fab9ae9a672bf7ca083f5042facf914295a20b50.zip | |
comments and logs
Diffstat (limited to 'Software/Embedded_SW/Embedded')
3 files changed, 5 insertions, 7 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c index b9cef250b..cc61998a3 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c @@ -324,7 +324,7 @@ uint8_t D_Fan_Read_Tacho_HIGH(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2 status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1); //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); delayUs(10);//TODO - check the delay - status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); + status |= I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); } else @@ -333,7 +333,7 @@ uint8_t D_Fan_Read_Tacho_HIGH(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2 status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1); //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); delayUs(10);//TODO - check the delay - status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); + status |= I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_HIGH R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); } @@ -351,7 +351,7 @@ uint8_t D_Fan_Read_Tacho_LOW(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2C status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1); //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); delayUs(10);//TODO - check the delay - status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); + status |= I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); } else @@ -360,7 +360,7 @@ uint8_t D_Fan_Read_Tacho_LOW(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2C status = I2C_Write(EMC2302_I2C_bus_number, EMC2302_I2C_addr, &writebuffer, 1); //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW W (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); delayUs(10);//TODO - check the delay - status = I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); + status |= I2C_Read(EMC2302_I2C_bus_number, EMC2302_I2C_addr + 1, p_data, 1); //ReportWithPackageFilter(WasteFilter,"------------ D_Fan_Read_Tacho_LOW R (status) (fan)-----------------", __FILE__,__LINE__, status, RpMessage, Fan, 0); } diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c index ca3ef7c63..2debef0d6 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c @@ -127,9 +127,7 @@ bool WHS_Read_fan_tach(WHS_fan_num fan_number) Select_WHS_Fan_Mux_Channel(fan_number); status |= D_Fan_Read_Tacho_HIGH(I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADDRESS, !(fan_number & 0x01), &(D_EMC2302_Read[fan_driver].Reg.TACHReading_High[!(fan_number & 0x01)])); - delayUs(10);//TODO - check the delay status |= D_Fan_Read_Tacho_LOW (I2C_ID_WHS_CARD ,I2CFanViaSwitch_ADDRESS, !(fan_number & 0x01), &(D_EMC2302_Read[fan_driver].Reg.TACHReading_Low [!(fan_number & 0x01)])); - delayUs(10);//TODO - check the delay return status; } diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c index f00d6c6ed..22c409a05 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c @@ -30,7 +30,7 @@ double average_Q_orifice1; double average_Q_orifice3; bool ORF1_flageNewBlowerValue; bool ORF3_flageNewBlowerValue; -double SetPoint_Q = 5.0; +double SetPoint_Q = 7.0; bool CofigurationFlow = 1; int32_t i2c_smbus_write_word_data(int i2cFileDescriptor, uint8_t command_regAddress, uint16_t regValue) |