pebble-dev · AliceGrey · Mar 20, 2020
diff --git a/Apps/System/menu.c b/Apps/System/menu.c
@@ -6,8 +6,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "menu.h"
 
 static list_head _res_list_head = LIST_HEAD(_res_list_head);

diff --git a/Apps/System/notification.c b/Apps/System/notification.c
@@ -5,8 +5,7 @@
  * Author: Carson Katri <me@carsonkatri.com>
  * Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "notification.h"
 #include "single_notification_layer.h"
 #include "librebble.h"

diff --git a/Apps/System/notification.h b/Apps/System/notification.h
@@ -6,7 +6,6 @@
  * Author: Carson Katri <me@carsonkatri.com>.
  */
 
-#include "rebbleos.h"
 #include "librebble.h"
 #include "display.h"
 #include "backlight.h"

diff --git a/Apps/System/settings.c b/Apps/System/settings.c
@@ -5,7 +5,6 @@
  * Author: Joshua Wise <joshua@joshuawise.com>
  */
 
-#include "rebbleos.h"
 #include "menu.h"
 #include "status_bar_layer.h"
 #include "action_bar_layer.h"

diff --git a/Apps/System/settings_tz.c b/Apps/System/settings_tz.c
@@ -5,7 +5,6 @@
  * Author: Joshua Wise <joshua@joshuawise.com>
  */
 
-#include "rebbleos.h"
 #include "menu.h"
 #include "status_bar_layer.h"
 #include "action_bar_layer.h"

diff --git a/Apps/System/systemapp.c b/Apps/System/systemapp.c
@@ -4,8 +4,7 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

diff --git a/Apps/System/testapp.c b/Apps/System/testapp.c
@@ -5,16 +5,15 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "menu.h"
 #include "status_bar_layer.h"
 #include "test_defs.h"
 #include "platform_res.h"
 
 static Window *s_main_window;
 static Menu *s_menu;
-StatusBarLayer *status_bar;
+static StatusBarLayer *status_bar;
 
 static void testapp_exec_window_unload(Window *window);
 static void _reset_menu_items(void);

diff --git a/Apps/System/tests/color_test.c b/Apps/System/tests/color_test.c
@@ -4,7 +4,7 @@
  *
  * Author: Author: Chris Multhaupt <chris.multhaupt@gmail.com>.
  */
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

diff --git a/Apps/System/tests/overlay_test.c b/Apps/System/tests/overlay_test.c
@@ -4,8 +4,7 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

diff --git a/Apps/System/tests/test_test.c b/Apps/System/tests/test_test.c
@@ -1,4 +1,4 @@
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

diff --git a/Apps/System/tests/vibes_test.c b/Apps/System/tests/vibes_test.c
@@ -4,8 +4,7 @@
  *
  * Author: Author: Elliot Hawkins <elliotshawkins@gmail.com>.
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

diff --git a/Apps/System/widgettest.c b/Apps/System/widgettest.c
@@ -4,8 +4,7 @@
  *
  * Author: Carson Katri <me@carsonkatri.com>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "test.h"
 #include "librebble.h"
 #include "bitmap_layer.h"
@@ -18,7 +17,7 @@ const char * const test_name = "Test";
 static Window *s_main_window;
 
 ActionBarLayer *action_bar;
-StatusBarLayer *status_bar;
+static StatusBarLayer *status_bar;
 
 typedef struct {
  uint8_t hours;

diff --git a/hw/chip/nrf52840/debug.c b/hw/chip/nrf52840/debug.c
@@ -6,7 +6,6 @@
  */
 
 #include <debug.h>
-#include "rebbleos.h"
 #include "nrf_delay.h"
 #include "nrfx_uart.h"
 #include "board_config.h"

diff --git a/hw/chip/nrf52840/fault_handlers.c b/hw/chip/nrf52840/fault_handlers.c
@@ -6,8 +6,11 @@
  * Author: Joshua Wise <joshua@joshuawise.com>
  */
 
+#include <stdint.h>
+#include <stdio.h>
 #include "debug.h"
-#include "rebbleos.h"
+
+typedef uint32_t ret_code_t;
 
 struct {
  uint32_t r4, r5, r6, r7, r8, r9, r10, r11, r13;

diff --git a/hw/drivers/nrf52_bluetooth/nrf52_bluetooth.c b/hw/drivers/nrf52_bluetooth/nrf52_bluetooth.c
@@ -6,8 +6,10 @@
  */
 
 #include <debug.h>
-#include "rebbleos.h"
+#include <stdint.h>
+#include "log.h"
 #include "service.h"
+#include "rbl_bluetooth.h"
 #include "nrf_sdh.h"
 #include "nrf_sdh_ble.h"
 #include "nrf_ble_gatt.h"

diff --git a/hw/drivers/nrf52_bluetooth/nrf52_bluetooth_ppogatt.c b/hw/drivers/nrf52_bluetooth/nrf52_bluetooth_ppogatt.c
@@ -4,9 +4,10 @@
  *
  * Author: Joshua Wise <joshua@joshuawise.com>
  */
-
+#define BLUETOOTH_IS_BLE 1
 #include <debug.h>
-#include "rebbleos.h"
+#include "log.h"
+#include "rbl_bluetooth.h"
 #include "nrf_sdh.h"
 #include "nrf_sdh_ble.h"
 #include "nrf_ble_gatt.h"

diff --git a/hw/drivers/nrf52_ls013b7dh05/nrf52_ls013b7dh05.c b/hw/drivers/nrf52_ls013b7dh05/nrf52_ls013b7dh05.c
@@ -5,7 +5,9 @@
  * Author: Joshua Wise <joshua@joshuawise.com>
  */
 
-#include "rebbleos.h"
+#include <assert.h>
+#include "FreeRTOSConfig.h"
+#include "log.h"
 #include "nrfx_spim.h"
 #include "nrf_gpio.h"
 #include "board_config.h"

diff --git a/hw/drivers/nrf52_qspi_flash/nrf52_qspi_flash.c b/hw/drivers/nrf52_qspi_flash/nrf52_qspi_flash.c
@@ -5,8 +5,10 @@
  * Author: Joshua Wise <joshua@joshuawise.com>
  */
 
+#include "FreeRTOSConfig.h"
+#include "log.h"
+#include "platform.h"
 #include <debug.h>
-#include "rebbleos.h"
 #include "nrfx_qspi.h"
 
 /* Asterix has 128Mbit (16MB) of QSPI flash -- a W25Q128JV. */

diff --git a/hw/drivers/stm32_bluetooth_cc256x/btstack_rebble.c b/hw/drivers/stm32_bluetooth_cc256x/btstack_rebble.c
@@ -8,7 +8,8 @@
 #include "btstack_rebble.h"
 #include "btstack_chipset_cc256x.h"
 #include "hal_uart_dma.h"
-#include "rebbleos.h"
+#include "main.h"
+#include "init.h"
 #include "btstack_spp.h"
 #include "hal_time_ms.h"
 #include "rbl_bluetooth.h"

diff --git a/hw/platform/asterix/asterix.c b/hw/platform/asterix/asterix.c
@@ -6,7 +6,8 @@
  */
 
 #include <debug.h>
-#include "rebbleos.h"
+#include "FreeRTOSConfig.h"
+#include "rebble_time.h"
 #include "nrf_delay.h"
 #include "nrfx_uart.h"
 #include "nrfx_twi.h"

diff --git a/hw/platform/chalk/chalk_bluetooth.c b/hw/platform/chalk/chalk_bluetooth.c
@@ -1,4 +1,5 @@
-#include "rebbleos.h"
+#include "rbl_bluetooth.h"
+#include "init.h"
 
 /*
  * NOT IMPLEMENTED

diff --git a/hw/platform/qemu/hw_qemu.c b/hw/platform/qemu/hw_qemu.c
@@ -3,7 +3,6 @@
 #include "hw_qemu.h"
 #include "stm32_usart.h"
 #include "stm32_power.h"
-#include "rebbleos.h"
 
 void _hw_qemu_rx(void);
 

diff --git a/hw/platform/tintin/tintin.c b/hw/platform/tintin/tintin.c
@@ -16,7 +16,6 @@
 #include <stm32f2xx_rcc.h>
 #include <stm32f2xx_syscfg.h>
 #include <misc.h>
-#include "rebbleos.h"
 
 #include "stm32_usart.h"
 #include "stm32_power.h"

diff --git a/hw/platform/tintin/tintin_bluetooth.c b/hw/platform/tintin/tintin_bluetooth.c
@@ -16,7 +16,6 @@
 #include <stm32f2xx_dma.h>
 #include <stm32f2xx_syscfg.h>
 #include <misc.h>
-#include "rebbleos.h"
 
 #include "stm32_dma.h"
 #include "stm32_usart.h"

diff --git a/hw/platform/tintin/tintin_display.c b/hw/platform/tintin/tintin_display.c
@@ -16,7 +16,6 @@
 #include <stm32f2xx_rcc.h>
 #include <stm32f2xx_syscfg.h>
 #include <misc.h>
-#include "rebbleos.h"
 #include "stm32_power.h"
 #include "stm32_spi.h"
 

diff --git a/hw/platform/tintin/tintin_flash.c b/hw/platform/tintin/tintin_flash.c
@@ -15,7 +15,6 @@
 #include <stm32f2xx_spi.h>
 #include <stm32f2xx_syscfg.h>
 #include <misc.h>
-#include "rebbleos.h"
 
 #include "stm32_power.h"
 #include "stm32_spi.h"

diff --git a/rcore/api_func_symbols.h b/rcore/api_func_symbols.h
@@ -1,5 +1,4 @@
 #include "common.h"
-#include "rebbleos.h"
 #include "librebble.h"
 #include "graphics_wrapper.h"
 #include "libros_graphics.h"

diff --git a/rcore/appmanager.c b/rcore/appmanager.c
@@ -6,9 +6,11 @@
  * 
  * Author: Barry Carter <barry.carter@gmail.com>.
  */
-
+#include "rebble_memory.h"
 #include <stdlib.h>
 #include "appmanager_thread.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
@@ -7,7 +7,7 @@
  */
 
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "display.h"
 #include "appmanager.h"
 #include "systemapp.h"
 #include "widgettest.h"

diff --git a/rcore/appmanager_app_api.c b/rcore/appmanager_app_api.c
@@ -6,8 +6,9 @@
  */
 
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "display.h"
 #include "appmanager.h"
+#include "main.h"
 #include "overlay_manager.h"
 #include "protocol.h"
 #include "protocol_music.h"

diff --git a/rcore/appmanager_app_runloop.c b/rcore/appmanager_app_runloop.c
@@ -6,14 +6,16 @@
  */
 
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "display.h"
 #include "appmanager.h"
+#include "main.h"
 #include "overlay_manager.h"
 #include "notification_manager.h"
 #include "timers.h"
 #include "ngfxwrap.h"
 #include "event_service.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
@@ -7,8 +7,9 @@
  */
 
 #include <stdlib.h>
-#include "rebbleos.h"
+#include "display.h"
 #include "appmanager.h"
+#include "main.h"
 #include "overlay_manager.h"
 #include "notification_manager.h"
 

diff --git a/rcore/bluetooth.c b/rcore/bluetooth.c
@@ -24,6 +24,7 @@
  */
 
 #include "FreeRTOS.h"
+#include "librebble.h"
 #include "task.h" /* xTaskCreate */
 #include "timers.h" /* xTimerCreate */
 #include "queue.h" /* xQueueCreate */
@@ -32,7 +33,7 @@
 #include "backlight.h"
 #include "ambient.h"
 #include "rebble_memory.h"
-#include "rebbleos.h"
+#include "init.h"
 #include "rbl_bluetooth.h"
 #include "pebble_protocol.h"
 #include "stdarg.h"
@@ -41,6 +42,7 @@
 #include "protocol_service.h"
 #include "service.h"
 #include "rdb.h"
+#include <string.h>
 
 /* Stack sizes of the threads */
 #define STACK_SZ_CMD configMINIMAL_STACK_SIZE + 600

diff --git a/rcore/buttons.h b/rcore/buttons.h
@@ -7,7 +7,7 @@
  */
 
 #include "FreeRTOS.h"
-#include "rebbleos.h"
+// not ideal. TODO reorg
 #include "librebble.h"
 
 #define butDEBOUNCE_DELAY ( pdMS_TO_TICKS(2) )

diff --git a/rcore/display.c b/rcore/display.c
@@ -15,10 +15,10 @@
  * This must be run in the scheduler, not before.
  * 
  */
- 
-#include "rebbleos.h"
+#include "display.h"
+#include "init.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
@@ -4,10 +4,12 @@
  *
  * Author: Barry Carter <barry.carter@gmail.com>
  */
-
-#include "rebbleos.h"
+#include "FreeRTOS.h"
+#include "display.h"
 #include "platform.h"
+#include "semphr.h"
 #include "flash.h"
+#include <string.h>
 #include "fs.h"
 
 extern void hw_flash_init(void);