diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-11-03 12:08:14 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-11-03 12:08:14 +0200 |
| commit | 09acf407dc5f432a2c293bde6ebf103b28af2549 (patch) | |
| tree | ca240db202dc66c03d05dd46e2e34777254cf2de /Software/Embedded_SW/Embedded/Drivers | |
| parent | 612f456f46ebf6726dd1aa2b0fe1476a72011d3a (diff) | |
| download | Tango-09acf407dc5f432a2c293bde6ebf103b28af2549.tar.gz Tango-09acf407dc5f432a2c293bde6ebf103b28af2549.zip | |
bugs, mostly in arc head init
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
2 files changed, 12 insertions, 9 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.c index 6c2d54111..335aab113 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.c @@ -199,7 +199,7 @@ bool WHS_PT100_config(TEMPERATURE_SENSOR_ID_ENUM SensorId) //ADS122_WriteAllReg(uint8_t i2cbus, WHS_chip_address i2cadd, D_ADS122C04_TempSensConfigStruc *p_writeValue); } -bool WHS_PT100_Get(TEMPERATURE_SENSOR_ID_ENUM SensorId, uint8_t *value ) +bool WHS_PT100_Get(TEMPERATURE_SENSOR_ID_ENUM SensorId, uint32_t *value ) { bool Status = OK; switch (SensorId) @@ -225,7 +225,7 @@ bool WHS_PT100_Get(TEMPERATURE_SENSOR_ID_ENUM SensorId, uint8_t *value ) } -bool WHS_PT100_Read(TEMPERATURE_SENSOR_ID_ENUM SensorId) +uint32_t WHS_PT100_Read(TEMPERATURE_SENSOR_ID_ENUM SensorId) { bool Status = OK; uint32_t Temperatures = 0; @@ -267,7 +267,10 @@ bool WHS_PT100_Read(TEMPERATURE_SENSOR_ID_ENUM SensorId) break; } - return Status; + if (Status == OK) + return Temperatures; + else + return (uint32_t)Status; } bool Test_WHS_PT100_ADC() @@ -277,10 +280,10 @@ bool Test_WHS_PT100_ADC() //status |= WHS_PT100_InitConfigReg(); - status |= WHS_PT100_Read(/*TEMPERATURE_SENSOR_ID_ENUM*/ WHS_PT100_1_0X80_0); - status |= WHS_PT100_Read(/*TEMPERATURE_SENSOR_ID_ENUM*/ WHS_PT100_3_0X82_0); - status |= WHS_PT100_Read(/*TEMPERATURE_SENSOR_ID_ENUM*/ WHS_PT100_2_0X80_1); - status |= WHS_PT100_Read(/*TEMPERATURE_SENSOR_ID_ENUM*/ WHS_PT100_4_0X82_1); + //status |= WHS_PT100_Read(/*TEMPERATURE_SENSOR_ID_ENUM*/ WHS_PT100_1_0X80_0); + //status |= WHS_PT100_Read(/*TEMPERATURE_SENSOR_ID_ENUM*/ WHS_PT100_3_0X82_0); + //status |= WHS_PT100_Read(/*TEMPERATURE_SENSOR_ID_ENUM*/ WHS_PT100_2_0X80_1); + //status |= WHS_PT100_Read(/*TEMPERATURE_SENSOR_ID_ENUM*/ WHS_PT100_4_0X82_1); return status; } diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.h index ab09f0e9d..78900af52 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_ADS122_PT100/WHS_PT100_ADC.h @@ -25,8 +25,8 @@ extern uint32_t was_Data_ADC_Head; bool WHS_PT100_InitConfigReg(); bool WHS_PT100_ControlMux_Before_Reading(TEMPERATURE_SENSOR_ID_ENUM SensorId); -bool WHS_PT100_Read(TEMPERATURE_SENSOR_ID_ENUM SensorId); -bool WHS_PT100_Get(TEMPERATURE_SENSOR_ID_ENUM SensorId, uint8_t *value ); +uint32_t WHS_PT100_Read(TEMPERATURE_SENSOR_ID_ENUM SensorId); +bool WHS_PT100_Get(TEMPERATURE_SENSOR_ID_ENUM SensorId, uint32_t *value ); bool Test_WHS_PT100_ADC(); #endif /* DRIVERS_I2C_COMMUNICATION_WHS_CARD_PT100_PT100_ADC_H_ */ |