Remove RebbleOS.h

Remove RebbleOS.h

Apps/System/menu.c

@@ -6,8 +6,7 @@
  * 
  * Author: Barry Carter <[email protected]>.
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "menu.h"
 
 static list_head _res_list_head = LIST_HEAD(_res_list_head);

Apps/System/notification.c

@@ -5,8 +5,7 @@
  * Author: Carson Katri <[email protected]>
  * Barry Carter <[email protected]>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "notification.h"
 #include "single_notification_layer.h"
 #include "librebble.h"

Apps/System/notification.h

@@ -6,7 +6,6 @@
  * Author: Carson Katri <[email protected]>.
  */
 
-#include "rebbleos.h"
 #include "librebble.h"
 #include "display.h"
 #include "backlight.h"

Apps/System/settings.c

@@ -5,7 +5,6 @@
  * Author: Joshua Wise <[email protected]>
  */
 
-#include "rebbleos.h"
 #include "menu.h"
 #include "status_bar_layer.h"
 #include "action_bar_layer.h"

Apps/System/settings_tz.c

@@ -5,7 +5,6 @@
  * Author: Joshua Wise <[email protected]>
  */
 
-#include "rebbleos.h"
 #include "menu.h"
 #include "status_bar_layer.h"
 #include "action_bar_layer.h"

Apps/System/systemapp.c

@@ -4,8 +4,7 @@
  *
  * Author: Barry Carter <[email protected]>
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

Apps/System/testapp.c

@@ -5,16 +5,15 @@
  *
  * Author: Barry Carter <[email protected]>
  */
-
-#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);

Apps/System/tests/color_test.c

@@ -4,7 +4,7 @@
  *
  * Author: Author: Chris Multhaupt <[email protected]>.
  */
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

Apps/System/tests/overlay_test.c

@@ -4,8 +4,7 @@
  * 
  * Author: Barry Carter <[email protected]>.
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

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"

Apps/System/tests/vibes_test.c

@@ -4,8 +4,7 @@
  *
  * Author: Author: Elliot Hawkins <[email protected]>.
  */
-
-#include "rebbleos.h"
+#include "display.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

Apps/System/widgettest.c

@@ -4,8 +4,7 @@
  *
  * Author: Carson Katri <[email protected]>
  */
-
-#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;

hw/chip/nrf52840/fault_handlers.c

@@ -7,7 +7,6 @@
  */
 
 #include "debug.h"
-#include "rebbleos.h"
 
 struct {
  uint32_t r4, r5, r6, r7, r8, r9, r10, r11, r13;

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"

hw/platform/chalk/chalk_bluetooth.c

@@ -1,4 +1,5 @@
-#include "rebbleos.h"
+#include "rbl_bluetooth.h"
+#include "init.h"
 
 /*
  * NOT IMPLEMENTED

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);
 

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"

rcore/appmanager.c

@@ -6,9 +6,11 @@
  * 
  * Author: Barry Carter <[email protected]>.
  */
-
+#include "rebble_memory.h"
 #include <stdlib.h>
 #include "appmanager_thread.h"
+#include "display.h"
+#include "librebble.h"
 #include "appmanager.h"
 
 #include "systemapp.h"

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"

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"

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"

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"
 

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

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) )

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;

rcore/flash.c

@@ -4,9 +4,10 @@
  *
  * Author: Barry Carter <[email protected]>
  */
-
-#include "rebbleos.h"
+#include "FreeRTOS.h"
+#include "display.h"
 #include "platform.h"
+#include "semphr.h"
 #include "flash.h"
 #include "fs.h"
 

rcore/gyro.c

@@ -4,5 +4,4 @@
  *
  * Author: Barry Carter <[email protected]>
  */
-
-#include "rebbleos.h"
+#include "display.h"

rcore/init.h

@@ -0,0 +1,28 @@
+#pragma once
+/* init.h
+ * routines for [...]
+ * RebbleOS
+ */
+//Let's make sure the user is using an 'up to date' version of the compiler
+
+
+#define VERSION "v0.0.0.2"
+
+#if __GNUC__ < 8
+ #error It appears you are using a version of arm-none-eabi-gcc that is incompatible with with the RebbleOS project. \
+ Please find an updated version by using your respective package manager or going to the developer.arm.com download page.
+#endif
+
+
+
+// Reset the watchdog timer manually
+void watchdog_reset(void);
+
+
+void rebbleos_init(void);
+void os_module_init_complete(uint8_t result);
+
+#define INIT_RESP_OK 0
+#define INIT_RESP_ASYNC_WAIT 1
+#define INIT_RESP_NOT_SUPPORTED 2
+#define INIT_RESP_ERROR 3 

rcore/log.c

@@ -4,8 +4,8 @@
  *
  * Author: Barry Carter <[email protected]>
  */
+#include "main.h"
 
-#include "rebbleos.h"
 #include "minilib.h"
 #include "rtoswrap.h"
 
@@ -23,6 +23,7 @@ static void _log_entry(void *arg) {
  }
 }
 THREAD_DEFINE(log, 300, tskIDLE_PRIORITY + 10UL, _log_entry);
+extern int vsfmt(char *buf, unsigned int len, const char *ifmt, va_list ap);
 
 void log_onpanic_dump() {
  log_clock_enable();

rcore/main.c

@@ -4,8 +4,7 @@
  *
  * Author: Barry Carter <[email protected]>
  */
-
-#include "rebbleos.h"
+#include "main.h"
 #include "watchdog.h"
 #include "ambient.h"
 

rcore/notification_manager.c

@@ -5,7 +5,7 @@
  * 
  * Author: Barry Carter <[email protected]>.
  */
-#include "rebbleos.h"
+#include "main.h"
 #include "protocol_notification.h"
 #include "notification_manager.h"
 #include "overlay_manager.h"

rcore/overlay_manager.c

@@ -4,7 +4,8 @@
  * 
  * Author: Barry Carter <[email protected]>.
  */
-#include "rebbleos.h"
+#include "main.h"
+#include "init.h"
 #include "ngfxwrap.h"
 #include "overlay_manager.h"
 #include "protocol.h"

rcore/overlay_manager.h

@@ -22,7 +22,7 @@
  * Window creation happens in a callback so we can delegate the work to our thread
  * and constrain memory and runtime of the window
  */
-#include "rebbleos.h"
+#include "overlay_manager.h"
 
 /* NOT USED YET */
 typedef enum OverlayMode {

rcore/power.c

@@ -4,11 +4,12 @@
  *
  * Author: Barry Carter <[email protected]>
  */
+#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;