aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded
diff options
context:
space:
mode:
authorShai Frieder <Shai.Frieder@twine-s.com>2020-02-20 12:16:06 +0200
committerShai Frieder <Shai.Frieder@twine-s.com>2020-02-20 12:16:06 +0200
commitf5fc449bf3d2ceba27d3b0641102eddcd6095cb7 (patch)
tree49858d9c96e51be6291ea07b2212eb058c860dbd /Software/Embedded_SW/Embedded
parenta391142a20ab2c47a4ac6c1f6a7f3b77f04b4a92 (diff)
downloadTango-f5fc449bf3d2ceba27d3b0641102eddcd6095cb7.tar.gz
Tango-f5fc449bf3d2ceba27d3b0641102eddcd6095cb7.zip
add prints to test the I2C to the fan (problrm with FAN5, FAN6)
Diffstat (limited to 'Software/Embedded_SW/Embedded')
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c2
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/D_EMC2302_fan.c21
-rw-r--r--Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.c4
3 files changed, 16 insertions, 11 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
index 40f6fce5e..00c46f378 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
@@ -415,7 +415,7 @@ void I2C_ReadingTask(UArg arg0, UArg arg1)
Semaphore_post(I2C_Sem);
TEMPERATURE_SENSOR_ID_ENUM Sensor_i;
I2C_Task_Handle = Task_self();
- double dbl_setpoint_Q = 0.0;
+// double dbl_setpoint_Q = 0.0;
while(1)
{
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 2d410e2c4..24f5fdb5b 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
@@ -322,15 +322,19 @@ uint8_t D_Fan_Read_Tacho_HIGH(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2
{
writebuffer = EMC2301_TACH_1_READING_HIGH;
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
{
writebuffer = EMC2301_TACH_2_READING_HIGH;
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);
}
return status;
@@ -345,15 +349,19 @@ uint8_t D_Fan_Read_Tacho_LOW(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2C
{
writebuffer = EMC2301_TACH_1_READING_LOW;
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
{
writebuffer = EMC2301_TACH_2_READING_LOW;
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);
}
return status;
@@ -362,8 +370,3 @@ uint8_t D_Fan_Read_Tacho_LOW(uint8_t EMC2302_I2C_bus_number ,uint8_t EMC2302_I2C
-/*
-control by:
-WHS_Fan_PWM_Control(0, 0xFF);//0-0xFF
-WHS_Fan_PWM_Control(1, 0xFF);//0-0xFF
-*/
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 b3d967ad3..db8698837 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
@@ -72,7 +72,7 @@ bool Select_WHS_Fan_Mux_Channel(WHS_fan_num fan_number)
// {
// return status;
// }
- //ReportWithPackageFilter(WasteFilter,"------------ select fan MUX (fan_number)-----------------", __FILE__,__LINE__,fan_number, RpMessage, 0, 0);
+ ReportWithPackageFilter(WasteFilter,"------------ select fan MUX (fan_number)-----------------", __FILE__,__LINE__,fan_number, RpMessage, 0, 0);
switch (fan_number)
{
case FAN1:
@@ -127,7 +127,9 @@ 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;
}