Cleanup RebbleOS.h

Cleanup RebbleOS.h

Apps/System/menu.c

@@ -6,7 +6,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-
+#include "display.h"
 #include "rebbleos.h"
 #include "menu.h"
 

Apps/System/notification.c

@@ -5,7 +5,7 @@
  * Author: Carson Katri <me@carsonkatri.com>
  * Barry Carter <barry.carter@gmail.com>
  */
-
+#include "display.h"
 #include "rebbleos.h"
 #include "notification.h"
 #include "notification_layer.h"

Apps/System/systemapp.c

@@ -4,7 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "display.h"
 #include "rebbleos.h"
 #include "systemapp.h"
 #include "menu.h"

Apps/System/testapp.c

@@ -5,7 +5,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "display.h"
 #include "rebbleos.h"
 #include "menu.h"
 #include "status_bar_layer.h"

Apps/System/tests/color_test.c

@@ -4,6 +4,7 @@
  *
  * Author: Author: Chris Multhaupt <chris.multhaupt@gmail.com>.
  */
+#include "display.h"
 #include "rebbleos.h"
 #include "systemapp.h"
 #include "menu.h"

Apps/System/tests/overlay_test.c

@@ -4,7 +4,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-
+#include "display.h"
 #include "rebbleos.h"
 #include "systemapp.h"
 #include "menu.h"

Apps/System/tests/test_test.c

@@ -1,3 +1,4 @@
+#include "display.h"
 #include "rebbleos.h"
 #include "systemapp.h"
 #include "menu.h"

Apps/System/tests/vibes_test.c

@@ -4,7 +4,7 @@
  *
  * Author: Author: Elliot Hawkins <elliotshawkins@gmail.com>.
  */
-
+#include "display.h"
 #include "rebbleos.h"
 #include "systemapp.h"
 #include "menu.h"

Apps/System/widgettest.c

@@ -4,7 +4,7 @@
  *
  * Author: Carson Katri <me@carsonkatri.com>
  */
-
+#include "display.h"
 #include "rebbleos.h"
 #include "test.h"
 #include "librebble.h"

hw/drivers/stm32_bluetooth_cc256x/btstack_rebble.c

@@ -8,6 +8,7 @@
 #include "btstack_rebble.h"
 #include "btstack_chipset_cc256x.h"
 #include "hal_uart_dma.h"
+#include "main.h"
 #include "rebbleos.h"
 #include "btstack_spp.h"
 #include "hal_time_ms.h"

hw/platform/chalk/chalk_bluetooth.c

@@ -1,3 +1,4 @@
+#include "rbl_bluetooth.h"
 #include "rebbleos.h"
 
 /*

rcore/appmanager.c

@@ -6,9 +6,11 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-
+#include "rebble_memory.h"
 #include <stdlib.h>
 #include "rebbleos.h"
+#include "display.h"
+
 #include "librebble.h"
 #include "appmanager.h"
 #include "systemapp.h"

rcore/appmanager_app.c

@@ -7,6 +7,7 @@
  */
 
 #include <stdlib.h>
+#include "display.h"
 #include "rebbleos.h"
 #include "appmanager.h"
 #include "systemapp.h"

rcore/appmanager_app_api.c

@@ -6,9 +6,12 @@
  */
 
 #include <stdlib.h>
+#include "display.h"
 #include "rebbleos.h"
 #include "appmanager.h"
+#include "main.h"
 #include "overlay_manager.h"
+
 /*
  * Start an application by name
  * The message contains the app name

rcore/appmanager_app_runloop.c

@@ -6,13 +6,16 @@
  */
 
 #include <stdlib.h>
+#include "display.h"
 #include "rebbleos.h"
 #include "appmanager.h"
+#include "main.h"
 #include "overlay_manager.h"
 #include "notification_manager.h"
 #include "timers.h"
 #include "ngfxwrap.h"
 
+
 /* Configure Logging */
 #define MODULE_NAME "apploop"
 #define MODULE_TYPE "APLOOP"

rcore/appmanager_app_timer.c

@@ -7,8 +7,10 @@
  */
 
 #include <stdlib.h>
+#include "display.h"
 #include "rebbleos.h"
 #include "appmanager.h"
+#include "main.h"
 #include "overlay_manager.h"
 #include "notification_manager.h"
 

rcore/display.c

@@ -15,10 +15,10 @@
  * This must be run in the scheduler, not before.
  * 
  */
- 
+#include "display.h"
 #include "rebbleos.h"
 #include "appmanager.h"
-
+#include "semphr.h"
 /* Semaphore to start drawing */
 static SemaphoreHandle_t _display_start_sem;
 static StaticSemaphore_t _display_start_sem_buf;

rcore/flash.c

@@ -4,9 +4,10 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "display.h"
 #include "rebbleos.h"
 #include "platform.h"
+#include "semphr.h"
 #include "flash.h"
 #include "fs.h"
 

rcore/gyro.c

@@ -4,5 +4,5 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "display.h"
 #include "rebbleos.h"

rcore/log.c

@@ -4,7 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "main.h"
 #include "rebbleos.h"
 
 extern int vsfmt(char *buf, unsigned int len, const char *ifmt, va_list ap);

rcore/main.c

@@ -4,7 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "main.h"
 #include "rebbleos.h"
 #include "watchdog.h"
 #include "ambient.h"

rcore/notification_manager.c

@@ -5,6 +5,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
+#include "main.h"
 #include "rebbleos.h"
 #include "protocol_notification.h"
 #include "notification_manager.h"

rcore/overlay_manager.c

@@ -4,6 +4,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
+#include "main.h"
 #include "rebbleos.h"
 #include "ngfxwrap.h"
 #include "overlay_manager.h"

rcore/power.c

@@ -4,11 +4,13 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
+#include "main.h"
 #include <stdbool.h>
 #include "power.h"
 #include "rebbleos.h"
 #include "notification_manager.h"
 #include "battery_state_service.h"
+#include "flash.h"
 
 static uint8_t _charge_mode_prev = 0;
 static uint8_t _charge_mode = 0;

rcore/protocol/protocol.c

@@ -5,6 +5,7 @@
  * Author: Barry Carter <barry.carter@gmail.com>
  */
 #include <stdlib.h>
+#include "main.h"
 #include "rebbleos.h"
 #include "endpoint.h"
 #include "protocol.h"

rcore/protocol/protocol_app.c

@@ -5,6 +5,7 @@
  * Author: Barry Carter <barry.carter@gmail.com>
  */
 #include <stdlib.h>
+#include "main.h"
 #include "rebbleos.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"

rcore/protocol/protocol_blob.c

@@ -4,6 +4,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
+#include "main.h"
 #include "rebbleos.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"

rcore/protocol/protocol_notification.c

@@ -4,6 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
+#include "main.h"
 #include <stdlib.h>
 #include "rebbleos.h"
 #include "appmanager.h"

rcore/protocol/protocol_system.c

@@ -1,3 +1,4 @@
+#include "main.h"
 #include "rebbleos.h"
 #include "protocol.h"
 #include "protocol_system.h"

rcore/qemu.c

@@ -12,7 +12,7 @@
 #include "rebbleos.h"
 #include "endpoint.h"
 #include "protocol.h"
-
+#include "semphr.h"
 /* Configure Logging */
 #define MODULE_NAME "qemu"
 #define MODULE_TYPE "SYS"

rcore/rebble_memory.c

@@ -5,7 +5,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "main.h"
 #include "rebbleos.h"
 
 /* Configure Logging */

rcore/rebble_memory.h

@@ -8,6 +8,7 @@
  */
 
 #include "FreeRTOS.h"
+#include "semphr.h"
 #include <string.h>
 #include <stdlib.h>
 #include "stdbool.h"

rcore/rebble_time.c

@@ -4,7 +4,7 @@
  *
  * Author: Joshua Wise <joshua@joshuawise.com>
  */
-
+#include "main.h"
 #include "rebbleos.h"
 #include "strftime.h"
 

rcore/rebble_util.c

@@ -1,3 +1,4 @@
+#include "display.h"
 #include "rebbleos.h"
 #include "librebble.h"
 #include "uuid.h"

rcore/rebbleos.c

@@ -4,10 +4,11 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "main.h"
 #include "FreeRTOS.h"
 #include "task.h"
 #include "stdio.h"
+#include "rbl_bluetooth.h"
 #include "rebbleos.h"
 #include "watchdog.h"
 #include "ngfxwrap.h"
@@ -18,6 +19,7 @@
 #include "blob_db_ramfs.h"
 #include "rtoswrap.h"
 #include "test.h"
+#include "flash.h"
 
 typedef uint8_t (*mod_callback)(void);
 static TaskHandle_t _os_task;

rcore/rebbleos.h

@@ -6,28 +6,6 @@
  * Author: Barry Carter <barry.carter@gmail.com>
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <inttypes.h>
-#include "FreeRTOS.h"
-#include "rebble_memory.h"
-#include "platform.h"
-#include "appmanager.h"
-#include "ambient.h"
-#include "task.h"
-#include "semphr.h"
-#include "display.h"
-#include "rebble_time.h"
-#include "main.h"
-#include "log.h"
-#include "debug.h"
-#include "flash.h"
-#include "resource.h"
-#include "rebble_util.h"
-#include "rbl_bluetooth.h"
-
 #define VERSION "v0.0.0.2"
 
 //Let's make sure the user is using an 'up to date' version of the compiler

rcore/resource.c

@@ -4,7 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
+#include "main.h"
 #include "rebbleos.h"
 #include "platform.h"
 #include "flash.h"

rcore/service/blob_db.c

@@ -5,6 +5,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
+#include "main.h"
 #include "rebbleos.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"

rcore/service/blob_db_ramfs.c

@@ -5,6 +5,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
+#include "main.h"
 #include "rebbleos.h"
 #include "node_list.h"
 #include "blob_db.h"

rcore/service/blob_db_test.c

@@ -2,6 +2,7 @@
  * tests for blob database
  * RebbleOS
  */
+#include "main.h"
 #include "rebbleos.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"

rcore/service/timeline.c

@@ -5,6 +5,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
+#include "main.h"
 #include "rebbleos.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"