diff --git a/Apps/System/menu.c b/Apps/System/menu.c index b0e917db..e2cf5ed5 100644 --- a/Apps/System/menu.c +++ b/Apps/System/menu.c @@ -6,7 +6,7 @@ * * Author: Barry Carter . */ - +#include "display.h" #include "rebbleos.h" #include "menu.h" diff --git a/Apps/System/notification.c b/Apps/System/notification.c index 15609b26..12168bca 100644 --- a/Apps/System/notification.c +++ b/Apps/System/notification.c @@ -5,7 +5,7 @@ * Author: Carson Katri * Barry Carter */ - +#include "display.h" #include "rebbleos.h" #include "notification.h" #include "notification_layer.h" diff --git a/Apps/System/systemapp.c b/Apps/System/systemapp.c index eecd2377..4cae6871 100644 --- a/Apps/System/systemapp.c +++ b/Apps/System/systemapp.c @@ -4,7 +4,7 @@ * * Author: Barry Carter */ - +#include "display.h" #include "rebbleos.h" #include "systemapp.h" #include "menu.h" diff --git a/Apps/System/testapp.c b/Apps/System/testapp.c index cc251a7f..4b69c963 100644 --- a/Apps/System/testapp.c +++ b/Apps/System/testapp.c @@ -5,7 +5,7 @@ * * Author: Barry Carter */ - +#include "display.h" #include "rebbleos.h" #include "menu.h" #include "status_bar_layer.h" diff --git a/Apps/System/tests/color_test.c b/Apps/System/tests/color_test.c index 0944419c..b94f1b00 100644 --- a/Apps/System/tests/color_test.c +++ b/Apps/System/tests/color_test.c @@ -4,6 +4,7 @@ * * Author: Author: Chris Multhaupt . */ +#include "display.h" #include "rebbleos.h" #include "systemapp.h" #include "menu.h" diff --git a/Apps/System/tests/overlay_test.c b/Apps/System/tests/overlay_test.c index 3a53be9e..50d36d53 100644 --- a/Apps/System/tests/overlay_test.c +++ b/Apps/System/tests/overlay_test.c @@ -4,7 +4,7 @@ * * Author: Barry Carter . */ - +#include "display.h" #include "rebbleos.h" #include "systemapp.h" #include "menu.h" diff --git a/Apps/System/tests/test_test.c b/Apps/System/tests/test_test.c index d2c4b5be..8ccbfaec 100644 --- a/Apps/System/tests/test_test.c +++ b/Apps/System/tests/test_test.c @@ -1,3 +1,4 @@ +#include "display.h" #include "rebbleos.h" #include "systemapp.h" #include "menu.h" diff --git a/Apps/System/tests/vibes_test.c b/Apps/System/tests/vibes_test.c index dca97a08..4154f95a 100644 --- a/Apps/System/tests/vibes_test.c +++ b/Apps/System/tests/vibes_test.c @@ -4,7 +4,7 @@ * * Author: Author: Elliot Hawkins . */ - +#include "display.h" #include "rebbleos.h" #include "systemapp.h" #include "menu.h" diff --git a/Apps/System/widgettest.c b/Apps/System/widgettest.c index a3ce1cb6..4f5e0976 100644 --- a/Apps/System/widgettest.c +++ b/Apps/System/widgettest.c @@ -4,7 +4,7 @@ * * Author: Carson Katri */ - +#include "display.h" #include "rebbleos.h" #include "test.h" #include "librebble.h" diff --git a/hw/drivers/stm32_bluetooth_cc256x/btstack_rebble.c b/hw/drivers/stm32_bluetooth_cc256x/btstack_rebble.c index 3c1cffd4..f4adf7e9 100644 --- a/hw/drivers/stm32_bluetooth_cc256x/btstack_rebble.c +++ b/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" diff --git a/hw/platform/chalk/chalk_bluetooth.c b/hw/platform/chalk/chalk_bluetooth.c index e80f5509..96508011 100644 --- a/hw/platform/chalk/chalk_bluetooth.c +++ b/hw/platform/chalk/chalk_bluetooth.c @@ -1,3 +1,4 @@ +#include "rbl_bluetooth.h" #include "rebbleos.h" /* diff --git a/rcore/appmanager.c b/rcore/appmanager.c index 47edfea9..ded16abb 100644 --- a/rcore/appmanager.c +++ b/rcore/appmanager.c @@ -6,9 +6,11 @@ * * Author: Barry Carter . */ - +#include "rebble_memory.h" #include #include "rebbleos.h" +#include "display.h" + #include "librebble.h" #include "appmanager.h" #include "systemapp.h" diff --git a/rcore/appmanager_app.c b/rcore/appmanager_app.c index d9beb4f3..a8b4dc7c 100644 --- a/rcore/appmanager_app.c +++ b/rcore/appmanager_app.c @@ -7,6 +7,7 @@ */ #include +#include "display.h" #include "rebbleos.h" #include "appmanager.h" #include "systemapp.h" diff --git a/rcore/appmanager_app_api.c b/rcore/appmanager_app_api.c index b8e6bdd5..da1ddc06 100644 --- a/rcore/appmanager_app_api.c +++ b/rcore/appmanager_app_api.c @@ -6,9 +6,12 @@ */ #include +#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 diff --git a/rcore/appmanager_app_runloop.c b/rcore/appmanager_app_runloop.c index 34c1541f..09eca3a3 100644 --- a/rcore/appmanager_app_runloop.c +++ b/rcore/appmanager_app_runloop.c @@ -6,13 +6,16 @@ */ #include +#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" diff --git a/rcore/appmanager_app_timer.c b/rcore/appmanager_app_timer.c index 047ed37e..131d0bcf 100644 --- a/rcore/appmanager_app_timer.c +++ b/rcore/appmanager_app_timer.c @@ -7,8 +7,10 @@ */ #include +#include "display.h" #include "rebbleos.h" #include "appmanager.h" +#include "main.h" #include "overlay_manager.h" #include "notification_manager.h" diff --git a/rcore/display.c b/rcore/display.c index 55a357c4..2590e8d2 100644 --- a/rcore/display.c +++ b/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; diff --git a/rcore/flash.c b/rcore/flash.c index ab251137..55c17089 100644 --- a/rcore/flash.c +++ b/rcore/flash.c @@ -4,9 +4,10 @@ * * Author: Barry Carter */ - +#include "display.h" #include "rebbleos.h" #include "platform.h" +#include "semphr.h" #include "flash.h" #include "fs.h" diff --git a/rcore/gyro.c b/rcore/gyro.c index f81a926c..d5344bd9 100644 --- a/rcore/gyro.c +++ b/rcore/gyro.c @@ -4,5 +4,5 @@ * * Author: Barry Carter */ - +#include "display.h" #include "rebbleos.h" diff --git a/rcore/log.c b/rcore/log.c index 873e10c8..669d9241 100644 --- a/rcore/log.c +++ b/rcore/log.c @@ -4,7 +4,7 @@ * * Author: Barry Carter */ - +#include "main.h" #include "rebbleos.h" extern int vsfmt(char *buf, unsigned int len, const char *ifmt, va_list ap); diff --git a/rcore/main.c b/rcore/main.c index e7b410bf..f394ebfa 100644 --- a/rcore/main.c +++ b/rcore/main.c @@ -4,7 +4,7 @@ * * Author: Barry Carter */ - +#include "main.h" #include "rebbleos.h" #include "watchdog.h" #include "ambient.h" diff --git a/rcore/notification_manager.c b/rcore/notification_manager.c index f71d76ab..fc02c9b7 100644 --- a/rcore/notification_manager.c +++ b/rcore/notification_manager.c @@ -5,6 +5,7 @@ * * Author: Barry Carter . */ +#include "main.h" #include "rebbleos.h" #include "protocol_notification.h" #include "notification_manager.h" diff --git a/rcore/overlay_manager.c b/rcore/overlay_manager.c index a774420b..1cfeb854 100644 --- a/rcore/overlay_manager.c +++ b/rcore/overlay_manager.c @@ -4,6 +4,7 @@ * * Author: Barry Carter . */ +#include "main.h" #include "rebbleos.h" #include "ngfxwrap.h" #include "overlay_manager.h" diff --git a/rcore/power.c b/rcore/power.c index 9b5abbbb..2aaba1c7 100644 --- a/rcore/power.c +++ b/rcore/power.c @@ -4,11 +4,13 @@ * * Author: Barry Carter */ +#include "main.h" #include #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; diff --git a/rcore/protocol/protocol.c b/rcore/protocol/protocol.c index dbb04026..c3e69032 100644 --- a/rcore/protocol/protocol.c +++ b/rcore/protocol/protocol.c @@ -5,6 +5,7 @@ * Author: Barry Carter */ #include +#include "main.h" #include "rebbleos.h" #include "endpoint.h" #include "protocol.h" diff --git a/rcore/protocol/protocol_app.c b/rcore/protocol/protocol_app.c index 34e602df..88b40084 100644 --- a/rcore/protocol/protocol_app.c +++ b/rcore/protocol/protocol_app.c @@ -5,6 +5,7 @@ * Author: Barry Carter */ #include +#include "main.h" #include "rebbleos.h" #include "protocol_system.h" #include "pebble_protocol.h" diff --git a/rcore/protocol/protocol_blob.c b/rcore/protocol/protocol_blob.c index fc8e6f33..4431e574 100644 --- a/rcore/protocol/protocol_blob.c +++ b/rcore/protocol/protocol_blob.c @@ -4,6 +4,7 @@ * * Author: Barry Carter . */ +#include "main.h" #include "rebbleos.h" #include "protocol_system.h" #include "pebble_protocol.h" diff --git a/rcore/protocol/protocol_notification.c b/rcore/protocol/protocol_notification.c index f8099946..dac4ed93 100644 --- a/rcore/protocol/protocol_notification.c +++ b/rcore/protocol/protocol_notification.c @@ -4,6 +4,7 @@ * * Author: Barry Carter */ +#include "main.h" #include #include "rebbleos.h" #include "appmanager.h" diff --git a/rcore/protocol/protocol_system.c b/rcore/protocol/protocol_system.c index f842cf00..c7903637 100644 --- a/rcore/protocol/protocol_system.c +++ b/rcore/protocol/protocol_system.c @@ -1,3 +1,4 @@ +#include "main.h" #include "rebbleos.h" #include "protocol.h" #include "protocol_system.h" diff --git a/rcore/qemu.c b/rcore/qemu.c index cf65c644..04b0347d 100644 --- a/rcore/qemu.c +++ b/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" diff --git a/rcore/rebble_memory.c b/rcore/rebble_memory.c index c9b3c394..15a6b1e0 100644 --- a/rcore/rebble_memory.c +++ b/rcore/rebble_memory.c @@ -5,7 +5,7 @@ * * Author: Barry Carter */ - +#include "main.h" #include "rebbleos.h" /* Configure Logging */ diff --git a/rcore/rebble_memory.h b/rcore/rebble_memory.h index 9becfad8..0776c758 100644 --- a/rcore/rebble_memory.h +++ b/rcore/rebble_memory.h @@ -8,6 +8,7 @@ */ #include "FreeRTOS.h" +#include "semphr.h" #include #include #include "stdbool.h" diff --git a/rcore/rebble_time.c b/rcore/rebble_time.c index 5d0c7726..f20ba294 100644 --- a/rcore/rebble_time.c +++ b/rcore/rebble_time.c @@ -4,7 +4,7 @@ * * Author: Joshua Wise */ - +#include "main.h" #include "rebbleos.h" #include "strftime.h" diff --git a/rcore/rebble_util.c b/rcore/rebble_util.c index 79fd11e5..48746009 100644 --- a/rcore/rebble_util.c +++ b/rcore/rebble_util.c @@ -1,3 +1,4 @@ +#include "display.h" #include "rebbleos.h" #include "librebble.h" #include "uuid.h" diff --git a/rcore/rebbleos.c b/rcore/rebbleos.c index 237b0ecc..2d326588 100644 --- a/rcore/rebbleos.c +++ b/rcore/rebbleos.c @@ -4,10 +4,11 @@ * * Author: Barry Carter */ - +#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; diff --git a/rcore/rebbleos.h b/rcore/rebbleos.h index f1c58495..ea59c97e 100644 --- a/rcore/rebbleos.h +++ b/rcore/rebbleos.h @@ -6,28 +6,6 @@ * Author: Barry Carter */ -#include -#include -#include -#include -#include -#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 diff --git a/rcore/resource.c b/rcore/resource.c index dca6652c..4e419f67 100644 --- a/rcore/resource.c +++ b/rcore/resource.c @@ -4,7 +4,7 @@ * * Author: Barry Carter */ - +#include "main.h" #include "rebbleos.h" #include "platform.h" #include "flash.h" diff --git a/rcore/service/blob_db.c b/rcore/service/blob_db.c index 06de33fb..850815d9 100644 --- a/rcore/service/blob_db.c +++ b/rcore/service/blob_db.c @@ -5,6 +5,7 @@ * * Author: Barry Carter */ +#include "main.h" #include "rebbleos.h" #include "protocol_system.h" #include "pebble_protocol.h" diff --git a/rcore/service/blob_db_ramfs.c b/rcore/service/blob_db_ramfs.c index f9c52ba4..8f2f1783 100644 --- a/rcore/service/blob_db_ramfs.c +++ b/rcore/service/blob_db_ramfs.c @@ -5,6 +5,7 @@ * * Author: Barry Carter . */ +#include "main.h" #include "rebbleos.h" #include "node_list.h" #include "blob_db.h" diff --git a/rcore/service/blob_db_test.c b/rcore/service/blob_db_test.c index bbf49f7d..598c3f96 100644 --- a/rcore/service/blob_db_test.c +++ b/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" diff --git a/rcore/service/timeline.c b/rcore/service/timeline.c index 85df70e1..adc556c1 100644 --- a/rcore/service/timeline.c +++ b/rcore/service/timeline.c @@ -5,6 +5,7 @@ * * Author: Barry Carter */ +#include "main.h" #include "rebbleos.h" #include "protocol_system.h" #include "pebble_protocol.h" diff --git a/rcore/test.c b/rcore/test.c index a429e270..b917debd 100644 --- a/rcore/test.c +++ b/rcore/test.c @@ -1,4 +1,5 @@ #include "test.h" +#include "main.h" #include "rebbleos.h" #include "protocol.h" #include "rtoswrap.h" diff --git a/rwatch/event/app_timer.c b/rwatch/event/app_timer.c index ec3a26f6..dae78c52 100644 --- a/rwatch/event/app_timer.c +++ b/rwatch/event/app_timer.c @@ -4,6 +4,7 @@ * * Author: Joshua Wise */ +#include "main.h" #include "rebbleos.h" #include "app_timer.h" #include "appmanager.h" diff --git a/rwatch/event/battery_state_service.c b/rwatch/event/battery_state_service.c index 5088bf56..1decfe05 100644 --- a/rwatch/event/battery_state_service.c +++ b/rwatch/event/battery_state_service.c @@ -4,7 +4,7 @@ * Author: Barry Carter * */ - +#include "main.h" #include "librebble.h" #include "ngfxwrap.h" #include "battery_state_service.h" diff --git a/rwatch/event/connection_service.c b/rwatch/event/connection_service.c index 8ce6f498..2b56ac57 100644 --- a/rwatch/event/connection_service.c +++ b/rwatch/event/connection_service.c @@ -7,6 +7,7 @@ #include "librebble.h" #include "node_list.h" #include "connection_service.h" +#include "rebble_util.h" static list_head _subscriber_list_head = LIST_HEAD(_subscriber_list_head); diff --git a/rwatch/graphics/font_loader.c b/rwatch/graphics/font_loader.c index 8dac0146..5acdec70 100644 --- a/rwatch/graphics/font_loader.c +++ b/rwatch/graphics/font_loader.c @@ -4,7 +4,7 @@ * * Author: Barry Carter */ - +#include "display.h" #include "rebbleos.h" #include "librebble.h" #include "platform_res.h" diff --git a/rwatch/ngfxwrap.c b/rwatch/ngfxwrap.c index ad112bfa..3bb84e1a 100644 --- a/rwatch/ngfxwrap.c +++ b/rwatch/ngfxwrap.c @@ -4,7 +4,7 @@ * * Author: Barry Carter */ - +#include "main.h" #include "context.h" #include "appmanager.h" #include "display.h" diff --git a/rwatch/ui/action_menu.c b/rwatch/ui/action_menu.c index 158d0561..db211947 100644 --- a/rwatch/ui/action_menu.c +++ b/rwatch/ui/action_menu.c @@ -7,7 +7,7 @@ * Author: Carson Katri . * Author: Hermann Noll */ - +#include "display.h" #include "rebbleos.h" #include "action_menu.h" #include "menu_layer.h" diff --git a/rwatch/ui/animation/animation.c b/rwatch/ui/animation/animation.c index 02620831..304d5da9 100644 --- a/rwatch/ui/animation/animation.c +++ b/rwatch/ui/animation/animation.c @@ -39,6 +39,7 @@ #include "appmanager.h" #include "FreeRTOS.h" #include "animation.h" +#include "rebble_util.h" /* Configure Logging */ #define MODULE_NAME "anim" diff --git a/rwatch/ui/notifications/battery_overlay.c b/rwatch/ui/notifications/battery_overlay.c index 72a54cd6..91641507 100644 --- a/rwatch/ui/notifications/battery_overlay.c +++ b/rwatch/ui/notifications/battery_overlay.c @@ -1,3 +1,4 @@ +#include "main.h" #include "rebbleos.h" #include "protocol_notification.h" #include "notification_manager.h" diff --git a/rwatch/ui/notifications/mini_message.c b/rwatch/ui/notifications/mini_message.c index 92ed7b19..7d8cdc1c 100644 --- a/rwatch/ui/notifications/mini_message.c +++ b/rwatch/ui/notifications/mini_message.c @@ -1,3 +1,4 @@ +#include "main.h" #include "rebbleos.h" #include "protocol_notification.h" #include "notification_manager.h" diff --git a/rwatch/ui/notifications/notification_window.c b/rwatch/ui/notifications/notification_window.c index d9058aeb..52b5e0fc 100644 --- a/rwatch/ui/notifications/notification_window.c +++ b/rwatch/ui/notifications/notification_window.c @@ -1,3 +1,4 @@ +#include "main.h" #include "rebbleos.h" #include "protocol_notification.h" #include "notification_manager.h"