diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-18 09:38:52 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2019-09-18 09:38:52 +0300 |
| commit | 22aea2d70ade546a64f2339e06ea1bcb7c10b699 (patch) | |
| tree | 664756135fa2b76530a40498c3ea2209c3f9f3c5 /Software/Embedded_SW/Embedded/Modules | |
| parent | 655862d7719e3186071107ebe6f2da0f50aa9fd1 (diff) | |
| download | Tango-22aea2d70ade546a64f2339e06ea1bcb7c10b699.tar.gz Tango-22aea2d70ade546a64f2339e06ea1bcb7c10b699.zip | |
set Debug log minimal category + some warnings handled
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
4 files changed, 12 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c index a9e8a5ee1..4a7e29740 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_maint.c @@ -14,6 +14,7 @@ #include "StateMachines/Printing/printingSTM.h" #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h" +#include "drivers/I2C_Communication/Dispenser_Card/IO_Ports/Dispenser_IO.h" #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" #include "drivers/FPGA/FPGA_SPI_Comm.h" diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_HW_Version.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_HW_Version.c index 4867587d9..2d7137a16 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_HW_Version.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_HW_Version.c @@ -1,8 +1,7 @@ #include <Container.h> #include <DataDef.h> -#include <PMR/Stubs/StubHWVersionResponse.pb-c.h> -#include <PMR/Stubs/StubHWVersionRequest.pb-c.h> + #include <stdbool.h> #include <stdlib.h> #include <stdio.h> @@ -11,15 +10,20 @@ #include "inc/hw_memmap.h" #include "inc/hw_types.h" #include "inc/hw_uart.h" +#include "driverlib/rom_map.h" +#include "driverlib/rom.h" #include "driverlib/gpio.h" + #include "Drivers/USB_Communication/USBCDCD.h" +#include "Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" +#include "Drivers/FPGA/FPGA.h" #include "MessageContainer.pb-c.h" +#include <PMR/Stubs/StubHWVersionResponse.pb-c.h> +#include <PMR/Stubs/StubHWVersionRequest.pb-c.h> + #include "Stub_Status.h" -#include "drivers/FPGA/FPGA.h" -#include "driverlib/rom_map.h" -#include "driverlib/rom.h" diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/temperature_sensor.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/temperature_sensor.c index 67d61ea65..4e97315f9 100644 --- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/temperature_sensor.c +++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/temperature_sensor.c @@ -120,7 +120,7 @@ int temperature_main(){ SysCtlClockSet(SYSCTL_SYSDIV_2_5|SYSCTL_USE_PLL|SYSCTL_OSC_MAIN|SYSCTL_XTAL_16MHZ); - InitConsole(); + //InitConsole(); // // This array is used for storing the data read from the ADC FIFO. It // must be as large as the FIFO for the sequencer in use. This example diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h index fabb823fc..32d7772de 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_ex.h @@ -75,5 +75,6 @@ bool ThreadLoadingActive(void); void ThreadLoadPollRequest(MessageContainer* requestContainer); void ThreadLoadRequest(MessageContainer* requestContainer); +uint32_t Thread_Load_End(void); #endif |