diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-18 16:52:16 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-06-18 16:52:16 +0300 |
| commit | 2baa6b0a84284804c699c48b0bbbde85cd8d3975 (patch) | |
| tree | d2b789c59521c2a7e7fe331c9ebb9b58a1e9da68 /Software/Embedded_SW/Embedded/Common | |
| parent | 054debe0f90ef6312f669963c2c62810fc766a8d (diff) | |
| parent | 0bd5bb08169bf0c72dc686b48b12499f61122958 (diff) | |
| download | Tango-2baa6b0a84284804c699c48b0bbbde85cd8d3975.tar.gz Tango-2baa6b0a84284804c699c48b0bbbde85cd8d3975.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Common')
6 files changed, 6 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c index cd5e6c034..10b496573 100644 --- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c +++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c @@ -7,9 +7,9 @@ #include <string.h> #include <stdint.h> #include <assert.h> +#include <DataDef.h> #include <utils/ustdlib.h> -#include "DataDef.h" typedef struct { diff --git a/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/MCU_MAIN_pinout.c b/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/MCU_MAIN_pinout.c index 88198353e..bd9336db3 100644 --- a/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/MCU_MAIN_pinout.c +++ b/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/MCU_MAIN_pinout.c @@ -40,9 +40,9 @@ // //***************************************************************************** +#include <DataDef.h> #include <stdbool.h> #include <stdint.h> -#include "datadef.h" #include "inc/hw_gpio.h" #include "inc/hw_memmap.h" #include "inc/hw_types.h" diff --git a/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/MCU_MAIN_pinout.h b/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/MCU_MAIN_pinout.h index 94a9e8c0b..d97ab0e0a 100644 --- a/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/MCU_MAIN_pinout.h +++ b/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/MCU_MAIN_pinout.h @@ -54,7 +54,7 @@ extern "C" { #endif -#include "datadef.h" +#include "../../DataDef.h" //***************************************************************************** // diff --git a/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin.c b/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin.c index 9a2ecd5af..5798b01ee 100644 --- a/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin.c +++ b/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin.c @@ -38,7 +38,6 @@ #include <stdint.h> #include <stdbool.h> -#include "datadef.h" #include <inc/hw_types.h> #include <inc/hw_memmap.h> #include <inc/hw_gpio.h> @@ -46,6 +45,7 @@ #include <driverlib/pin_map.h> #include <driverlib/rom_map.h> #include <driverlib/gpio.h> +#include <DataDef.h> #include "Common/Sys_PinOut_Config/Pin.h" diff --git a/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin.h b/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin.h index abdb85cbe..90cfe166c 100644 --- a/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin.h +++ b/Software/Embedded_SW/Embedded/Common/Sys_PinOut_Config/Pin.h @@ -38,7 +38,7 @@ #ifndef __PIN_H__ #define __PIN_H__ -#include "datadef.h" +#include "../../DataDef.h" #ifdef EVALUATION_BOARD extern void PortFunctionInit(void); diff --git a/Software/Embedded_SW/Embedded/Common/report/filter.c b/Software/Embedded_SW/Embedded/Common/report/filter.c index f6ce8fda4..b922e53bc 100644 --- a/Software/Embedded_SW/Embedded/Common/report/filter.c +++ b/Software/Embedded_SW/Embedded/Common/report/filter.c @@ -18,6 +18,7 @@ * ******************************************************************************/ +#include <DataDef.h> #include "report.h" #include <stdio.h> #include <string.h> @@ -27,7 +28,6 @@ #include "filter.h" #include "distributor.h" /* reportDistribute */ -#include <DataDef.h> //#define MAX_STRING_LEN 255 |