From a00039853220156635c6da04f6db37e6753a608b Mon Sep 17 00:00:00 2001 From: SMFSW Date: Sun, 7 Oct 2018 15:45:35 +0200 Subject: [PATCH] v0.7: globals.h include moved so that it's only included once for a component --- AT42QT1244.c | 1 - AT42QT1244.h | 2 ++ AT42QT1244_ex.c | 1 - AT42QT1244_proc.c | 1 - BMP180.c | 1 - BMP180.h | 2 ++ BMP180_ex.c | 1 - BMP180_proc.c | 1 - DRV2605L.c | 1 - DRV2605L.h | 2 ++ DRV2605L_ex.c | 1 - DRV2605L_proc.c | 1 - DS_GPMS.c | 1 - DS_GPMS.h | 2 ++ DS_GPMS_ex.c | 1 - DS_GPMS_proc.c | 1 - FM24C.c | 1 - FM24C.h | 2 ++ FM24C_ex.c | 1 - MB85RC256V.c | 1 - MB85RC256V.h | 2 ++ MB85RC256V_ex.c | 1 - MB85RC256V_proc.c | 1 - MCP4725.c | 1 - MCP4725.h | 2 ++ MCP4725_ex.c | 1 - MCP4725_proc.c | 1 - MCP9808.c | 1 - MCP9808.h | 2 ++ MCP9808_ex.c | 1 - MCP9808_proc.c | 1 - MTCH6102.c | 1 - MTCH6102.h | 2 ++ MTCH6102_ex.c | 1 - MTCH6102_proc.c | 1 - PCA9624.c | 1 - PCA9624.h | 2 ++ PCA9624_ex.c | 1 - PCA9624_proc.c | 1 - PCA9685.c | 1 - PCA9685.h | 2 ++ PCA9685_ex.c | 1 - PCA9685_proc.c | 1 - PCF8523.c | 1 - PCF8523.h | 2 ++ PCF8523_ex.c | 1 - PCF8523_proc.c | 1 - ReleaseNotes.md | 1 + S11059.c | 1 - S11059.h | 2 ++ S11059_ex.c | 1 - S11059_proc.c | 1 - TCS3400.c | 1 - TCS3400.h | 2 ++ TCS3400_ex.c | 1 - TCS3400_proc.c | 1 - TCS3472.c | 1 - TCS3472.h | 2 ++ TCS3472_ex.c | 1 - TCS3472_proc.c | 1 - TSL2591.c | 1 - TSL2591.h | 2 ++ TSL2591_ex.c | 1 - TSL2591_proc.c | 1 - template/CPNT.c.txt | 1 - template/CPNT.h.txt | 2 ++ template/CPNT_ex.c.txt | 1 - template/CPNT_proc.c.txt | 1 - 68 files changed, 35 insertions(+), 50 deletions(-) diff --git a/AT42QT1244.c b/AT42QT1244.c index b4100b381..2d138df5e 100755 --- a/AT42QT1244.c +++ b/AT42QT1244.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "AT42QT1244.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_AT42QT1244) diff --git a/AT42QT1244.h b/AT42QT1244.h index bb16485a3..7d8c36213 100755 --- a/AT42QT1244.h +++ b/AT42QT1244.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/AT42QT1244_ex.c b/AT42QT1244_ex.c index 02ff2dd26..b92d33bd7 100755 --- a/AT42QT1244_ex.c +++ b/AT42QT1244_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "AT42QT1244.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_AT42QT1244) diff --git a/AT42QT1244_proc.c b/AT42QT1244_proc.c index 5cd332589..90317f107 100755 --- a/AT42QT1244_proc.c +++ b/AT42QT1244_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "AT42QT1244.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_AT42QT1244) diff --git a/BMP180.c b/BMP180.c index 5231dd78b..6f2bec088 100755 --- a/BMP180.c +++ b/BMP180.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "BMP180.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_BMP180) diff --git a/BMP180.h b/BMP180.h index 472f90051..f3505d9cc 100755 --- a/BMP180.h +++ b/BMP180.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/BMP180_ex.c b/BMP180_ex.c index dcafc83ea..d1ef25525 100755 --- a/BMP180_ex.c +++ b/BMP180_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "BMP180.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_BMP180) diff --git a/BMP180_proc.c b/BMP180_proc.c index 927c25d95..4569a2fa0 100755 --- a/BMP180_proc.c +++ b/BMP180_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "BMP180.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_BMP180) diff --git a/DRV2605L.c b/DRV2605L.c index ebd0dde14..39d04ec00 100755 --- a/DRV2605L.c +++ b/DRV2605L.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "DRV2605L.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_DRV2605L) diff --git a/DRV2605L.h b/DRV2605L.h index 102e0ef34..01729d1f7 100755 --- a/DRV2605L.h +++ b/DRV2605L.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/DRV2605L_ex.c b/DRV2605L_ex.c index bed1f79ed..6b21eb868 100755 --- a/DRV2605L_ex.c +++ b/DRV2605L_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "DRV2605L.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_DRV2605L) diff --git a/DRV2605L_proc.c b/DRV2605L_proc.c index ab3db11c2..c7cdac293 100755 --- a/DRV2605L_proc.c +++ b/DRV2605L_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "DRV2605L.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_DRV2605L) diff --git a/DS_GPMS.c b/DS_GPMS.c index 974cc8dbb..1a8dd6917 100755 --- a/DS_GPMS.c +++ b/DS_GPMS.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "DS_GPMS.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_GPMS) diff --git a/DS_GPMS.h b/DS_GPMS.h index 2830727d2..2300112c9 100755 --- a/DS_GPMS.h +++ b/DS_GPMS.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/DS_GPMS_ex.c b/DS_GPMS_ex.c index e43657bd3..8a57abbbe 100755 --- a/DS_GPMS_ex.c +++ b/DS_GPMS_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "DS_GPMS.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_GPMS) diff --git a/DS_GPMS_proc.c b/DS_GPMS_proc.c index 2b13cc6e8..78ac544ce 100755 --- a/DS_GPMS_proc.c +++ b/DS_GPMS_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "DS_GPMS.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_GPMS) diff --git a/FM24C.c b/FM24C.c index 3cd4c64f9..5ebee9193 100755 --- a/FM24C.c +++ b/FM24C.c @@ -7,7 +7,6 @@ **/ /****************************************************************/ #include "FM24C.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_FM24C) diff --git a/FM24C.h b/FM24C.h index 24f936137..8e5be8072 100755 --- a/FM24C.h +++ b/FM24C.h @@ -14,6 +14,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/FM24C_ex.c b/FM24C_ex.c index ee3344fb3..01a1de67f 100755 --- a/FM24C_ex.c +++ b/FM24C_ex.c @@ -7,7 +7,6 @@ **/ /****************************************************************/ #include "FM24C.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_FM24C) diff --git a/MB85RC256V.c b/MB85RC256V.c index 2b049283b..8eeb39b76 100755 --- a/MB85RC256V.c +++ b/MB85RC256V.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MB85RC256V.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MB85RC256V) diff --git a/MB85RC256V.h b/MB85RC256V.h index bb67213e7..460e8644b 100755 --- a/MB85RC256V.h +++ b/MB85RC256V.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/MB85RC256V_ex.c b/MB85RC256V_ex.c index 26f51d2e9..27edfc114 100755 --- a/MB85RC256V_ex.c +++ b/MB85RC256V_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MB85RC256V.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MB85RC256V) diff --git a/MB85RC256V_proc.c b/MB85RC256V_proc.c index d12e1892b..0f9ce4ae4 100755 --- a/MB85RC256V_proc.c +++ b/MB85RC256V_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MB85RC256V.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MB85RC256V) diff --git a/MCP4725.c b/MCP4725.c index 88f545b07..7fab452af 100755 --- a/MCP4725.c +++ b/MCP4725.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MCP4725.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MCP4725) diff --git a/MCP4725.h b/MCP4725.h index 42b07b953..15d816e83 100755 --- a/MCP4725.h +++ b/MCP4725.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/MCP4725_ex.c b/MCP4725_ex.c index 2b4978c18..1bf2381a2 100755 --- a/MCP4725_ex.c +++ b/MCP4725_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MCP4725.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MCP4725) diff --git a/MCP4725_proc.c b/MCP4725_proc.c index d3d414095..3572e15f1 100755 --- a/MCP4725_proc.c +++ b/MCP4725_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MCP4725.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MCP4725) diff --git a/MCP9808.c b/MCP9808.c index 372b9c65e..6da91b8af 100755 --- a/MCP9808.c +++ b/MCP9808.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MCP9808.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MCP9808) diff --git a/MCP9808.h b/MCP9808.h index d111b275d..19b210f03 100755 --- a/MCP9808.h +++ b/MCP9808.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/MCP9808_ex.c b/MCP9808_ex.c index 070147b70..6d48ec3ec 100755 --- a/MCP9808_ex.c +++ b/MCP9808_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MCP9808.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MCP9808) diff --git a/MCP9808_proc.c b/MCP9808_proc.c index 7e78c3762..3230f96b0 100755 --- a/MCP9808_proc.c +++ b/MCP9808_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MCP9808.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MCP9808) diff --git a/MTCH6102.c b/MTCH6102.c index c944f4d32..0833843a0 100755 --- a/MTCH6102.c +++ b/MTCH6102.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MTCH6102.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MTCH6102) diff --git a/MTCH6102.h b/MTCH6102.h index fd506269a..b0143b6d8 100755 --- a/MTCH6102.h +++ b/MTCH6102.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/MTCH6102_ex.c b/MTCH6102_ex.c index 1a9118e03..6163fbeaf 100755 --- a/MTCH6102_ex.c +++ b/MTCH6102_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MTCH6102.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MTCH6102) diff --git a/MTCH6102_proc.c b/MTCH6102_proc.c index 8e540d1e4..29bf6c99b 100755 --- a/MTCH6102_proc.c +++ b/MTCH6102_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "MTCH6102.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_MTCH6102) diff --git a/PCA9624.c b/PCA9624.c index ca10f882b..b6a570bf3 100755 --- a/PCA9624.c +++ b/PCA9624.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "PCA9624.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_PCA9624) diff --git a/PCA9624.h b/PCA9624.h index 1865e09e0..6392406c2 100755 --- a/PCA9624.h +++ b/PCA9624.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #include "PCA96xx.h" diff --git a/PCA9624_ex.c b/PCA9624_ex.c index fac83290e..2199f48bd 100755 --- a/PCA9624_ex.c +++ b/PCA9624_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "PCA9624.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_PCA9624) diff --git a/PCA9624_proc.c b/PCA9624_proc.c index 855b99fb5..1203967d2 100755 --- a/PCA9624_proc.c +++ b/PCA9624_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "PCA9624.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_PCA9624) diff --git a/PCA9685.c b/PCA9685.c index dcc7b9b55..ee7bbbbda 100755 --- a/PCA9685.c +++ b/PCA9685.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "PCA9685.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_PCA9685) diff --git a/PCA9685.h b/PCA9685.h index 065fd6415..1df4ab80f 100755 --- a/PCA9685.h +++ b/PCA9685.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #include "PCA96xx.h" diff --git a/PCA9685_ex.c b/PCA9685_ex.c index b91f04a3c..aa01ea1d0 100755 --- a/PCA9685_ex.c +++ b/PCA9685_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "PCA9685.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_PCA9685) diff --git a/PCA9685_proc.c b/PCA9685_proc.c index 35d3f9d14..34fae669b 100755 --- a/PCA9685_proc.c +++ b/PCA9685_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "PCA9685.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_PCA9685) diff --git a/PCF8523.c b/PCF8523.c index f4f26e3f5..f3e0fa9f1 100755 --- a/PCF8523.c +++ b/PCF8523.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "PCF8523.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_PCF8523) diff --git a/PCF8523.h b/PCF8523.h index 7c29b5e0a..86ae1eefe 100755 --- a/PCF8523.h +++ b/PCF8523.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/PCF8523_ex.c b/PCF8523_ex.c index a01a0f703..3143be293 100755 --- a/PCF8523_ex.c +++ b/PCF8523_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "PCF8523.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_PCF8523) diff --git a/PCF8523_proc.c b/PCF8523_proc.c index 381e68f23..b464d791d 100755 --- a/PCF8523_proc.c +++ b/PCF8523_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "PCF8523.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_PCF8523) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index e343f10cf..247dcbd51 100755 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -28,6 +28,7 @@ SOFTWARE. * Using of NONNULL__ attribute instead of checking pointer set to value in code * template: misc fixes * use of const qualifier in function parameters +* rationalization of includes * init sequence returns with error value if something goes wrong during initialization * implementation of slave instance (slave_inst) in xxx_proc files (easier debug access to component structure except special cases) * I2C_component: instance inst becomes bus_inst (new slave_inst implementation in xxx_proc files to avoid name confusions) diff --git a/S11059.c b/S11059.c index 2a1f2afd5..2f32b4e1b 100755 --- a/S11059.c +++ b/S11059.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "S11059.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_S11059) diff --git a/S11059.h b/S11059.h index b340ded61..911ea7e6f 100755 --- a/S11059.h +++ b/S11059.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/S11059_ex.c b/S11059_ex.c index bd773f8f0..d745c554f 100755 --- a/S11059_ex.c +++ b/S11059_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "S11059.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_S11059) diff --git a/S11059_proc.c b/S11059_proc.c index 99b685697..434c025f1 100755 --- a/S11059_proc.c +++ b/S11059_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "S11059.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_S11059) diff --git a/TCS3400.c b/TCS3400.c index f51a975c7..fb1279f4a 100755 --- a/TCS3400.c +++ b/TCS3400.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "TCS3400.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_TCS3400) diff --git a/TCS3400.h b/TCS3400.h index ba74fd57b..4514c3b4d 100755 --- a/TCS3400.h +++ b/TCS3400.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/TCS3400_ex.c b/TCS3400_ex.c index 7fd5bd75d..bc0bf3e9d 100755 --- a/TCS3400_ex.c +++ b/TCS3400_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "TCS3400.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_TCS3400) diff --git a/TCS3400_proc.c b/TCS3400_proc.c index eb2e6afd0..bdeb16ca1 100755 --- a/TCS3400_proc.c +++ b/TCS3400_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "TCS3400.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_TCS3400) diff --git a/TCS3472.c b/TCS3472.c index 28c5f15ba..cf94e9cc4 100755 --- a/TCS3472.c +++ b/TCS3472.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "TCS3472.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_TCS3472) diff --git a/TCS3472.h b/TCS3472.h index 6863f9319..fe266bd47 100755 --- a/TCS3472.h +++ b/TCS3472.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/TCS3472_ex.c b/TCS3472_ex.c index 7f2c85cbb..d05ccde61 100755 --- a/TCS3472_ex.c +++ b/TCS3472_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "TCS3472.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_TCS3472) diff --git a/TCS3472_proc.c b/TCS3472_proc.c index 186ec5452..092db8628 100755 --- a/TCS3472_proc.c +++ b/TCS3472_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "TCS3472.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_TCS3472) diff --git a/TSL2591.c b/TSL2591.c index 91be03388..b3ca189db 100755 --- a/TSL2591.c +++ b/TSL2591.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "TSL2591.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_TSL2591) diff --git a/TSL2591.h b/TSL2591.h index ca9056ef4..d2d8277c3 100755 --- a/TSL2591.h +++ b/TSL2591.h @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/TSL2591_ex.c b/TSL2591_ex.c index ba32c03d0..a7748f0a3 100755 --- a/TSL2591_ex.c +++ b/TSL2591_ex.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "TSL2591.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_TSL2591) diff --git a/TSL2591_proc.c b/TSL2591_proc.c index 7c8131600..5e6b72f4e 100755 --- a/TSL2591_proc.c +++ b/TSL2591_proc.c @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "TSL2591.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_TSL2591) diff --git a/template/CPNT.c.txt b/template/CPNT.c.txt index fed268f77..37e91e3db 100755 --- a/template/CPNT.c.txt +++ b/template/CPNT.c.txt @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "$CPNT$.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_$CPNT$) diff --git a/template/CPNT.h.txt b/template/CPNT.h.txt index cfde564c5..1d9c5c808 100755 --- a/template/CPNT.h.txt +++ b/template/CPNT.h.txt @@ -13,6 +13,8 @@ #endif #include "sarmfsw.h" +#include "globals.h" + #include "I2C_component.h" #if defined(HAL_I2C_MODULE_ENABLED) diff --git a/template/CPNT_ex.c.txt b/template/CPNT_ex.c.txt index 88124e07e..d575000fb 100755 --- a/template/CPNT_ex.c.txt +++ b/template/CPNT_ex.c.txt @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "$CPNT$.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_$CPNT$) diff --git a/template/CPNT_proc.c.txt b/template/CPNT_proc.c.txt index 5da485997..3c8160f74 100755 --- a/template/CPNT_proc.c.txt +++ b/template/CPNT_proc.c.txt @@ -6,7 +6,6 @@ **/ /****************************************************************/ #include "$CPNT$.h" -#include "globals.h" #if defined(HAL_I2C_MODULE_ENABLED) #if defined(I2C_$CPNT$)