diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-10-04 14:56:36 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-10-04 14:56:36 +0300 |
| commit | 632378c43fea445b5ce0808eabc8d02a97a7a387 (patch) | |
| tree | 0f71a85552f944875da567d0dc391ed981138305 /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | 5461fa6ed66e087ea3cc582af39a733e1a1202c2 (diff) | |
| parent | 141b450771f7e98b93eca9492e0cbe800da13e1f (diff) | |
| download | Tango-632378c43fea445b5ce0808eabc8d02a97a7a387.tar.gz Tango-632378c43fea445b5ce0808eabc8d02a97a7a387.zip | |
merge conflict
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 6f234e26a..9b4f945d8 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -23,6 +23,7 @@ #include <Drivers/SSI_Comm/SSI_Comm.h> #include <Drivers/SSI_Comm/Speed_Sensor/Speed_Sensor.h> #include <Drivers/SSI_Comm/Dancer/Dancer.h> +#include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" #include <inc/hw_ints.h> #include "drivers/adc_sampling/adc.h" |