diff options
| author | Avi Levkovich <avi@twine-s.com> | 2021-01-12 10:28:10 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2021-01-12 10:28:10 +0200 |
| commit | 38d2b46c7ca963a31ee43ae5bb1623dca2bc3e7c (patch) | |
| tree | d32a769242e70d0ec16bb31a800d24d90922e8d9 /Software/Embedded_SW/Embedded/Drivers | |
| parent | 05c1491a79416934cd4e1c13a0972fe621f97056 (diff) | |
| parent | bfd323badd5c5039f49779e3a08452d203bf284e (diff) | |
| download | Tango-38d2b46c7ca963a31ee43ae5bb1623dca2bc3e7c.tar.gz Tango-38d2b46c7ca963a31ee43ae5bb1623dca2bc3e7c.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Drivers')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c index e72895d9b..a6ac9898a 100644 --- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c +++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c @@ -894,6 +894,8 @@ bool Get_COVER_1_State(COVERS_ENUM CoverId) default: return false; } +#else + return OK; #endif } diff --git a/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c b/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c index ad7e91b88..5edb039bd 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c +++ b/Software/Embedded_SW/Embedded/Drivers/Motors/Motor.c @@ -260,10 +260,12 @@ float MotorGetSpeedFromFPGA_Res(TimerMotors_t _motorId) uint32_t MotorGetADCFromFPGA(TimerMotors_t _motorId) { - #ifndef EVALUATION_BOARD +#ifndef EVALUATION_BOARD FPGA_Get_ADC_OUT_Cmd(_motorId); return OK; - #endif +#else + return 0; +#endif } bool MotorParseStatus(TimerMotors_t _motorId) |