diff options
| author | Avi Levkovich <avi@twine-s.com> | 2018-08-05 17:18:27 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2018-08-05 17:18:27 +0300 |
| commit | 7ecebc1b110323767067348897596151fb8a8262 (patch) | |
| tree | c9cfc339274b5aa0c571fd9f5048df75af9849bf /Software/Embedded_SW/Embedded/Modules | |
| parent | 898213e7a5380bea18e5b45ef48b4d2d990b4832 (diff) | |
| download | Tango-7ecebc1b110323767067348897596151fb8a8262.tar.gz Tango-7ecebc1b110323767067348897596151fb8a8262.zip | |
Calculate Speed Sensor Velocity
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
5 files changed, 6 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c index 9337676e4..0ea10bafc 100644 --- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c +++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c @@ -11,13 +11,13 @@ #include "AlarmHandling.h" #include <driverlib/timer.h> +#include <Drivers/SSI_Comm/SSI_Comm.h> #include <inc/hw_ints.h> #include "drivers/adc_sampling/adc.h" #include "Control/control.h" #include "drivers/Motors/Motor.h" -#include "drivers/Danser_SSI/SSI_Comm.h" #include "drivers/Heater/TemperatureSensor.h" #include "drivers/FPGA/FPGA_SPI_Comm.h" #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 8243c5faa..64ac4789d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -20,13 +20,13 @@ #include "MillisecTask.h" #include <driverlib/timer.h> +#include <Drivers/SSI_Comm/SSI_Comm.h> #include <inc/hw_ints.h> #include "drivers/adc_sampling/adc.h" #include "control.h" #include "drivers/Motors/Motor.h" -#include "drivers/Danser_SSI/SSI_Comm.h" #include "drivers/Heater/TemperatureSensor.h" #include "drivers/FPGA/FPGA_SPI_Comm.h" #include "drivers/FPGA/FPGA.h" diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index ead95388a..a163bd18f 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -13,9 +13,9 @@ #include "Control/control.h" #include <Container.h> +#include <Drivers/SSI_Comm/SSI_Comm.h> #include "drivers/Motors/Motor.h" -#include "drivers/Danser_SSI/SSI_Comm.h" #include "drivers/Heater/TemperatureSensor.h" #include "drivers/FPGA/FPGA_SPI_Comm.h" #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h index 3a0b25ba8..d37015b61 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread.h @@ -2,6 +2,7 @@ #ifndef MODULES_THREAD_THREAD_H_ #define MODULES_THREAD_THREAD_H_ +#include "../../Drivers/SSI_Comm/SSI_Comm.h" #include "PMR/common/MessageContainer.pb-c.h" #include "PMR/Hardware/HardwareMotor.pb-c.h" #include "PMR/Hardware/HardwareMotorType.pb-c.h" @@ -13,8 +14,6 @@ #include "PMR/Printing/JobSpoolType.pb-c.h" #include "drivers/Motors/Motor.h" -#include "drivers/Danser_SSI/ssi_comm.h" - #include "thread_ex.h" typedef struct diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 75d54ef02..af9be2cc7 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -20,7 +20,8 @@ #include "StateMachines/Printing/PrintingSTM.h" #include "drivers/Motors/Motor.h" -#include "drivers/Danser_SSI/ssi_comm.h" +//#include "drivers/SSI_Comm/ssi_comm.h" +#include "drivers/SSI_Comm/Dancer/Dancer.h" #include "drivers/Heater/TemperatureSensor.h" #include "drivers/Heater/Heater.h" #include "drivers/Motors/Motor.h" |