code sanitization

src/button.cpp

@@ -1,7 +1,6 @@
 #ifdef HAS_BUTTON
 
 #include "globals.h"
-#include "senddata.h"
 
 // Local logging tag
 static const char TAG[] = "main";

src/button.h

@@ -1,6 +1,8 @@
 #ifndef _BUTTON_H
 #define _BUTTON_H
 
+#include "senddata.h"
+
 void IRAM_ATTR ButtonIRQ(void);
 void readButton(void);
 

src/cyclic.cpp

@@ -2,7 +2,7 @@
 /* Interval can be set in paxcounter.conf (HOMECYCLE)       */
 
 // Basic config
-#include "globals.h"
+#include "cyclic.h"
 
 // Local logging tag
 static const char TAG[] = "main";

src/cyclic.h

@@ -1,9 +1,8 @@
 #ifndef _CYCLIC_H
 #define _CYCLIC_H
 
+#include "globals.h"
 #include "senddata.h"
-#include "ota.h"
-#include "led.h"
 
 void doHousekeeping(void);
 void IRAM_ATTR homeCycleIRQ(void);

src/globals.h

@@ -61,7 +61,6 @@ extern TaskHandle_t stateMachineTask, wifiSwitchTask;
 
 #if (HAS_LED != NOT_A_PIN) || defined(HAS_RGB_LED)
 #include "led.h"
-extern TaskHandle_t ledLoopTask;
 #endif
 
 #include "payload.h"

src/led.h

@@ -31,6 +31,8 @@ struct RGBColor {
 
 enum led_states { LED_OFF, LED_ON };
 
+extern TaskHandle_t ledLoopTask;
+
 // Exported Functions
 void rgb_set_color(uint16_t hue);
 void blink_LED(uint16_t set_color, uint16_t set_blinkduration);

src/main.h

@@ -6,7 +6,6 @@
 #include <esp32-hal-timer.h> // needed for timers
 
 #include "globals.h"
-#include "led.h"
 #include "wifiscan.h"
 #include "configmanager.h"
 #include "cyclic.h"

src/statemachine.h

@@ -2,9 +2,6 @@
 #define _STATEMACHINE_H
 
 #include "globals.h"
-#include "led.h"
-#include "wifiscan.h"
-#include "senddata.h"
 #include "cyclic.h"
 
 void stateMachine(void *pvParameters);