retrofit to gcc8

components/services/CMakeLists.txt

@@ -1,6 +1,7 @@
-idf_component_register(SRCS "led.c" "audio_controls.c" "buttons.c" "services.c" "monitor.c"INCLUDE_DIRS 
+idf_component_register(SRCS "accessors.c" "led.c" "audio_controls.c" "battery.c" "buttons.c" "services.c" "monitor.c" "rotary_encoder.c" 
 						INCLUDE_DIRS . ../tools/
-                   
+						REQUIRES json platform_config
+
 )
 
 

components/services/accessors.c

@@ -11,7 +11,7 @@
 #include "driver/gpio.h"
 #include "driver/i2c.h"
 #include "driver/spi_master.h"
-#include "config.h"
+#include "platform_config.h"
 #include "accessors.h"
 #include "globdefs.h"
 
@@ -104,4 +104,4 @@ void parse_set_GPIO(void (*cb)(int gpio, char *value)) {
 	} while (p++);
 	
 	free(nvs_item);
-}	
+}	

components/services/audio_controls.c

@@ -26,7 +26,7 @@
 #include "esp_log.h"
 #include "cJSON.h"
 #include "buttons.h"
-#include "config.h"
+#include "platform_config.h"
 #include "audio_controls.h"
 
 typedef esp_err_t (actrls_config_map_handler) (const cJSON * member, actrls_config_t *cur_config,uint32_t offset);

components/services/battery.c

@@ -16,7 +16,7 @@
 #include "esp_log.h"
 #include "driver/adc.h"
 #include "battery.h"
-#include "config.h"
+#include "platform_config.h"
 
 /* 
  There is a bug in esp32 which causes a spurious interrupt on gpio 36/39 when

components/services/monitor.c

@@ -19,7 +19,7 @@
 #include "buttons.h"
 #include "led.h"
 #include "globdefs.h"
-#include "config.h"
+#include "platform_config.h"
 #include "accessors.h"
 
 #define MONITOR_TIMER	(10*1000)

components/services/services.c

@@ -10,7 +10,7 @@
 #include "esp_log.h"
 #include "driver/gpio.h"
 #include <driver/i2c.h>
-#include "config.h"
+#include "platform_config.h"
 #include "battery.h"
 #include "led.h"
 #include "monitor.h"
@@ -95,4 +95,4 @@ void services_init(void) {
 	led_svc_init();
 	battery_svc_init();
 	monitor_svc_init();
-}
+}