diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-23 15:41:29 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-02-23 15:41:29 +0200 |
| commit | ffbe0df145c04bc9e39d5db162a49928ae205da3 (patch) | |
| tree | 7f91f111ed1a006cd15b2c8245b1807810c706e9 /Software/Embedded_SW/Embedded/Drivers | |
| parent | d84efaac07fb72baad39eda62b25c07ec7b28489 (diff) | |
| download | Tango-ffbe0df145c04bc9e39d5db162a49928ae205da3.tar.gz Tango-ffbe0df145c04bc9e39d5db162a49928ae205da3.zip | |
switch ADC line 16 and 17 (drier 1, drier 2). pt100 error is a BIT failure. dancer status, and use low dancer values and 0x3FFF (for dancer rollover)
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
3 files changed, 7 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.h b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.h index 65064c837..2d5a95c2a 100644 --- a/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.h +++ b/Software/Embedded_SW/Embedded/Drivers/ADC_Sampling/ADC.h @@ -30,8 +30,8 @@ typedef enum ADC_LEFT_DANCER_1 ,//13 ADC_LEFT_DANCER_2 ,//14 ADC_RIGHT_DANCER ,//15 - ADC_DRYER_CURRENT_2 ,//16 - ADC_DRYER_CURRENT_1 ,//17 + ADC_DRYER_CURRENT_1 ,//16 + ADC_DRYER_CURRENT_2 ,//17 ADC_DRYER_CURRENT_3 ,//18 ADC_FPGA_3V3 ,//19 ADC_MAX_ADC_DEVICES ,//20 diff --git a/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.c b/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.c index b2be0d407..749fad6b0 100644 --- a/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.c +++ b/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.c @@ -85,6 +85,10 @@ uint32_t Read_Dryer_ENC_Position () //REPORT_MSG(Dryer_ENC.Position,"Read_Dryer_ENC_Position"); return Dryer_ENC.Position; } +uint32_t Read_Dryer_Status(HardwareDancerType DancerId) +{ + return Dryer_ENC.Gen_status; +} uint32_t Control_Read_Dryer_Position(HardwareDancerType DancerId, uint32_t Parameter1) { return Dryer_ENC.Position; diff --git a/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.h b/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.h index 33a961c58..8c9d8cfd7 100644 --- a/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.h +++ b/Software/Embedded_SW/Embedded/Drivers/SSI_Comm/Dancer/Dancer.h @@ -13,6 +13,7 @@ uint32_t Read_Dancer_Position (HardwareDancerType DancerId); uint32_t Control_Read_Dancer_Position(HardwareDancerType DancerId, uint32_t Parameter1); uint32_t Read_Dryer_ENC_Position (); uint32_t Control_Read_Dryer_Position(uint32_t DryerID, uint32_t Parameter1); +uint32_t Read_Dryer_Status(HardwareDancerType DancerId); void Loop_SSI(); |