Merge pull request adafruit#1756 from tannewt/fix_cpx_display

Fix crash when getting board.SPI outside the VM
rhooper · Apr 9, 2019 · 9026f13 · 9026f13
2 parents 5015036 + 0e98eeb
commit 9026f13
Show file tree

Hide file tree

Showing 87 changed files with 364 additions and 403 deletions.
diff --git a/locale/ID.po b/locale/ID.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -924,17 +924,9 @@ msgstr "Tidak ada pin TX"
 msgid "No available clocks"
 msgstr ""
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr "Tidak ada standar bus I2C"
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr "Tidak ada standar bus SPI"
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
-msgstr "Tidak ada standar bus UART"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
+msgstr "Tidak ada standar bus %q"
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c
 msgid "No free GCLKs"

diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -899,16 +899,8 @@ msgstr ""
 msgid "No available clocks"
 msgstr ""
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr ""
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr ""
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c

diff --git a/locale/de_DE.po b/locale/de_DE.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: 2018-07-27 11:55-0700\n"
 "Last-Translator: Pascal Deneaux\n"
 "Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -912,17 +912,9 @@ msgstr "Kein TX Pin"
 msgid "No available clocks"
 msgstr ""
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr "Kein Standard I2C Bus"
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr "Kein Standard SPI Bus"
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
-msgstr "Kein Standard UART Bus"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
+msgstr "Kein Standard %q Bus"
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c
 msgid "No free GCLKs"

diff --git a/locale/en_US.po b/locale/en_US.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: 2018-07-27 11:55-0700\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -899,16 +899,8 @@ msgstr ""
 msgid "No available clocks"
 msgstr ""
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr ""
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr ""
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c

diff --git a/locale/en_x_pirate.po b/locale/en_x_pirate.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: 2018-07-27 11:55-0700\n"
 "Last-Translator: \n"
 "Language-Team: @sommersoft, @MrCertainly\n"
@@ -903,16 +903,8 @@ msgstr ""
 msgid "No available clocks"
 msgstr ""
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr ""
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr ""
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
 msgstr ""
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c

diff --git a/locale/es.po b/locale/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: 2018-08-24 22:56-0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -937,17 +937,9 @@ msgstr "Sin pin TX"
 msgid "No available clocks"
 msgstr "Relojes no disponibles"
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr "Sin bus I2C por defecto"
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr "Sin bus SPI por defecto"
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
-msgstr "Sin bus UART por defecto"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
+msgstr "Sin bus %q por defecto"
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c
 msgid "No free GCLKs"

diff --git a/locale/fil.po b/locale/fil.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: 2018-12-20 22:15-0800\n"
 "Last-Translator: Timothy <[email protected]>\n"
 "Language-Team: fil\n"
@@ -933,17 +933,9 @@ msgstr "Walang TX pin"
 msgid "No available clocks"
 msgstr ""
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr "Walang default na I2C bus"
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr "Walang default SPI bus"
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
-msgstr "Walang default UART bus"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
+msgstr "Walang default na %q bus"
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c
 msgid "No free GCLKs"

diff --git a/locale/fr.po b/locale/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: 2018-12-23 20:05+0100\n"
 "Last-Translator: Pierrick Couturier <[email protected]>\n"
 "Language-Team: fr\n"
@@ -936,17 +936,9 @@ msgstr "Pas de broche TX"
 msgid "No available clocks"
 msgstr ""
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr "Pas de bus I2C par défaut"
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr "Pas de bus SPI par défaut"
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
-msgstr "Pas de bus UART par défaut"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
+msgstr "Pas de bus %q par défaut"
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c
 msgid "No free GCLKs"

diff --git a/locale/it_IT.po b/locale/it_IT.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: 2018-10-02 16:27+0200\n"
 "Last-Translator: Enrico Paganin <[email protected]>\n"
 "Language-Team: \n"
@@ -932,17 +932,9 @@ msgstr "Nessun pin TX"
 msgid "No available clocks"
 msgstr ""
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr "Nessun bus I2C predefinito"
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr "Nessun bus SPI predefinito"
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
-msgstr "Nessun bus UART predefinito"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
+msgstr "Nessun bus %q predefinito"
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c
 msgid "No free GCLKs"

diff --git a/locale/pl.po b/locale/pl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: 2019-03-19 18:37-0700\n"
 "Last-Translator: Radomir Dopieralski <[email protected]>\n"
 "Language-Team: pl\n"
@@ -909,17 +909,9 @@ msgstr "Brak nóżki TX"
 msgid "No available clocks"
 msgstr "Brak dostępnych zegarów"
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr "Nie ma domyślnej magistrali I2C"
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr "Nie ma domyślnej magistrali SPI"
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
-msgstr "Nie ma domyślnej magistrali UART"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
+msgstr "Nie ma domyślnej magistrali %q"
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c
 msgid "No free GCLKs"

diff --git a/locale/pt_BR.po b/locale/pt_BR.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-04 13:37-0700\n"
+"POT-Creation-Date: 2019-04-08 16:48-0700\n"
 "PO-Revision-Date: 2018-10-02 21:14-0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -922,17 +922,9 @@ msgstr "Nenhum pino TX"
 msgid "No available clocks"
 msgstr ""
 
-#: supervisor/shared/board_busses.c
-msgid "No default I2C bus"
-msgstr "Nenhum barramento I2C padrão"
-
-#: supervisor/shared/board_busses.c
-msgid "No default SPI bus"
-msgstr "Nenhum barramento SPI padrão"
-
-#: supervisor/shared/board_busses.c
-msgid "No default UART bus"
-msgstr "Nenhum barramento UART padrão"
+#: shared-bindings/board/__init__.c
+msgid "No default %q bus"
+msgstr "Nenhum barramento %q padrão"
 
 #: ports/atmel-samd/common-hal/touchio/TouchIn.c
 msgid "No free GCLKs"

diff --git a/main.c b/main.c
@@ -50,7 +50,6 @@
 #include "supervisor/port.h"
 #include "supervisor/filesystem.h"
 #include "supervisor/shared/autoreload.h"
-#include "supervisor/shared/board_busses.h"
 #include "supervisor/shared/translate.h"
 #include "supervisor/shared/rgb_led_status.h"
 #include "supervisor/shared/safe_mode.h"
@@ -62,6 +61,10 @@
 #include "shared-module/network/__init__.h"
 #endif
 
+#if CIRCUITPY_BOARD
+#include "shared-module/board/__init__.h"
+#endif
+
 void do_str(const char *src, mp_parse_input_kind_t input_kind) {
     mp_lexer_t *lex = mp_lexer_new_from_str_len(MP_QSTR__lt_stdin_gt_, src, strlen(src), 0);
     if (lex == NULL) {

diff --git a/ports/atmel-samd/boards/arduino_mkr1300/pins.c b/ports/atmel-samd/boards/arduino_mkr1300/pins.c
@@ -1,7 +1,5 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "supervisor/shared/board_busses.h"
-
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB02) },

diff --git a/ports/atmel-samd/boards/arduino_mkrzero/pins.c b/ports/atmel-samd/boards/arduino_mkrzero/pins.c
@@ -1,7 +1,5 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "supervisor/shared/board_busses.h"
-
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB02) },

diff --git a/ports/atmel-samd/boards/arduino_zero/pins.c b/ports/atmel-samd/boards/arduino_zero/pins.c
@@ -1,7 +1,5 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "supervisor/shared/board_busses.h"
-
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
     { MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) },

diff --git a/ports/atmel-samd/boards/catwan_usbstick/pins.c b/ports/atmel-samd/boards/catwan_usbstick/pins.c
@@ -1,7 +1,5 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "supervisor/shared/board_busses.h"
-
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PA30) },
     { MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PA31) },

diff --git a/ports/atmel-samd/boards/circuitplayground_express/pins.c b/ports/atmel-samd/boards/circuitplayground_express/pins.c
@@ -1,7 +1,5 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "supervisor/shared/board_busses.h"
-
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA02) },

diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c b/ports/atmel-samd/boards/circuitplayground_express_crickit/pins.c
@@ -1,7 +1,5 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "supervisor/shared/board_busses.h"
-
 STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
     { MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
     { MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA02) },

diff --git a/ports/atmel-samd/boards/cp32-m4/pins.c b/ports/atmel-samd/boards/cp32-m4/pins.c
@@ -1,7 +1,5 @@
 #include "shared-bindings/board/__init__.h"
 
-#include "supervisor/shared/board_busses.h"
-
 // This mapping only includes functional names because pins broken
 // out on connectors are labeled with their MCU name available from
 // microcontroller.pin.