From 07e09ebaf06673ccaf4b1914dd3397d05ca6aee4 Mon Sep 17 00:00:00 2001 From: Alice Grey Date: Tue, 26 Jan 2021 15:29:50 -0600 Subject: [PATCH 1/2] Get RebbleOS compiling on Python 3.9 & Arch --- Apps/System/testapp.c | 2 +- Apps/System/widgettest.c | 2 +- Utilities/stm32_crc.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Apps/System/testapp.c b/Apps/System/testapp.c index cc251a7f..a6e5d696 100644 --- a/Apps/System/testapp.c +++ b/Apps/System/testapp.c @@ -14,7 +14,7 @@ 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/widgettest.c b/Apps/System/widgettest.c index a3ce1cb6..4361a682 100644 --- a/Apps/System/widgettest.c +++ b/Apps/System/widgettest.c @@ -18,7 +18,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/Utilities/stm32_crc.py b/Utilities/stm32_crc.py index 1c0bd08d..40df7848 100644 --- a/Utilities/stm32_crc.py +++ b/Utilities/stm32_crc.py @@ -9,7 +9,7 @@ def process_word(data, crc=0xffffffff): for x in range(0, 4 - len(data)): d_array.insert(0,0) d_array.reverse() - data = d_array.tostring() + data = d_array.tobytes() d = array.array('I', data)[0] crc = crc ^ d From b83010fad128b3b460d830f58a4803394dc1b22a Mon Sep 17 00:00:00 2001 From: Joshua Wise Date: Wed, 10 Feb 2021 23:08:25 -0800 Subject: [PATCH 2/2] stm32_crc: add backwards compatibility, sigh add switch for python backwards compatibility --- Utilities/stm32_crc.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Utilities/stm32_crc.py b/Utilities/stm32_crc.py index 40df7848..ad8119aa 100644 --- a/Utilities/stm32_crc.py +++ b/Utilities/stm32_crc.py @@ -9,7 +9,10 @@ def process_word(data, crc=0xffffffff): for x in range(0, 4 - len(data)): d_array.insert(0,0) d_array.reverse() - data = d_array.tobytes() + try: + data = d_array.tobytes() + except: + data = d_array.tostring() d = array.array('I', data)[0] crc = crc ^ d