Remove RebbleOs.h

pebble-dev · Mar 20, 2020 · 51d9333 · 51d9333
1 parent 4b88ad5
commit 51d9333
Show file tree

Hide file tree

Showing 55 changed files with 12 additions and 75 deletions.
diff --git a/Apps/System/menu.c b/Apps/System/menu.c
@@ -7,7 +7,6 @@
  * Author: Barry Carter <[email protected]>.
  */
 #include "display.h"
-#include "rebbleos.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
@@ -6,7 +6,6 @@
  * Barry Carter <[email protected]>
  */
 #include "display.h"
-#include "rebbleos.h"
 #include "notification.h"
 #include "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 <[email protected]>.
  */
 
-#include "rebbleos.h"
 #include "librebble.h"
 #include "display.h"
 #include "backlight.h"

diff --git a/Apps/System/systemapp.c b/Apps/System/systemapp.c
@@ -5,7 +5,6 @@
  * Author: Barry Carter <[email protected]>
  */
 #include "display.h"
-#include "rebbleos.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

diff --git a/Apps/System/testapp.c b/Apps/System/testapp.c
@@ -6,7 +6,6 @@
  * Author: Barry Carter <[email protected]>
  */
 #include "display.h"
-#include "rebbleos.h"
 #include "menu.h"
 #include "status_bar_layer.h"
 #include "test_defs.h"

diff --git a/Apps/System/tests/color_test.c b/Apps/System/tests/color_test.c
@@ -5,7 +5,6 @@
  * Author: Author: Chris Multhaupt <[email protected]>.
  */
 #include "display.h"
-#include "rebbleos.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
@@ -5,7 +5,6 @@
  * Author: Barry Carter <[email protected]>.
  */
 #include "display.h"
-#include "rebbleos.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,5 +1,4 @@
 #include "display.h"
-#include "rebbleos.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
@@ -5,7 +5,6 @@
  * Author: Author: Elliot Hawkins <[email protected]>.
  */
 #include "display.h"
-#include "rebbleos.h"
 #include "systemapp.h"
 #include "menu.h"
 #include "status_bar_layer.h"

diff --git a/Apps/System/widgettest.c b/Apps/System/widgettest.c
@@ -5,7 +5,6 @@
  * Author: Carson Katri <[email protected]>
  */
 #include "display.h"
-#include "rebbleos.h"
 #include "test.h"
 #include "librebble.h"
 #include "bitmap_layer.h"

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

diff --git a/hw/platform/chalk/chalk_bluetooth.c b/hw/platform/chalk/chalk_bluetooth.c
@@ -1,6 +1,5 @@
 #include "rbl_bluetooth.h"
 #include "init.h"
-#include "rebbleos.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/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 "battery_state_service.h"

diff --git a/rcore/appmanager.c b/rcore/appmanager.c
@@ -8,9 +8,7 @@
  */
 #include "rebble_memory.h"
 #include <stdlib.h>
-#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
@@ -8,7 +8,6 @@
 
 #include <stdlib.h>
 #include "display.h"
-#include "rebbleos.h"
 #include "appmanager.h"
 #include "systemapp.h"
 #include "widgettest.h"

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

diff --git a/rcore/appmanager_app_runloop.c b/rcore/appmanager_app_runloop.c
@@ -7,7 +7,6 @@
 
 #include <stdlib.h>
 #include "display.h"
-#include "rebbleos.h"
 #include "appmanager.h"
 #include "main.h"
 #include "overlay_manager.h"

diff --git a/rcore/appmanager_app_timer.c b/rcore/appmanager_app_timer.c
@@ -8,7 +8,6 @@
 
 #include <stdlib.h>
 #include "display.h"
-#include "rebbleos.h"
 #include "appmanager.h"
 #include "main.h"
 #include "overlay_manager.h"

diff --git a/rcore/bluetooth.c b/rcore/bluetooth.c
@@ -33,7 +33,6 @@
 #include "ambient.h"
 #include "rebble_memory.h"
 #include "init.h"
-#include "rebbleos.h"
 #include "rbl_bluetooth.h"
 #include "pebble_protocol.h"
 #include "stdarg.h"

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

diff --git a/rcore/display.c b/rcore/display.c
@@ -17,7 +17,6 @@
  */
 #include "display.h"
 #include "init.h"
-#include "rebbleos.h"
 #include "appmanager.h"
 #include "semphr.h"
 /* Semaphore to start drawing */

diff --git a/rcore/flash.c b/rcore/flash.c
@@ -5,7 +5,6 @@
  * Author: Barry Carter <[email protected]>
  */
 #include "display.h"
-#include "rebbleos.h"
 #include "platform.h"
 #include "semphr.h"
 #include "flash.h"

diff --git a/rcore/gyro.c b/rcore/gyro.c
@@ -5,4 +5,3 @@
  * Author: Barry Carter <[email protected]>
  */
 #include "display.h"
-#include "rebbleos.h"
diff --git a/rcore/init.h b/rcore/init.h
@@ -1,7 +1,19 @@
+#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);

diff --git a/rcore/log.c b/rcore/log.c
@@ -5,7 +5,6 @@
  * Author: Barry Carter <[email protected]>
  */
 #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
@@ -5,7 +5,6 @@
  * Author: Barry Carter <[email protected]>
  */
 #include "main.h"
-#include "rebbleos.h"
 #include "watchdog.h"
 #include "ambient.h"
 

diff --git a/rcore/notification_manager.c b/rcore/notification_manager.c
@@ -6,7 +6,6 @@
  * Author: Barry Carter <[email protected]>.
  */
 #include "main.h"
-#include "rebbleos.h"
 #include "protocol_notification.h"
 #include "notification_manager.h"
 #include "overlay_manager.h"

diff --git a/rcore/overlay_manager.c b/rcore/overlay_manager.c
@@ -6,7 +6,6 @@
  */
 #include "main.h"
 #include "init.h"
-#include "rebbleos.h"
 #include "ngfxwrap.h"
 #include "overlay_manager.h"
 #include "ngfxwrap.h"

diff --git a/rcore/overlay_manager.h b/rcore/overlay_manager.h
@@ -22,7 +22,6 @@
  * 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 */

diff --git a/rcore/power.c b/rcore/power.c
@@ -7,7 +7,6 @@
 #include "main.h"
 #include <stdbool.h>
 #include "power.h"
-#include "rebbleos.h"
 #include "notification_manager.h"
 #include "battery_state_service.h"
 #include "flash.h"

diff --git a/rcore/protocol/protocol.c b/rcore/protocol/protocol.c
@@ -6,7 +6,6 @@
  */
 #include <stdlib.h>
 #include "main.h"
-#include "rebbleos.h"
 #include "endpoint.h"
 #include "protocol.h"
 #include "pebble_protocol.h"

diff --git a/rcore/protocol/protocol_app.c b/rcore/protocol/protocol_app.c
@@ -6,7 +6,6 @@
  */
 #include <stdlib.h>
 #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
@@ -5,7 +5,6 @@
  * Author: Barry Carter <[email protected]>.
  */
 #include "main.h"
-#include "rebbleos.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"
 #include "blob_db.h"

diff --git a/rcore/protocol/protocol_notification.c b/rcore/protocol/protocol_notification.c
@@ -6,7 +6,6 @@
  */
 #include "main.h"
 #include <stdlib.h>
-#include "rebbleos.h"
 #include "appmanager.h"
 #include "systemapp.h"
 #include "test.h"

diff --git a/rcore/protocol/protocol_system.c b/rcore/protocol/protocol_system.c
@@ -1,5 +1,4 @@
 #include "main.h"
-#include "rebbleos.h"
 #include "protocol.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"

diff --git a/rcore/qemu.c b/rcore/qemu.c
@@ -10,7 +10,6 @@
 #include "task.h"
 #include "log.h"
 #include "init.h"
-#include "rebbleos.h"
 #include "endpoint.h"
 #include "protocol.h"
 #include "semphr.h"

diff --git a/rcore/rebble_memory.c b/rcore/rebble_memory.c
@@ -6,7 +6,6 @@
  * Author: Barry Carter <[email protected]>
  */
 #include "main.h"
-#include "rebbleos.h"
 
 /* Configure Logging */
 #define MODULE_NAME "mem"

diff --git a/rcore/rebble_time.c b/rcore/rebble_time.c
@@ -5,7 +5,6 @@
  * Author: Joshua Wise <[email protected]>
  */
 #include "main.h"
-#include "rebbleos.h"
 #include "strftime.h"
 
 /* Configure Logging */

diff --git a/rcore/rebble_util.c b/rcore/rebble_util.c
@@ -1,5 +1,4 @@
 #include "display.h"
-#include "rebbleos.h"
 #include "librebble.h"
 #include "uuid.h"
 

diff --git a/rcore/rebbleos.c b/rcore/rebbleos.c
@@ -11,7 +11,6 @@
 #include "rbl_bluetooth.h"
 #include "settings.h"
 #include "init.h"
-#include "rebbleos.h"
 #include "watchdog.h"
 #include "ngfxwrap.h"
 #include "overlay_manager.h"

diff --git a/rcore/rebbleos.h b/rcore/rebbleos.h
diff --git a/rcore/resource.c b/rcore/resource.c
@@ -5,7 +5,6 @@
  * Author: Barry Carter <[email protected]>
  */
 #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
@@ -6,7 +6,6 @@
  * Author: Barry Carter <[email protected]>
  */
 #include "main.h"
-#include "rebbleos.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"
 #include "node_list.h"

diff --git a/rcore/service/blob_db_ramfs.c b/rcore/service/blob_db_ramfs.c
@@ -6,7 +6,6 @@
  * Author: Barry Carter <[email protected]>.
  */
 #include "main.h"
-#include "rebbleos.h"
 #include "node_list.h"
 #include "blob_db.h"
 #include "test.h"

diff --git a/rcore/service/blob_db_test.c b/rcore/service/blob_db_test.c
@@ -3,7 +3,6 @@
  * RebbleOS
  */
 #include "main.h"
-#include "rebbleos.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"
 #include "node_list.h"

diff --git a/rcore/service/timeline.c b/rcore/service/timeline.c
@@ -6,7 +6,6 @@
  * Author: Barry Carter <[email protected]>
  */
 #include "main.h"
-#include "rebbleos.h"
 #include "protocol_system.h"
 #include "pebble_protocol.h"
 #include "timeline.h"

diff --git a/rcore/test.c b/rcore/test.c
@@ -1,7 +1,6 @@
 #include "test.h"
 #include "main.h"
 #include "init.h"
-#include "rebbleos.h"
 #include "protocol.h"
 #include "rtoswrap.h"