WIP: fix issues with remaining atmel-samd builds

26 files changed, 551 insertions, 539 deletions

diff --git a/locale/ID.po b/locale/ID.po
index 83a8ea2b4..c07e419e4 100644
--- 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-02-12 22:32-0500\n"
+"POT-Creation-Date: 2019-02-15 08:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -155,7 +155,7 @@ msgstr "kompilasi script tidak didukung"
 msgid " output:\n"
 msgstr "output:\n"
 
-#: main.c:166 main.c:247
+#: main.c:166 main.c:250
 msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
@@ -167,7 +167,7 @@ msgstr ""
 msgid "Running in safe mode! Auto-reload is off.\n"
 msgstr "Berjalan di mode aman(safe mode)! Auto-reload tidak aktif.\n"
 
-#: main.c:170 main.c:249
+#: main.c:170 main.c:252
 msgid "Auto-reload is off.\n"
 msgstr "Auto-reload tidak aktif.\n"
 
@@ -180,19 +180,19 @@ msgstr ""
 msgid "WARNING: Your code filename has two extensions\n"
 msgstr "PERINGATAN: Nama file kode anda mempunyai dua ekstensi\n"
 
-#: main.c:221
+#: main.c:223
 msgid ""
 "\n"
 "Code done running. Waiting for reload.\n"
 msgstr ""
 
-#: main.c:254
+#: main.c:257
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
 "Tekan tombol apa saja untuk masuk ke dalam REPL. Gunakan CTRL+D untuk reset "
 "(Reload)"
 
-#: main.c:419
+#: main.c:422
 msgid "soft reboot\n"
 msgstr "memulai ulang software(soft reboot)\n"
 
@@ -360,12 +360,12 @@ msgstr "Gagal untuk mengalokasikan buffer RX"
 msgid "Could not initialize UART"
 msgstr "Tidak dapat menginisialisasi UART"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:241
+#: ports/atmel-samd/common-hal/busio/UART.c:252
 #: ports/nrf/common-hal/busio/UART.c:230
 msgid "No RX pin"
 msgstr "Tidak pin RX"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:300
+#: ports/atmel-samd/common-hal/busio/UART.c:311
 #: ports/nrf/common-hal/busio/UART.c:265
 msgid "No TX pin"
 msgstr "Tidak ada pin TX"
@@ -2233,8 +2233,11 @@ msgid "timeout must be >= 0.0"
 msgstr "bits harus memilki nilai 8"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:79
+#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
+#: shared-bindings/displayio/Group.c:100 shared-bindings/displayio/Shape.c:69
+#: shared-bindings/displayio/Shape.c:73
 #, fuzzy
-msgid "buffer_size must be >= 1"
+msgid "%q must be >= 1"
 msgstr "buffers harus mempunyai panjang yang sama"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:83
@@ -2393,12 +2396,6 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr ""
 
-#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
-#: shared-bindings/displayio/Group.c:100
-#, fuzzy
-msgid "%q must be >= 1"
-msgstr "buffers harus mempunyai panjang yang sama"
-
 #: shared-bindings/displayio/Palette.c:91
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
 msgstr ""
@@ -2420,15 +2417,15 @@ msgstr ""
 msgid "palette_index should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:88
+#: shared-bindings/displayio/Shape.c:97
 msgid "y should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:92
+#: shared-bindings/displayio/Shape.c:101
 msgid "start_x should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:96
+#: shared-bindings/displayio/Shape.c:105
 msgid "end_x should be an int"
 msgstr ""
 
@@ -2845,38 +2842,42 @@ msgid ""
 "exit safe mode.\n"
 msgstr ""
 
-#, fuzzy
-#~ msgid "unicode_characters must be a string"
-#~ msgstr "keyword harus berupa string"
-
-#~ msgid "All PWM peripherals are in use"
-#~ msgstr "Semua perangkat PWM sedang digunakan"
-
-#~ msgid "Invalid UUID string length"
-#~ msgstr "Panjang string UUID tidak valid"
+#~ msgid "busio.UART not available"
+#~ msgstr "busio.UART tidak tersedia"
 
 #~ msgid ""
-#~ "enough power for the whole circuit and press reset (after ejecting "
-#~ "CIRCUITPY).\n"
+#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
 #~ msgstr ""
-#~ "tegangan cukup untuk semua sirkuit dan tekan reset (setelah mencabut "
-#~ "CIRCUITPY).\n"
+#~ "Silahkan taruh masalah disini dengan isi dari CIRCUITPY drive: anda \n"
 
-#~ msgid "Invalid UUID parameter"
-#~ msgstr "Parameter UUID tidak valid"
+#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
+#~ msgstr ""
+#~ "Sepertinya inti kode CircuitPython kita crash dengan sangat keras. Ups!\n"
 
 #, fuzzy
 #~ msgid "unpack requires a buffer of %d bytes"
 #~ msgstr "Gagal untuk megalokasikan buffer RX dari %d byte"
 
-#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
-#~ msgstr ""
-#~ "Sepertinya inti kode CircuitPython kita crash dengan sangat keras. Ups!\n"
+#~ msgid "Invalid UUID parameter"
+#~ msgstr "Parameter UUID tidak valid"
 
 #~ msgid ""
-#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY).\n"
 #~ msgstr ""
-#~ "Silahkan taruh masalah disini dengan isi dari CIRCUITPY drive: anda \n"
+#~ "tegangan cukup untuk semua sirkuit dan tekan reset (setelah mencabut "
+#~ "CIRCUITPY).\n"
 
-#~ msgid "busio.UART not available"
-#~ msgstr "busio.UART tidak tersedia"
+#~ msgid "Invalid UUID string length"
+#~ msgstr "Panjang string UUID tidak valid"
+
+#~ msgid "All PWM peripherals are in use"
+#~ msgstr "Semua perangkat PWM sedang digunakan"
+
+#, fuzzy
+#~ msgid "unicode_characters must be a string"
+#~ msgstr "keyword harus berupa string"
+
+#, fuzzy
+#~ msgid "buffer_size must be >= 1"
+#~ msgstr "buffers harus mempunyai panjang yang sama"
diff --git a/locale/circuitpython.pot b/locale/circuitpython.pot
index f9c0263c0..1ad79c9a3 100644
--- 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-02-12 22:32-0500\n"
+"POT-Creation-Date: 2019-02-15 08:46-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -155,7 +155,7 @@ msgstr ""
 msgid " output:\n"
 msgstr ""
 
-#: main.c:166 main.c:247
+#: main.c:166 main.c:250
 msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "Running in safe mode! Auto-reload is off.\n"
 msgstr ""
 
-#: main.c:170 main.c:249
+#: main.c:170 main.c:252
 msgid "Auto-reload is off.\n"
 msgstr ""
 
@@ -177,17 +177,17 @@ msgstr ""
 msgid "WARNING: Your code filename has two extensions\n"
 msgstr ""
 
-#: main.c:221
+#: main.c:223
 msgid ""
 "\n"
 "Code done running. Waiting for reload.\n"
 msgstr ""
 
-#: main.c:254
+#: main.c:257
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
 
-#: main.c:419
+#: main.c:422
 msgid "soft reboot\n"
 msgstr ""
 
@@ -353,12 +353,12 @@ msgstr ""
 msgid "Could not initialize UART"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c:241
+#: ports/atmel-samd/common-hal/busio/UART.c:252
 #: ports/nrf/common-hal/busio/UART.c:230
 msgid "No RX pin"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c:300
+#: ports/atmel-samd/common-hal/busio/UART.c:311
 #: ports/nrf/common-hal/busio/UART.c:265
 msgid "No TX pin"
 msgstr ""
@@ -2197,7 +2197,10 @@ msgid "timeout must be >= 0.0"
 msgstr ""
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:79
-msgid "buffer_size must be >= 1"
+#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
+#: shared-bindings/displayio/Group.c:100 shared-bindings/displayio/Shape.c:69
+#: shared-bindings/displayio/Shape.c:73
+msgid "%q must be >= 1"
 msgstr ""
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:83
@@ -2354,11 +2357,6 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr ""
 
-#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
-#: shared-bindings/displayio/Group.c:100
-msgid "%q must be >= 1"
-msgstr ""
-
 #: shared-bindings/displayio/Palette.c:91
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
 msgstr ""
@@ -2380,15 +2378,15 @@ msgstr ""
 msgid "palette_index should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:88
+#: shared-bindings/displayio/Shape.c:97
 msgid "y should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:92
+#: shared-bindings/displayio/Shape.c:101
 msgid "start_x should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:96
+#: shared-bindings/displayio/Shape.c:105
 msgid "end_x should be an int"
 msgstr ""
 
diff --git a/locale/de_DE.po b/locale/de_DE.po
index 509bc0488..404795274 100644
--- 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-02-12 22:32-0500\n"
+"POT-Creation-Date: 2019-02-15 08:46-0500\n"
 "PO-Revision-Date: 2018-07-27 11:55-0700\n"
 "Last-Translator: Sebastian Plamauer\n"
 "Language-Team: \n"
@@ -155,7 +155,7 @@ msgstr "kompilieren von Skripten ist nicht unterstützt"
 msgid " output:\n"
 msgstr " Ausgabe:\n"
 
-#: main.c:166 main.c:247
+#: main.c:166 main.c:250
 msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
@@ -167,7 +167,7 @@ msgstr ""
 msgid "Running in safe mode! Auto-reload is off.\n"
 msgstr "Sicherheitsmodus aktiv! Automatisches Neuladen ist deaktiviert.\n"
 
-#: main.c:170 main.c:249
+#: main.c:170 main.c:252
 msgid "Auto-reload is off.\n"
 msgstr "Automatisches Neuladen ist deaktiviert.\n"
 
@@ -180,19 +180,19 @@ msgid "WARNING: Your code filename has two extensions\n"
 msgstr ""
 "WARNUNG: Der Dateiname deines Programms hat zwei Dateityperweiterungen\n"
 
-#: main.c:221
+#: main.c:223
 msgid ""
 "\n"
 "Code done running. Waiting for reload.\n"
 msgstr ""
 
-#: main.c:254
+#: main.c:257
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
 "Drücke eine Taste um dich mit der REPL zu verbinden. Drücke Strg-D zum neu "
 "laden"
 
-#: main.c:419
+#: main.c:422
 msgid "soft reboot\n"
 msgstr "soft reboot\n"
 
@@ -358,12 +358,12 @@ msgstr "Konnte keinen RX Buffer allozieren"
 msgid "Could not initialize UART"
 msgstr "Konnte UART nicht initialisieren"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:241
+#: ports/atmel-samd/common-hal/busio/UART.c:252
 #: ports/nrf/common-hal/busio/UART.c:230
 msgid "No RX pin"
 msgstr "Kein RX Pin"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:300
+#: ports/atmel-samd/common-hal/busio/UART.c:311
 #: ports/nrf/common-hal/busio/UART.c:265
 msgid "No TX pin"
 msgstr "Kein TX Pin"
@@ -2222,7 +2222,11 @@ msgid "timeout must be >= 0.0"
 msgstr "timeout muss >= 0.0 sein"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:79
-msgid "buffer_size must be >= 1"
+#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
+#: shared-bindings/displayio/Group.c:100 shared-bindings/displayio/Shape.c:69
+#: shared-bindings/displayio/Shape.c:73
+#, fuzzy
+msgid "%q must be >= 1"
 msgstr "Puffergröße muss >= 1 sein"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:83
@@ -2379,12 +2383,6 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr ""
 
-#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
-#: shared-bindings/displayio/Group.c:100
-#, fuzzy
-msgid "%q must be >= 1"
-msgstr "Puffergröße muss >= 1 sein"
-
 #: shared-bindings/displayio/Palette.c:91
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
 msgstr ""
@@ -2406,15 +2404,15 @@ msgstr ""
 msgid "palette_index should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:88
+#: shared-bindings/displayio/Shape.c:97
 msgid "y should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:92
+#: shared-bindings/displayio/Shape.c:101
 msgid "start_x should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:96
+#: shared-bindings/displayio/Shape.c:105
 msgid "end_x should be an int"
 msgstr ""
 
@@ -2841,16 +2839,19 @@ msgstr ""
 "Die Reset-Taste wurde beim Booten von CircuitPython gedrückt. Drücke sie "
 "erneut um den abgesicherten Modus zu verlassen. \n"
 
-#, fuzzy
-#~ msgid "Group must have %q at least 1"
-#~ msgstr "Der Puffer muss eine Mindestenslänge von 1 haben"
+#~ msgid "busio.UART not available"
+#~ msgstr "busio.UART nicht verfügbar"
+
+#~ msgid "All PWM peripherals are in use"
+#~ msgstr "Alle PWM-Peripheriegeräte werden verwendet"
 
 #, fuzzy
 #~ msgid "unicode_characters must be a string"
 #~ msgstr "name muss ein String sein"
 
-#~ msgid "All PWM peripherals are in use"
-#~ msgstr "Alle PWM-Peripheriegeräte werden verwendet"
+#, fuzzy
+#~ msgid "Group must have %q at least 1"
+#~ msgstr "Der Puffer muss eine Mindestenslänge von 1 haben"
 
-#~ msgid "busio.UART not available"
-#~ msgstr "busio.UART nicht verfügbar"
+#~ msgid "buffer_size must be >= 1"
+#~ msgstr "Puffergröße muss >= 1 sein"
diff --git a/locale/en_US.po b/locale/en_US.po
index 327a7f5f5..78ea5c7df 100644
--- 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-02-12 22:32-0500\n"
+"POT-Creation-Date: 2019-02-15 08:46-0500\n"
 "PO-Revision-Date: 2018-07-27 11:55-0700\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -155,7 +155,7 @@ msgstr ""
 msgid " output:\n"
 msgstr ""
 
-#: main.c:166 main.c:247
+#: main.c:166 main.c:250
 msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "Running in safe mode! Auto-reload is off.\n"
 msgstr ""
 
-#: main.c:170 main.c:249
+#: main.c:170 main.c:252
 msgid "Auto-reload is off.\n"
 msgstr ""
 
@@ -177,17 +177,17 @@ msgstr ""
 msgid "WARNING: Your code filename has two extensions\n"
 msgstr ""
 
-#: main.c:221
+#: main.c:223
 msgid ""
 "\n"
 "Code done running. Waiting for reload.\n"
 msgstr ""
 
-#: main.c:254
+#: main.c:257
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
 
-#: main.c:419
+#: main.c:422
 msgid "soft reboot\n"
 msgstr ""
 
@@ -353,12 +353,12 @@ msgstr ""
 msgid "Could not initialize UART"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c:241
+#: ports/atmel-samd/common-hal/busio/UART.c:252
 #: ports/nrf/common-hal/busio/UART.c:230
 msgid "No RX pin"
 msgstr ""
 
-#: ports/atmel-samd/common-hal/busio/UART.c:300
+#: ports/atmel-samd/common-hal/busio/UART.c:311
 #: ports/nrf/common-hal/busio/UART.c:265
 msgid "No TX pin"
 msgstr ""
@@ -2197,7 +2197,10 @@ msgid "timeout must be >= 0.0"
 msgstr ""
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:79
-msgid "buffer_size must be >= 1"
+#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
+#: shared-bindings/displayio/Group.c:100 shared-bindings/displayio/Shape.c:69
+#: shared-bindings/displayio/Shape.c:73
+msgid "%q must be >= 1"
 msgstr ""
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:83
@@ -2354,11 +2357,6 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr ""
 
-#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
-#: shared-bindings/displayio/Group.c:100
-msgid "%q must be >= 1"
-msgstr ""
-
 #: shared-bindings/displayio/Palette.c:91
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
 msgstr ""
@@ -2380,15 +2378,15 @@ msgstr ""
 msgid "palette_index should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:88
+#: shared-bindings/displayio/Shape.c:97
 msgid "y should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:92
+#: shared-bindings/displayio/Shape.c:101
 msgid "start_x should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:96
+#: shared-bindings/displayio/Shape.c:105
 msgid "end_x should be an int"
 msgstr ""
 
diff --git a/locale/es.po b/locale/es.po
index 8183e64ea..18b267fcc 100644
--- 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-02-12 22:32-0500\n"
+"POT-Creation-Date: 2019-02-15 08:46-0500\n"
 "PO-Revision-Date: 2018-08-24 22:56-0500\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -156,7 +156,7 @@ msgstr "script de compilación no soportado"
 msgid " output:\n"
 msgstr " salida:\n"
 
-#: main.c:166 main.c:247
+#: main.c:166 main.c:250
 msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
@@ -168,7 +168,7 @@ msgstr ""
 msgid "Running in safe mode! Auto-reload is off.\n"
 msgstr "Ejecutando en modo seguro! La auto-recarga esta deshabilitada.\n"
 
-#: main.c:170 main.c:249
+#: main.c:170 main.c:252
 msgid "Auto-reload is off.\n"
 msgstr "Auto-recarga deshabilitada.\n"
 
@@ -180,18 +180,18 @@ msgstr "Ejecutando en modo seguro! No se esta ejecutando el código guardado.\n"
 msgid "WARNING: Your code filename has two extensions\n"
 msgstr "ADVERTENCIA: El nombre de archivo de tu código tiene dos extensiones\n"
 
-#: main.c:221
+#: main.c:223
 msgid ""
 "\n"
 "Code done running. Waiting for reload.\n"
 msgstr ""
 
-#: main.c:254
+#: main.c:257
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
 "Presiona cualquier tecla para entrar al REPL. Usa CTRL-D para recargar."
 
-#: main.c:419
+#: main.c:422
 msgid "soft reboot\n"
 msgstr "reinicio suave\n"
 
@@ -359,12 +359,12 @@ msgstr "Ha fallado la asignación del buffer RX"
 msgid "Could not initialize UART"
 msgstr "No se puede inicializar la UART"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:241
+#: ports/atmel-samd/common-hal/busio/UART.c:252
 #: ports/nrf/common-hal/busio/UART.c:230
 msgid "No RX pin"
 msgstr "Sin pin RX"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:300
+#: ports/atmel-samd/common-hal/busio/UART.c:311
 #: ports/nrf/common-hal/busio/UART.c:265
 msgid "No TX pin"
 msgstr "Sin pin TX"
@@ -2253,8 +2253,11 @@ msgid "timeout must be >= 0.0"
 msgstr "bits debe ser 8"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:79
+#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
+#: shared-bindings/displayio/Group.c:100 shared-bindings/displayio/Shape.c:69
+#: shared-bindings/displayio/Shape.c:73
 #, fuzzy
-msgid "buffer_size must be >= 1"
+msgid "%q must be >= 1"
 msgstr "los buffers deben de tener la misma longitud"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:83
@@ -2417,12 +2420,6 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr "Bytes debe estar entre 0 y 255."
 
-#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
-#: shared-bindings/displayio/Group.c:100
-#, fuzzy
-msgid "%q must be >= 1"
-msgstr "los buffers deben de tener la misma longitud"
-
 #: shared-bindings/displayio/Palette.c:91
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
 msgstr "color buffer deberia ser un bytearray o array de tipo 'b' o 'B'"
@@ -2444,16 +2441,16 @@ msgstr "color buffer deber ser un buffer o un int"
 msgid "palette_index should be an int"
 msgstr "palette_index deberia ser un int"
 
-#: shared-bindings/displayio/Shape.c:88
+#: shared-bindings/displayio/Shape.c:97
 msgid "y should be an int"
 msgstr "y deberia ser un int"
 
-#: shared-bindings/displayio/Shape.c:92
+#: shared-bindings/displayio/Shape.c:101
 #, fuzzy
 msgid "start_x should be an int"
 msgstr "y deberia ser un int"
 
-#: shared-bindings/displayio/Shape.c:96
+#: shared-bindings/displayio/Shape.c:105
 #, fuzzy
 msgid "end_x should be an int"
 msgstr "y deberia ser un int"
@@ -2883,95 +2880,99 @@ msgstr ""
 "El botón reset fue presionado mientras arrancaba CircuitPython. Presiona "
 "otra vez para salir del modo seguro.\n"
 
-#, fuzzy
-#~ msgid "Group must have %q at least 1"
-#~ msgstr "Group debe tener size de minimo 1"
+#~ msgid "busio.UART not available"
+#~ msgstr "busio.UART no disponible"
 
-#~ msgid "Baud rate too high for this SPI peripheral"
-#~ msgstr "Baud rate demasiado alto para este periférico SPI"
+#~ msgid "Can not apply advertisement data. status: 0x%02x"
+#~ msgstr "No se puede aplicar los datos de anuncio. status: 0x%02x"
 
-#~ msgid "Invalid UUID parameter"
-#~ msgstr "Parámetro UUID inválido"
+#, fuzzy
+#~ msgid ""
+#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
+#~ msgstr ""
+#~ "Por favor registra un issue en la siguiente URL con el contenidos de tu "
+#~ "unidad de almacenamiento CIRCUITPY:\n"
 
-#~ msgid "row buffer must be a bytearray or array of type 'b' or 'B'"
-#~ msgstr "row buffer deberia ser un bytearray o array de tipo 'b' o 'B'"
+#~ msgid "Cannot set PPCP parameters."
+#~ msgstr "No se pueden establecer los parámetros PPCP."
 
-#~ msgid "row data must be a buffer"
-#~ msgstr "row data debe ser un buffer"
+#~ msgid "Can not apply device name in the stack."
+#~ msgstr "No se puede aplicar el nombre del dispositivo en el stack."
 
-#, fuzzy
-#~ msgid "unicode_characters must be a string"
-#~ msgstr "palabras clave deben ser strings"
+#~ msgid "Cannot apply GAP parameters."
+#~ msgstr "No se pueden aplicar los parámetros GAP."
 
-#~ msgid "index must be int"
-#~ msgstr "indice debe ser int"
+#~ msgid "Wrong number of bytes provided"
+#~ msgstr "Numero erroneo de bytes dados"
 
-#~ msgid "Can not query for the device address."
-#~ msgstr "No se puede consultar la dirección del dispositivo."
+#~ msgid "Can not encode UUID, to check length."
+#~ msgstr "No se puede codificar el UUID, para revisar la longitud."
 
-#~ msgid "All PWM peripherals are in use"
-#~ msgstr "Todos los periféricos PWM en uso"
+#, fuzzy
+#~ msgid "unpack requires a buffer of %d bytes"
+#~ msgstr "Falló la asignación del buffer RX de %d bytes"
 
-#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
+#~ msgid ""
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY).\n"
 #~ msgstr ""
-#~ "Parece que nuestro código CircuitPython dejó de funcionar. Whoops!\n"
+#~ "suficiente poder para todo el circuito y presiona reset (después de "
+#~ "expulsar CIRCUITPY).\n"
 
-#~ msgid "Group empty"
-#~ msgstr "Group vacío"
+#~ msgid "displayio is a work in progress"
+#~ msgstr "displayio todavia esta en desarrollo"
 
-#~ msgid "Wrong address length"
-#~ msgstr "Longitud de address erronea"
+#~ msgid "Can not add Service."
+#~ msgstr "No se puede agregar el Servicio."
 
-#~ msgid "Can encode UUID into the advertisement packet."
-#~ msgstr "Se puede codificar el UUID en el paquete de anuncio."
+#~ msgid "Invalid UUID string length"
+#~ msgstr "Longitud de string UUID inválida"
 
 #~ msgid "Invalid Service type"
 #~ msgstr "Tipo de Servicio inválido"
 
-#~ msgid "Invalid UUID string length"
-#~ msgstr "Longitud de string UUID inválida"
+#~ msgid "Can encode UUID into the advertisement packet."
+#~ msgstr "Se puede codificar el UUID en el paquete de anuncio."
 
-#~ msgid "Can not add Service."
-#~ msgstr "No se puede agregar el Servicio."
+#~ msgid "Wrong address length"
+#~ msgstr "Longitud de address erronea"
 
-#~ msgid "displayio is a work in progress"
-#~ msgstr "displayio todavia esta en desarrollo"
+#~ msgid "Group empty"
+#~ msgstr "Group vacío"
 
-#~ msgid ""
-#~ "enough power for the whole circuit and press reset (after ejecting "
-#~ "CIRCUITPY).\n"
+#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
 #~ msgstr ""
-#~ "suficiente poder para todo el circuito y presiona reset (después de "
-#~ "expulsar CIRCUITPY).\n"
+#~ "Parece que nuestro código CircuitPython dejó de funcionar. Whoops!\n"
 
-#, fuzzy
-#~ msgid "unpack requires a buffer of %d bytes"
-#~ msgstr "Falló la asignación del buffer RX de %d bytes"
+#~ msgid "All PWM peripherals are in use"
+#~ msgstr "Todos los periféricos PWM en uso"
 
-#~ msgid "Can not encode UUID, to check length."
-#~ msgstr "No se puede codificar el UUID, para revisar la longitud."
+#~ msgid "Can not query for the device address."
+#~ msgstr "No se puede consultar la dirección del dispositivo."
 
-#~ msgid "Wrong number of bytes provided"
-#~ msgstr "Numero erroneo de bytes dados"
+#~ msgid "index must be int"
+#~ msgstr "indice debe ser int"
 
-#~ msgid "Cannot apply GAP parameters."
-#~ msgstr "No se pueden aplicar los parámetros GAP."
+#, fuzzy
+#~ msgid "unicode_characters must be a string"
+#~ msgstr "palabras clave deben ser strings"
 
-#~ msgid "Can not apply device name in the stack."
-#~ msgstr "No se puede aplicar el nombre del dispositivo en el stack."
+#~ msgid "row data must be a buffer"
+#~ msgstr "row data debe ser un buffer"
 
-#~ msgid "Cannot set PPCP parameters."
-#~ msgstr "No se pueden establecer los parámetros PPCP."
+#~ msgid "row buffer must be a bytearray or array of type 'b' or 'B'"
+#~ msgstr "row buffer deberia ser un bytearray o array de tipo 'b' o 'B'"
 
-#, fuzzy
-#~ msgid ""
-#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
-#~ msgstr ""
-#~ "Por favor registra un issue en la siguiente URL con el contenidos de tu "
-#~ "unidad de almacenamiento CIRCUITPY:\n"
+#~ msgid "Invalid UUID parameter"
+#~ msgstr "Parámetro UUID inválido"
 
-#~ msgid "Can not apply advertisement data. status: 0x%02x"
-#~ msgstr "No se puede aplicar los datos de anuncio. status: 0x%02x"
+#~ msgid "Baud rate too high for this SPI peripheral"
+#~ msgstr "Baud rate demasiado alto para este periférico SPI"
 
-#~ msgid "busio.UART not available"
-#~ msgstr "busio.UART no disponible"
+#, fuzzy
+#~ msgid "Group must have %q at least 1"
+#~ msgstr "Group debe tener size de minimo 1"
+
+#, fuzzy
+#~ msgid "buffer_size must be >= 1"
+#~ msgstr "los buffers deben de tener la misma longitud"
diff --git a/locale/fil.po b/locale/fil.po
index 3adc339e6..b42b96343 100644
--- 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-02-12 22:32-0500\n"
+"POT-Creation-Date: 2019-02-15 08:46-0500\n"
 "PO-Revision-Date: 2018-12-20 22:15-0800\n"
 "Last-Translator: Timothy <me@timothygarcia.ca>\n"
 "Language-Team: fil\n"
@@ -155,7 +155,7 @@ msgstr "script kompilasyon hindi supportado"
 msgid " output:\n"
 msgstr " output:\n"
 
-#: main.c:166 main.c:247
+#: main.c:166 main.c:250
 msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
@@ -167,7 +167,7 @@ msgstr ""
 msgid "Running in safe mode! Auto-reload is off.\n"
 msgstr "Tumatakbo sa safe mode! Awtomatikong pag re-reload ay OFF.\n"
 
-#: main.c:170 main.c:249
+#: main.c:170 main.c:252
 msgid "Auto-reload is off.\n"
 msgstr "Awtomatikong pag re-reload ay OFF.\n"
 
@@ -179,19 +179,19 @@ msgstr "Tumatakbo sa safe mode! Hindi tumatakbo ang nai-save na code.\n"
 msgid "WARNING: Your code filename has two extensions\n"
 msgstr "BABALA: Ang pangalan ng file ay may dalawang extension\n"
 
-#: main.c:221
+#: main.c:223
 msgid ""
 "\n"
 "Code done running. Waiting for reload.\n"
 msgstr ""
 
-#: main.c:254
+#: main.c:257
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
 "Pindutin ang anumang key upang pumasok sa REPL. Gamitin ang CTRL-D upang i-"
 "reload."
 
-#: main.c:419
+#: main.c:422
 msgid "soft reboot\n"
 msgstr "malambot na reboot\n"
 
@@ -357,12 +357,12 @@ msgstr "Nabigong ilaan ang RX buffer"
 msgid "Could not initialize UART"
 msgstr "Hindi ma-initialize ang UART"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:241
+#: ports/atmel-samd/common-hal/busio/UART.c:252
 #: ports/nrf/common-hal/busio/UART.c:230
 msgid "No RX pin"
 msgstr "Walang RX pin"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:300
+#: ports/atmel-samd/common-hal/busio/UART.c:311
 #: ports/nrf/common-hal/busio/UART.c:265
 msgid "No TX pin"
 msgstr "Walang TX pin"
@@ -2258,8 +2258,11 @@ msgid "timeout must be >= 0.0"
 msgstr "bits ay dapat walo (8)"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:79
+#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
+#: shared-bindings/displayio/Group.c:100 shared-bindings/displayio/Shape.c:69
+#: shared-bindings/displayio/Shape.c:73
 #, fuzzy
-msgid "buffer_size must be >= 1"
+msgid "%q must be >= 1"
 msgstr "aarehas na haba dapat ang buffer slices"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:83
@@ -2422,12 +2425,6 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr "Sa gitna ng 0 o 255 dapat ang bytes."
 
-#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
-#: shared-bindings/displayio/Group.c:100
-#, fuzzy
-msgid "%q must be >= 1"
-msgstr "aarehas na haba dapat ang buffer slices"
-
 #: shared-bindings/displayio/Palette.c:91
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
 msgstr "ang color buffer ay dapat bytearray o array na type ‘b’ or ‘B’"
@@ -2449,16 +2446,16 @@ msgstr "color buffer ay dapat buffer or int"
 msgid "palette_index should be an int"
 msgstr "palette_index ay dapat na int"
 
-#: shared-bindings/displayio/Shape.c:88
+#: shared-bindings/displayio/Shape.c:97
 msgid "y should be an int"
 msgstr "y ay dapat int"
 
-#: shared-bindings/displayio/Shape.c:92
+#: shared-bindings/displayio/Shape.c:101
 #, fuzzy
 msgid "start_x should be an int"
 msgstr "y ay dapat int"
 
-#: shared-bindings/displayio/Shape.c:96
+#: shared-bindings/displayio/Shape.c:105
 #, fuzzy
 msgid "end_x should be an int"
 msgstr "y ay dapat int"
@@ -2889,95 +2886,99 @@ msgstr ""
 "Ang reset button ay pinindot habang nag boot ang CircuitPython. Pindutin "
 "ulit para lumabas sa safe mode.\n"
 
-#, fuzzy
-#~ msgid "Group must have %q at least 1"
-#~ msgstr "Group dapat ay hindi baba sa 1 na haba"
+#~ msgid "busio.UART not available"
+#~ msgstr "busio.UART hindi available"
 
-#, fuzzy
-#~ msgid "palette must be displayio.Palette"
-#~ msgstr "ang palette ay dapat 32 bytes ang haba"
+#~ msgid "Can not apply advertisement data. status: 0x%02x"
+#~ msgstr "Hindi ma i-apply ang advertisement data. status: 0x%02x"
 
-#~ msgid "Invalid UUID parameter"
-#~ msgstr "Mali ang UUID parameter"
+#~ msgid ""
+#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
+#~ msgstr ""
+#~ "Mag-file ng isang isyu dito gamit ang mga nilalaman ng iyong CIRCUITPY "
+#~ "drive:\n"
 
-#~ msgid "row buffer must be a bytearray or array of type 'b' or 'B'"
-#~ msgstr "ang row buffer ay dapat bytearray o array na type ‘b’ or ‘B’"
+#~ msgid "Cannot set PPCP parameters."
+#~ msgstr "Hindi ma-set ang PPCP parameters."
 
-#~ msgid "row data must be a buffer"
-#~ msgstr "row data ay dapat na buffer"
+#~ msgid "Can not apply device name in the stack."
+#~ msgstr "Hindi maaaring ma-aplay ang device name sa stack."
 
-#, fuzzy
-#~ msgid "unicode_characters must be a string"
-#~ msgstr "ang keywords dapat strings"
+#~ msgid "Cannot apply GAP parameters."
+#~ msgstr "Hindi ma-apply ang GAP parameters."
 
-#~ msgid "index must be int"
-#~ msgstr "index ay dapat int"
+#~ msgid "Wrong number of bytes provided"
+#~ msgstr "Mali ang bilang ng bytes"
 
-#~ msgid "Can not query for the device address."
-#~ msgstr "Hindi maaaring mag-query para sa address ng device."
+#~ msgid "Can not encode UUID, to check length."
+#~ msgstr "Hindi ma-encode UUID, para suriin ang haba."
 
-#~ msgid "All PWM peripherals are in use"
-#~ msgstr "Lahat ng PWM peripherals ay ginagamit"
+#, fuzzy
+#~ msgid "unpack requires a buffer of %d bytes"
+#~ msgstr "Nabigong ilaan ang RX buffer ng %d bytes"
 
-#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
+#~ msgid ""
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY).\n"
 #~ msgstr ""
-#~ "Mukhang ang core CircuitPython code ay nag-crash ng malakas. Aray!\n"
+#~ "ay nagbibigay ng sapat na power para sa buong circuit at i-press ang "
+#~ "reset (pagkatapos i-eject ang CIRCUITPY).\n"
 
-#~ msgid "Group empty"
-#~ msgstr "Walang laman ang group"
+#~ msgid "displayio is a work in progress"
+#~ msgstr "displayio ay nasa gitna ng konstruksiyon"
 
-#~ msgid "Wrong address length"
-#~ msgstr "Mali ang address length"
+#~ msgid "Can not add Service."
+#~ msgstr "Hindi maidaragdag ang serbisyo."
 
-#~ msgid "Can encode UUID into the advertisement packet."
-#~ msgstr "Maaring i-encode ang UUID sa advertisement packet."
+#~ msgid "Invalid UUID string length"
+#~ msgstr "Mali ang UUID string length"
 
 #~ msgid "Invalid Service type"
 #~ msgstr "Mali ang tipo ng serbisyo"
 
-#~ msgid "Invalid UUID string length"
-#~ msgstr "Mali ang UUID string length"
+#~ msgid "Can encode UUID into the advertisement packet."
+#~ msgstr "Maaring i-encode ang UUID sa advertisement packet."
 
-#~ msgid "Can not add Service."
-#~ msgstr "Hindi maidaragdag ang serbisyo."
+#~ msgid "Wrong address length"
+#~ msgstr "Mali ang address length"
 
-#~ msgid "displayio is a work in progress"
-#~ msgstr "displayio ay nasa gitna ng konstruksiyon"
+#~ msgid "Group empty"
+#~ msgstr "Walang laman ang group"
 
-#~ msgid ""
-#~ "enough power for the whole circuit and press reset (after ejecting "
-#~ "CIRCUITPY).\n"
+#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
 #~ msgstr ""
-#~ "ay nagbibigay ng sapat na power para sa buong circuit at i-press ang "
-#~ "reset (pagkatapos i-eject ang CIRCUITPY).\n"
+#~ "Mukhang ang core CircuitPython code ay nag-crash ng malakas. Aray!\n"
 
-#, fuzzy
-#~ msgid "unpack requires a buffer of %d bytes"
-#~ msgstr "Nabigong ilaan ang RX buffer ng %d bytes"
+#~ msgid "All PWM peripherals are in use"
+#~ msgstr "Lahat ng PWM peripherals ay ginagamit"
 
-#~ msgid "Can not encode UUID, to check length."
-#~ msgstr "Hindi ma-encode UUID, para suriin ang haba."
+#~ msgid "Can not query for the device address."
+#~ msgstr "Hindi maaaring mag-query para sa address ng device."
 
-#~ msgid "Wrong number of bytes provided"
-#~ msgstr "Mali ang bilang ng bytes"
+#~ msgid "index must be int"
+#~ msgstr "index ay dapat int"
 
-#~ msgid "Cannot apply GAP parameters."
-#~ msgstr "Hindi ma-apply ang GAP parameters."
+#, fuzzy
+#~ msgid "unicode_characters must be a string"
+#~ msgstr "ang keywords dapat strings"
 
-#~ msgid "Can not apply device name in the stack."
-#~ msgstr "Hindi maaaring ma-aplay ang device name sa stack."
+#~ msgid "row data must be a buffer"
+#~ msgstr "row data ay dapat na buffer"
 
-#~ msgid "Cannot set PPCP parameters."
-#~ msgstr "Hindi ma-set ang PPCP parameters."
+#~ msgid "row buffer must be a bytearray or array of type 'b' or 'B'"
+#~ msgstr "ang row buffer ay dapat bytearray o array na type ‘b’ or ‘B’"
 
-#~ msgid ""
-#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
-#~ msgstr ""
-#~ "Mag-file ng isang isyu dito gamit ang mga nilalaman ng iyong CIRCUITPY "
-#~ "drive:\n"
+#~ msgid "Invalid UUID parameter"
+#~ msgstr "Mali ang UUID parameter"
 
-#~ msgid "Can not apply advertisement data. status: 0x%02x"
-#~ msgstr "Hindi ma i-apply ang advertisement data. status: 0x%02x"
+#, fuzzy
+#~ msgid "palette must be displayio.Palette"
+#~ msgstr "ang palette ay dapat 32 bytes ang haba"
 
-#~ msgid "busio.UART not available"
-#~ msgstr "busio.UART hindi available"
+#, fuzzy
+#~ msgid "Group must have %q at least 1"
+#~ msgstr "Group dapat ay hindi baba sa 1 na haba"
+
+#, fuzzy
+#~ msgid "buffer_size must be >= 1"
+#~ msgstr "aarehas na haba dapat ang buffer slices"
diff --git a/locale/fr.po b/locale/fr.po
index 674ef675e..43c808af8 100644
--- 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-02-12 22:32-0500\n"
+"POT-Creation-Date: 2019-02-15 08:46-0500\n"
 "PO-Revision-Date: 2018-12-23 20:05+0100\n"
 "Last-Translator: Pierrick Couturier <arofarn@arofarn.info>\n"
 "Language-Team: fr\n"
@@ -154,7 +154,7 @@ msgstr "compilation de script non supporté"
 msgid " output:\n"
 msgstr " sortie:\n"
 
-#: main.c:166 main.c:247
+#: main.c:166 main.c:250
 msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
@@ -166,7 +166,7 @@ msgstr ""
 msgid "Running in safe mode! Auto-reload is off.\n"
 msgstr "Mode sans-échec. Auto-rechargement désactivé.\n"
 
-#: main.c:170 main.c:249
+#: main.c:170 main.c:252
 msgid "Auto-reload is off.\n"
 msgstr "Auto-rechargement désactivé.\n"
 
@@ -178,17 +178,17 @@ msgstr "Mode sans-échec! Le code sauvegardé ne s'éxecute pas.\n"
 msgid "WARNING: Your code filename has two extensions\n"
 msgstr "ATTENTION: le nom de fichier de votre code a deux extensions\n"
 
-#: main.c:221
+#: main.c:223
 msgid ""
 "\n"
 "Code done running. Waiting for reload.\n"
 msgstr ""
 
-#: main.c:254
+#: main.c:257
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr "Appuyez sur une touche pour entrer sur REPL ou CTRL-D pour recharger."
 
-#: main.c:419
+#: main.c:422
 msgid "soft reboot\n"
 msgstr "redémarrage logiciel\n"
 
@@ -354,12 +354,12 @@ msgstr "Echec de l'allocation du tampon RX"
 msgid "Could not initialize UART"
 msgstr "L'UART n'a pu être initialisé"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:241
+#: ports/atmel-samd/common-hal/busio/UART.c:252
 #: ports/nrf/common-hal/busio/UART.c:230
 msgid "No RX pin"
 msgstr "Pas de broche RX"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:300
+#: ports/atmel-samd/common-hal/busio/UART.c:311
 #: ports/nrf/common-hal/busio/UART.c:265
 msgid "No TX pin"
 msgstr "Pas de broche TX"
@@ -2258,8 +2258,11 @@ msgid "timeout must be >= 0.0"
 msgstr "les bits doivent être 8"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:79
+#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
+#: shared-bindings/displayio/Group.c:100 shared-bindings/displayio/Shape.c:69
+#: shared-bindings/displayio/Shape.c:73
 #, fuzzy
-msgid "buffer_size must be >= 1"
+msgid "%q must be >= 1"
 msgstr "les slices de tampon doivent être de longueurs égales"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:83
@@ -2423,12 +2426,6 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr "Les octets 'bytes' doivent être entre 0 et 255"
 
-#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
-#: shared-bindings/displayio/Group.c:100
-#, fuzzy
-msgid "%q must be >= 1"
-msgstr "les slices de tampon doivent être de longueurs égales"
-
 #: shared-bindings/displayio/Palette.c:91
 #, fuzzy
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
@@ -2455,17 +2452,17 @@ msgstr "le tampon de couleur doit être un tampon ou un entier"
 msgid "palette_index should be an int"
 msgstr "palette_index devrait être un entier (int)'"
 
-#: shared-bindings/displayio/Shape.c:88
+#: shared-bindings/displayio/Shape.c:97
 #, fuzzy
 msgid "y should be an int"
 msgstr "y doit être un entier (int)"
 
-#: shared-bindings/displayio/Shape.c:92
+#: shared-bindings/displayio/Shape.c:101
 #, fuzzy
 msgid "start_x should be an int"
 msgstr "y doit être un entier (int)"
 
-#: shared-bindings/displayio/Shape.c:96
+#: shared-bindings/displayio/Shape.c:105
 #, fuzzy
 msgid "end_x should be an int"
 msgstr "y doit être un entier (int)"
@@ -2912,101 +2909,105 @@ msgstr ""
 "Appuyer denouveau pour quitter de le mode sans-échec.\n"
 
 #, fuzzy
-#~ msgid "Group must have %q at least 1"
-#~ msgstr "Le tampon doit être de longueur au moins 1"
+#~ msgid "busio.UART not available"
+#~ msgstr "busio.UART n'est pas disponible"
 
-#~ msgid "Cannot set PPCP parameters."
-#~ msgstr "Impossible d'appliquer les paramètres PPCP"
+#~ msgid "Can not query for the device address."
+#~ msgstr "Impossible d'obtenir l'adresse du périphérique"
 
-#~ msgid "Invalid UUID parameter"
-#~ msgstr "Paramètre UUID invalide"
+#~ msgid "Can not encode UUID, to check length."
+#~ msgstr "Impossible d'encoder l'UUID pour vérifier la longueur."
 
-#, fuzzy
-#~ msgid "row buffer must be a bytearray or array of type 'b' or 'B'"
+#~ msgid "Cannot apply GAP parameters."
+#~ msgstr "Impossible d'appliquer les paramètres GAP"
+
+#~ msgid ""
+#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
 #~ msgstr ""
-#~ "le tampon de ligne doit être un bytearray ou un tableau de type 'b' ou 'B'"
+#~ "SVP, remontez le problème là avec le contenu du lecteur CIRCUITPY:\n"
 
-#, fuzzy
-#~ msgid "row data must be a buffer"
-#~ msgstr "les données de ligne doivent être un tampon"
+#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
+#~ msgstr ""
+#~ "Il semblerait que votre code CircuitPython a durement planté. Oups!\n"
 
 #, fuzzy
-#~ msgid "unicode_characters must be a string"
-#~ msgstr "les noms doivent être des chaînes de caractère"
-
-#~ msgid "index must be int"
-#~ msgstr "l'index doit être un entier"
+#~ msgid "Wrong number of bytes provided"
+#~ msgstr "mauvais nombre d'octets fourni'"
 
-#, fuzzy
-#~ msgid "palette must be displayio.Palette"
-#~ msgstr "la palette doit être une displayio.Palette"
+#~ msgid ""
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY).\n"
+#~ msgstr ""
+#~ "assez de puissance pour l'ensemble du circuit et appuyez sur "
+#~ "'reset' (après avoir éjecter CIRCUITPY).\n"
 
 #, fuzzy
-#~ msgid "All PWM peripherals are in use"
-#~ msgstr "Tous les périphériques PWM sont utilisés"
+#~ msgid "unpack requires a buffer of %d bytes"
+#~ msgstr "Echec de l'allocation de %d octets du tampon RX"
 
-#, fuzzy
-#~ msgid "value_size must be power of two"
-#~ msgstr "value_size doit être une puissance de 2"
+#~ msgid "Invalid Service type"
+#~ msgstr "Type de service invalide"
 
-#, fuzzy
-#~ msgid "Group empty"
-#~ msgstr "Groupe vide"
+#~ msgid "displayio is a work in progress"
+#~ msgstr "displayio est en cours de développement"
 
-#~ msgid "Wrong address length"
-#~ msgstr "Mauvaise longueur d'adresse"
+#~ msgid "Can not apply device name in the stack."
+#~ msgstr "Impossible d'appliquer le nom de périphérique dans la pile"
 
-#~ msgid "Can not add Service."
-#~ msgstr "Impossible d'ajouter le Service"
+#~ msgid "Invalid UUID string length"
+#~ msgstr "Longeur de chaîne UUID invalide"
 
 #~ msgid "Can not add Characteristic."
 #~ msgstr "Impossible d'ajouter la Characteristic."
 
-#~ msgid "Invalid UUID string length"
-#~ msgstr "Longeur de chaîne UUID invalide"
+#~ msgid "Can not add Service."
+#~ msgstr "Impossible d'ajouter le Service"
 
-#~ msgid "Can not apply device name in the stack."
-#~ msgstr "Impossible d'appliquer le nom de périphérique dans la pile"
+#~ msgid "Wrong address length"
+#~ msgstr "Mauvaise longueur d'adresse"
 
-#~ msgid "displayio is a work in progress"
-#~ msgstr "displayio est en cours de développement"
+#, fuzzy
+#~ msgid "Group empty"
+#~ msgstr "Groupe vide"
 
-#~ msgid "Invalid Service type"
-#~ msgstr "Type de service invalide"
+#, fuzzy
+#~ msgid "value_size must be power of two"
+#~ msgstr "value_size doit être une puissance de 2"
 
 #, fuzzy
-#~ msgid "unpack requires a buffer of %d bytes"
-#~ msgstr "Echec de l'allocation de %d octets du tampon RX"
+#~ msgid "All PWM peripherals are in use"
+#~ msgstr "Tous les périphériques PWM sont utilisés"
 
-#~ msgid ""
-#~ "enough power for the whole circuit and press reset (after ejecting "
-#~ "CIRCUITPY).\n"
-#~ msgstr ""
-#~ "assez de puissance pour l'ensemble du circuit et appuyez sur "
-#~ "'reset' (après avoir éjecter CIRCUITPY).\n"
+#, fuzzy
+#~ msgid "palette must be displayio.Palette"
+#~ msgstr "la palette doit être une displayio.Palette"
+
+#~ msgid "index must be int"
+#~ msgstr "l'index doit être un entier"
 
 #, fuzzy
-#~ msgid "Wrong number of bytes provided"
-#~ msgstr "mauvais nombre d'octets fourni'"
+#~ msgid "unicode_characters must be a string"
+#~ msgstr "les noms doivent être des chaînes de caractère"
 
-#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
-#~ msgstr ""
-#~ "Il semblerait que votre code CircuitPython a durement planté. Oups!\n"
+#, fuzzy
+#~ msgid "row data must be a buffer"
+#~ msgstr "les données de ligne doivent être un tampon"
 
-#~ msgid ""
-#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
+#, fuzzy
+#~ msgid "row buffer must be a bytearray or array of type 'b' or 'B'"
 #~ msgstr ""
-#~ "SVP, remontez le problème là avec le contenu du lecteur CIRCUITPY:\n"
+#~ "le tampon de ligne doit être un bytearray ou un tableau de type 'b' ou 'B'"
 
-#~ msgid "Cannot apply GAP parameters."
-#~ msgstr "Impossible d'appliquer les paramètres GAP"
+#~ msgid "Invalid UUID parameter"
+#~ msgstr "Paramètre UUID invalide"
 
-#~ msgid "Can not encode UUID, to check length."
-#~ msgstr "Impossible d'encoder l'UUID pour vérifier la longueur."
+#~ msgid "Cannot set PPCP parameters."
+#~ msgstr "Impossible d'appliquer les paramètres PPCP"
 
-#~ msgid "Can not query for the device address."
-#~ msgstr "Impossible d'obtenir l'adresse du périphérique"
+#, fuzzy
+#~ msgid "Group must have %q at least 1"
+#~ msgstr "Le tampon doit être de longueur au moins 1"
 
 #, fuzzy
-#~ msgid "busio.UART not available"
-#~ msgstr "busio.UART n'est pas disponible"
+#~ msgid "buffer_size must be >= 1"
+#~ msgstr "les slices de tampon doivent être de longueurs égales"
diff --git a/locale/it_IT.po b/locale/it_IT.po
index 4b797418e..ae7030155 100644
--- 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-02-12 22:32-0500\n"
+"POT-Creation-Date: 2019-02-15 08:46-0500\n"
 "PO-Revision-Date: 2018-10-02 16:27+0200\n"
 "Last-Translator: Enrico Paganin <enrico.paganin@mail.com>\n"
 "Language-Team: \n"
@@ -155,7 +155,7 @@ msgstr "compilazione dello scrip non suportata"
 msgid " output:\n"
 msgstr " output:\n"
 
-#: main.c:166 main.c:247
+#: main.c:166 main.c:250
 msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
@@ -167,7 +167,7 @@ msgstr ""
 msgid "Running in safe mode! Auto-reload is off.\n"
 msgstr "Modalità sicura in esecuzione! Auto-reload disattivato.\n"
 
-#: main.c:170 main.c:249
+#: main.c:170 main.c:252
 msgid "Auto-reload is off.\n"
 msgstr "Auto-reload disattivato.\n"
 
@@ -179,18 +179,18 @@ msgstr "Modalità sicura in esecuzione! Codice salvato non in esecuzione.\n"
 msgid "WARNING: Your code filename has two extensions\n"
 msgstr "ATTENZIONE: Il nome del sorgente ha due estensioni\n"
 
-#: main.c:221
+#: main.c:223
 msgid ""
 "\n"
 "Code done running. Waiting for reload.\n"
 msgstr ""
 
-#: main.c:254
+#: main.c:257
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
 "Premi un qualunque tasto per entrare nel REPL. Usa CTRL-D per ricaricare."
 
-#: main.c:419
+#: main.c:422
 msgid "soft reboot\n"
 msgstr "soft reboot\n"
 
@@ -358,12 +358,12 @@ msgstr "Impossibile allocare buffer RX"
 msgid "Could not initialize UART"
 msgstr "Impossibile inizializzare l'UART"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:241
+#: ports/atmel-samd/common-hal/busio/UART.c:252
 #: ports/nrf/common-hal/busio/UART.c:230
 msgid "No RX pin"
 msgstr "Nessun pin RX"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:300
+#: ports/atmel-samd/common-hal/busio/UART.c:311
 #: ports/nrf/common-hal/busio/UART.c:265
 msgid "No TX pin"
 msgstr "Nessun pin TX"
@@ -2255,8 +2255,11 @@ msgid "timeout must be >= 0.0"
 msgstr "i bit devono essere 8"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:79
+#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
+#: shared-bindings/displayio/Group.c:100 shared-bindings/displayio/Shape.c:69
+#: shared-bindings/displayio/Shape.c:73
 #, fuzzy
-msgid "buffer_size must be >= 1"
+msgid "%q must be >= 1"
 msgstr "slice del buffer devono essere della stessa lunghezza"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:83
@@ -2419,12 +2422,6 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr "I byte devono essere compresi tra 0 e 255"
 
-#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
-#: shared-bindings/displayio/Group.c:100
-#, fuzzy
-msgid "%q must be >= 1"
-msgstr "slice del buffer devono essere della stessa lunghezza"
-
 #: shared-bindings/displayio/Palette.c:91
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
 msgstr ""
@@ -2448,16 +2445,16 @@ msgstr "il buffer del colore deve essere un buffer o un int"
 msgid "palette_index should be an int"
 msgstr "palette_index deve essere un int"
 
-#: shared-bindings/displayio/Shape.c:88
+#: shared-bindings/displayio/Shape.c:97
 msgid "y should be an int"
 msgstr "y dovrebbe essere un int"
 
-#: shared-bindings/displayio/Shape.c:92
+#: shared-bindings/displayio/Shape.c:101
 #, fuzzy
 msgid "start_x should be an int"
 msgstr "y dovrebbe essere un int"
 
-#: shared-bindings/displayio/Shape.c:96
+#: shared-bindings/displayio/Shape.c:105
 #, fuzzy
 msgid "end_x should be an int"
 msgstr "y dovrebbe essere un int"
@@ -2885,93 +2882,97 @@ msgid ""
 "exit safe mode.\n"
 msgstr ""
 
-#~ msgid "row data must be a buffer"
-#~ msgstr "valori della riga devono essere un buffer"
-
 #, fuzzy
-#~ msgid "Group must have %q at least 1"
-#~ msgstr "Il gruppo deve avere dimensione almeno 1"
-
-#~ msgid "Invalid UUID parameter"
-#~ msgstr "Parametro UUID non valido"
+#~ msgid "busio.UART not available"
+#~ msgstr "busio.UART non ancora implementato"
 
-#~ msgid "Group empty"
-#~ msgstr "Gruppo vuoto"
+#~ msgid "Can not encode UUID, to check length."
+#~ msgstr "Non è possibile codificare l'UUID, lunghezza da controllare."
 
 #, fuzzy
-#~ msgid "All PWM peripherals are in use"
-#~ msgstr "Tutte le periferiche SPI sono in uso"
+#~ msgid "unpack requires a buffer of %d bytes"
+#~ msgstr "Fallita allocazione del buffer RX di %d byte"
 
-#~ msgid "row buffer must be a bytearray or array of type 'b' or 'B'"
+#~ msgid "Invalid UUID string length"
+#~ msgstr "Lunghezza della stringa UUID non valida"
+
+#~ msgid ""
+#~ "enough power for the whole circuit and press reset (after ejecting "
+#~ "CIRCUITPY).\n"
 #~ msgstr ""
-#~ "buffer di riga deve essere un bytearray o un array di tipo 'b' o 'B'"
+#~ "abbastanza potenza per l'intero circuito e premere reset (dopo aver "
+#~ "espulso CIRCUITPY).\n"
 
-#, fuzzy
-#~ msgid "unicode_characters must be a string"
-#~ msgstr "argomenti nominati devono essere stringhe"
+#~ msgid "Can not add Service."
+#~ msgstr "Non è possibile aggiungere Service."
 
-#~ msgid "index must be int"
-#~ msgstr "l'indice deve essere int"
+#~ msgid "Can encode UUID into the advertisement packet."
+#~ msgstr "È possibile codificare l'UUID nel pacchetto di advertisement."
 
-#~ msgid "Invalid Service type"
-#~ msgstr "Tipo di servizio non valido"
+#~ msgid "Can not apply device name in the stack."
+#~ msgstr "Non è possibile inserire il nome del dipositivo nella lista."
 
-#, fuzzy
-#~ msgid "Wrong number of bytes provided"
-#~ msgstr "numero di argomenti errato"
+#~ msgid "Cannot set PPCP parameters."
+#~ msgstr "Impossibile impostare i parametri PPCP."
 
-#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
+#~ msgid "Can not query for the device address."
+#~ msgstr "Non è possibile trovare l'indirizzo del dispositivo."
+
+#~ msgid ""
+#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
 #~ msgstr ""
-#~ "Sembra che il codice del core di CircuitPython sia crashato malamente. "
-#~ "Whoops!\n"
+#~ "Ti preghiamo di compilare una issue con il contenuto del tuo drie "
+#~ "CIRCUITPY:\n"
 
-#~ msgid "Can not add Characteristic."
-#~ msgstr "Non è possibile aggiungere Characteristic."
+#~ msgid "Can not apply advertisement data. status: 0x%02x"
+#~ msgstr "Impossible inserire dati advertisement. status: 0x%02x"
 
 #~ msgid "Cannot apply GAP parameters."
 #~ msgstr "Impossibile applicare i parametri GAP."
 
-#~ msgid "Can not apply advertisement data. status: 0x%02x"
-#~ msgstr "Impossible inserire dati advertisement. status: 0x%02x"
+#~ msgid "Can not add Characteristic."
+#~ msgstr "Non è possibile aggiungere Characteristic."
 
-#~ msgid ""
-#~ "Please file an issue here with the contents of your CIRCUITPY drive:\n"
+#~ msgid "Looks like our core CircuitPython code crashed hard. Whoops!\n"
 #~ msgstr ""
-#~ "Ti preghiamo di compilare una issue con il contenuto del tuo drie "
-#~ "CIRCUITPY:\n"
-
-#~ msgid "Can not query for the device address."
-#~ msgstr "Non è possibile trovare l'indirizzo del dispositivo."
+#~ "Sembra che il codice del core di CircuitPython sia crashato malamente. "
+#~ "Whoops!\n"
 
-#~ msgid "Cannot set PPCP parameters."
-#~ msgstr "Impossibile impostare i parametri PPCP."
+#, fuzzy
+#~ msgid "Wrong number of bytes provided"
+#~ msgstr "numero di argomenti errato"
 
-#~ msgid "Can not apply device name in the stack."
-#~ msgstr "Non è possibile inserire il nome del dipositivo nella lista."
+#~ msgid "Invalid Service type"
+#~ msgstr "Tipo di servizio non valido"
 
-#~ msgid "Can encode UUID into the advertisement packet."
-#~ msgstr "È possibile codificare l'UUID nel pacchetto di advertisement."
+#~ msgid "index must be int"
+#~ msgstr "l'indice deve essere int"
 
-#~ msgid "Can not add Service."
-#~ msgstr "Non è possibile aggiungere Service."
+#, fuzzy
+#~ msgid "unicode_characters must be a string"
+#~ msgstr "argomenti nominati devono essere stringhe"
 
-#~ msgid ""
-#~ "enough power for the whole circuit and press reset (after ejecting "
-#~ "CIRCUITPY).\n"
+#~ msgid "row buffer must be a bytearray or array of type 'b' or 'B'"
 #~ msgstr ""
-#~ "abbastanza potenza per l'intero circuito e premere reset (dopo aver "
-#~ "espulso CIRCUITPY).\n"
+#~ "buffer di riga deve essere un bytearray o un array di tipo 'b' o 'B'"
 
-#~ msgid "Invalid UUID string length"
-#~ msgstr "Lunghezza della stringa UUID non valida"
+#, fuzzy
+#~ msgid "All PWM peripherals are in use"
+#~ msgstr "Tutte le periferiche SPI sono in uso"
+
+#~ msgid "Group empty"
+#~ msgstr "Gruppo vuoto"
+
+#~ msgid "Invalid UUID parameter"
+#~ msgstr "Parametro UUID non valido"
 
 #, fuzzy
-#~ msgid "unpack requires a buffer of %d bytes"
-#~ msgstr "Fallita allocazione del buffer RX di %d byte"
+#~ msgid "Group must have %q at least 1"
+#~ msgstr "Il gruppo deve avere dimensione almeno 1"
 
-#~ msgid "Can not encode UUID, to check length."
-#~ msgstr "Non è possibile codificare l'UUID, lunghezza da controllare."
+#~ msgid "row data must be a buffer"
+#~ msgstr "valori della riga devono essere un buffer"
 
 #, fuzzy
-#~ msgid "busio.UART not available"
-#~ msgstr "busio.UART non ancora implementato"
+#~ msgid "buffer_size must be >= 1"
+#~ msgstr "slice del buffer devono essere della stessa lunghezza"
diff --git a/locale/pt_BR.po b/locale/pt_BR.po
index 23a504f95..8790ed20d 100644
--- 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-02-12 22:32-0500\n"
+"POT-Creation-Date: 2019-02-15 08:46-0500\n"
 "PO-Revision-Date: 2018-10-02 21:14-0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -155,7 +155,7 @@ msgstr "compilação de script não suportada"
 msgid " output:\n"
 msgstr " saída:\n"
 
-#: main.c:166 main.c:247
+#: main.c:166 main.c:250
 msgid ""
 "Auto-reload is on. Simply save files over USB to run them or enter REPL to "
 "disable.\n"
@@ -165,7 +165,7 @@ msgstr ""
 msgid "Running in safe mode! Auto-reload is off.\n"
 msgstr "Rodando em modo seguro! Atualização automática está desligada.\n"
 
-#: main.c:170 main.c:249
+#: main.c:170 main.c:252
 msgid "Auto-reload is off.\n"
 msgstr "A atualização automática está desligada.\n"
 
@@ -177,17 +177,17 @@ msgstr "Rodando em modo seguro! Não está executando o código salvo.\n"
 msgid "WARNING: Your code filename has two extensions\n"
 msgstr "AVISO: Seu arquivo de código tem duas extensões\n"
 
-#: main.c:221
+#: main.c:223
 msgid ""
 "\n"
 "Code done running. Waiting for reload.\n"
 msgstr ""
 
-#: main.c:254
+#: main.c:257
 msgid "Press any key to enter the REPL. Use CTRL-D to reload."
 msgstr ""
 
-#: main.c:419
+#: main.c:422
 msgid "soft reboot\n"
 msgstr ""
 
@@ -353,12 +353,12 @@ msgstr "Falha ao alocar buffer RX"
 msgid "Could not initialize UART"
 msgstr "Não foi possível inicializar o UART"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:241
+#: ports/atmel-samd/common-hal/busio/UART.c:252
 #: ports/nrf/common-hal/busio/UART.c:230
 msgid "No RX pin"
 msgstr "Nenhum pino RX"
 
-#: ports/atmel-samd/common-hal/busio/UART.c:300
+#: ports/atmel-samd/common-hal/busio/UART.c:311
 #: ports/nrf/common-hal/busio/UART.c:265
 msgid "No TX pin"
 msgstr "Nenhum pino TX"
@@ -2222,8 +2222,11 @@ msgid "timeout must be >= 0.0"
 msgstr "bits devem ser 8"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:79
+#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
+#: shared-bindings/displayio/Group.c:100 shared-bindings/displayio/Shape.c:69
+#: shared-bindings/displayio/Shape.c:73
 #, fuzzy
-msgid "buffer_size must be >= 1"
+msgid "%q must be >= 1"
 msgstr "buffers devem ser o mesmo tamanho"
 
 #: shared-bindings/bleio/CharacteristicBuffer.c:83
@@ -2385,12 +2388,6 @@ msgstr ""
 msgid "Command must be an int between 0 and 255"
 msgstr "Os bytes devem estar entre 0 e 255."
 
-#: shared-bindings/displayio/Group.c:63 shared-bindings/displayio/Group.c:68
-#: shared-bindings/displayio/Group.c:100
-#, fuzzy
-msgid "%q must be >= 1"
-msgstr "buffers devem ser o mesmo tamanho"
-
 #: shared-bindings/displayio/Palette.c:91
 msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
 msgstr ""
@@ -2412,16 +2409,16 @@ msgstr ""
 msgid "palette_index should be an int"
 msgstr ""
 
-#: shared-bindings/displayio/Shape.c:88
+#: shared-bindings/displayio/Shape.c:97
 msgid "y should be an int"
 msgstr "y deve ser um int"
 
-#: shared-bindings/displayio/Shape.c:92
+#: shared-bindings/displayio/Shape.c:101
 #, fuzzy
 msgid "start_x should be an int"
 msgstr "y deve ser um int"
 
-#: shared-bindings/displayio/Shape.c:96
+#: shared-bindings/displayio/Shape.c:105
 #, fuzzy
 msgid "end_x should be an int"
 msgstr "y deve ser um int"
@@ -2834,57 +2831,61 @@ msgid ""
 "exit safe mode.\n"
 msgstr ""
 
-#~ msgid "index must be int"
-#~ msgstr "index deve ser int"
+#~ msgid "busio.UART not available"
+#~ msgstr "busio.UART não disponível"
 
 #, fuzzy
-#~ msgid "Group must have %q at least 1"
-#~ msgstr "Grupo deve ter tamanho pelo menos 1"
+#~ msgid "All PWM peripherals are in use"
+#~ msgstr "Todos os temporizadores em uso"
 
-#~ msgid "Group empty"
-#~ msgstr "Grupo vazio"
+#~ msgid "Can not add Characteristic."
+#~ msgstr "Não é possível adicionar Característica."
 
-#, fuzzy
-#~ msgid "unicode_characters must be a string"
-#~ msgstr "heap deve ser uma lista"
+#~ msgid "Can not apply advertisement data. status: 0x%02x"
+#~ msgstr "Não é possível aplicar dados de anúncio. status: 0x%02x"
 
-#~ msgid "Invalid UUID parameter"
-#~ msgstr "Parâmetro UUID inválido"
+#~ msgid "Cannot apply GAP parameters."
+#~ msgstr "Não é possível aplicar parâmetros GAP."
 
-#~ msgid "Baud rate too high for this SPI peripheral"
-#~ msgstr "Taxa de transmissão muito alta para esse periférico SPI"
+#~ msgid "Can not apply device name in the stack."
+#~ msgstr "Não é possível aplicar o nome do dispositivo na pilha."
 
-#~ msgid "Can encode UUID into the advertisement packet."
-#~ msgstr "Pode codificar o UUID no pacote de anúncios."
+#~ msgid "Cannot set PPCP parameters."
+#~ msgstr "Não é possível definir parâmetros PPCP."
 
-#, fuzzy
-#~ msgid "unpack requires a buffer of %d bytes"
-#~ msgstr "Falha ao alocar buffer RX de %d bytes"
+#~ msgid "Invalid Service type"
+#~ msgstr "Tipo de serviço inválido"
 
 #~ msgid "Can not query for the device address."
 #~ msgstr "Não é possível consultar o endereço do dispositivo."
 
-#~ msgid "Invalid Service type"
-#~ msgstr "Tipo de serviço inválido"
+#, fuzzy
+#~ msgid "unpack requires a buffer of %d bytes"
+#~ msgstr "Falha ao alocar buffer RX de %d bytes"
 
-#~ msgid "Cannot set PPCP parameters."
-#~ msgstr "Não é possível definir parâmetros PPCP."
+#~ msgid "Can encode UUID into the advertisement packet."
+#~ msgstr "Pode codificar o UUID no pacote de anúncios."
 
-#~ msgid "Can not apply device name in the stack."
-#~ msgstr "Não é possível aplicar o nome do dispositivo na pilha."
+#~ msgid "Baud rate too high for this SPI peripheral"
+#~ msgstr "Taxa de transmissão muito alta para esse periférico SPI"
 
-#~ msgid "Cannot apply GAP parameters."
-#~ msgstr "Não é possível aplicar parâmetros GAP."
+#~ msgid "Invalid UUID parameter"
+#~ msgstr "Parâmetro UUID inválido"
 
-#~ msgid "Can not apply advertisement data. status: 0x%02x"
-#~ msgstr "Não é possível aplicar dados de anúncio. status: 0x%02x"
+#, fuzzy
+#~ msgid "unicode_characters must be a string"
+#~ msgstr "heap deve ser uma lista"
 
-#~ msgid "Can not add Characteristic."
-#~ msgstr "Não é possível adicionar Característica."
+#~ msgid "Group empty"
+#~ msgstr "Grupo vazio"
 
 #, fuzzy
-#~ msgid "All PWM peripherals are in use"
-#~ msgstr "Todos os temporizadores em uso"
+#~ msgid "Group must have %q at least 1"
+#~ msgstr "Grupo deve ter tamanho pelo menos 1"
 
-#~ msgid "busio.UART not available"
-#~ msgstr "busio.UART não disponível"
+#~ msgid "index must be int"
+#~ msgstr "index deve ser int"
+
+#, fuzzy
+#~ msgid "buffer_size must be >= 1"
+#~ msgstr "buffers devem ser o mesmo tamanho"
diff --git a/ports/atmel-samd/Makefile b/ports/atmel-samd/Makefile
index 93bef872f..5a43468ee 100644
--- a/ports/atmel-samd/Makefile
+++ b/ports/atmel-samd/Makefile
@@ -303,7 +303,7 @@ SRC_C = \
 	tick.c \
 
 ifeq ($(CIRCUITPY_NETWORK),1)
-CFLAGS += -DCIRCUITPY_NETWORK=1 -DMICROPY_PY_NETWORK=1
+CFLAGS += -DMICROPY_PY_NETWORK=1
 
 SRC_MOD += lib/netutils/netutils.c
 
@@ -323,105 +323,111 @@ endif # MICROPY_PY_WIZNET5K
 endif # CIRCUITPY_NETWORK
 
 ifeq ($(CIRCUITPY_ANALOGIO),1)
-SRC_DIRS += analogio/
+SRC_PATTERNS += analogio/%
 endif
 ifeq ($(CIRCUITPY_AUDIOBUSIO),1)
-SRC_DIRS += audiobusio/
+SRC_PATTERNS += audiobusio/%
+endif
+ifeq ($(CIRCUITPY_AUDIOIO),1)
+SRC_PATTERNS += audioio/%
 endif
 ifeq ($(CIRCUITPY_BITBANGIO),1)
-SRC_DIRS += bitbangio/
+SRC_PATTERNS += bitbangio/%
 endif
 ifeq ($(CIRCUITPY_BOARD),1)
-SRC_DIRS += board/
+SRC_PATTERNS += board/%
 endif
 ifeq ($(CIRCUITPY_BUSIO),1)
-SRC_DIRS += busio/ bitbangio/OneWire
+SRC_PATTERNS += busio/% bitbangio/OneWire.%
 endif
 ifeq ($(CIRCUITPY_DIGITALIO),1)
-SRC_DIRS += digitalio/
+SRC_PATTERNS += digitalio/%
 endif
 ifeq ($(CIRCUITPY_DISPLAYIO),1)
-SRC_DIRS += displayio/
+SRC_PATTERNS += displayio/% terminalio/%
 endif
 ifeq ($(CIRCUITPY_GAMEPAD),1)
-SRC_DIRS += gamepad/
+SRC_PATTERNS += gamepad/%
 endif
 ifeq ($(CIRCUITPY_I2CSLAVE),1)
-SRC_DIRS += i2cslave/
+SRC_PATTERNS += i2cslave/%
 endif
 ifeq ($(CIRCUITPY_MATH),1)
-SRC_DIRS += math/
+SRC_PATTERNS += math/%
 endif
 ifeq ($(CIRCUITPY_MICROCONTROLLER),1)
-SRC_DIRS += microcontroller/
+SRC_PATTERNS += microcontroller/%
 endif
 ifeq ($(CIRCUITPY_NEOPIXEL_WRITE),1)
-SRC_DIRS += neopixel_write/
+SRC_PATTERNS += neopixel_write/%
 endif
 ifeq ($(CIRCUITPY_NETWORK),1)
-SRC_DIRS += network/
+SRC_PATTERNS += network/% socket/%
 endif
 ifeq ($(CIRCUITPY_NVM),1)
-SRC_DIRS += nvm/
+SRC_PATTERNS += nvm/%
 endif
 ifeq ($(CIRCUITPY_OS),1)
-SRC_DIRS += os/
+SRC_PATTERNS += os/%
 endif
 ifeq ($(CIRCUITPY_PIXELBUF),1)
-SRC_DIRS += _pixelbuf/
+SRC_PATTERNS += _pixelbuf/%
 endif
 ifeq ($(CIRCUITPY_PULSEIO),1)
-SRC_DIRS += pulseio/
+SRC_PATTERNS += pulseio/%
 endif
 ifeq ($(CIRCUITPY_RANDOM),1)
-SRC_DIRS += random/
+SRC_PATTERNS += random/%
 endif
 ifeq ($(CIRCUITPY_ROTARYIO),1)
-SRC_DIRS += rotaryio/
+SRC_PATTERNS += rotaryio/%
 endif
 ifeq ($(CIRCUITPY_RTC),1)
-SRC_DIRS += rtc/
+SRC_PATTERNS += rtc/%
 endif
 ifeq ($(CIRCUITPY_SAMD),1)
-SRC_DIRS += samd/
+SRC_PATTERNS += samd/%
 endif
 ifeq ($(CIRCUITPY_STAGE),1)
-SRC_DIRS += _stage/
+SRC_PATTERNS += _stage/%
 endif
 ifeq ($(CIRCUITPY_STORAGE),1)
-SRC_DIRS += storage/
+SRC_PATTERNS += storage/%
 endif
 ifeq ($(CIRCUITPY_STRUCT),1)
-SRC_DIRS += struct/
+SRC_PATTERNS += struct/%
 endif
 ifeq ($(CIRCUITPY_SUPERVISOR),1)
-SRC_DIRS += supervisor/
+SRC_PATTERNS += supervisor/%
 endif
 ifeq ($(CIRCUITPY_TIME),1)
-SRC_DIRS += time/
+SRC_PATTERNS += time/%
 endif
 ifeq ($(CIRCUITPY_TOUCHIO),1)
-SRC_DIRS += touchio/
+SRC_PATTERNS += touchio/%
 endif
 ifeq ($(CIRCUITPY_UHEAP),1)
-SRC_DIRS += uheap/
+SRC_PATTERNS += uheap/%
 endif
 ifeq ($(CIRCUITPY_USB_HID),1)
-SRC_DIRS += usb_hid/
+SRC_PATTERNS += usb_hid/%
 endif
 ifeq ($(CIRCUITPY_USB_MIDI),1)
-SRC_DIRS += usb_midi/
+SRC_PATTERNS += usb_midi/%
 endif
 ifeq ($(CIRCUITPY_USTACK),1)
-SRC_DIRS += ustack/
+SRC_PATTERNS += ustack/%
 endif
 
-# All possible sources are listed here, and are filtered by SRC_DIRS.
+# All possible sources are listed here, and are filtered by SRC_PATTERNS.
 SRC_COMMON_HAL = \
-$(filter $(patsubst %,%%,$(SRC_DIRS)), \
+$(filter $(SRC_PATTERNS), \
 	analogio/AnalogIn.c \
 	analogio/AnalogOut.c \
 	analogio/__init__.c \
+	audiobusio/__init__.c \
+	audiobusio/I2SOut.c \
+	audiobusio/PDMIn.c \
 	audioio/__init__.c \
 	audioio/AudioOut.c \
 	board/__init__.c \
@@ -458,9 +464,9 @@ $(filter $(patsubst %,%%,$(SRC_DIRS)), \
 
 # These don't have corresponding files in each port but are still located in
 # shared-bindings to make it clear what the contents of the modules are.
-# All possible sources are listed here, and are filtered by SRC_DIRS.
+# All possible sources are listed here, and are filtered by SRC_PATTERNS.
 SRC_BINDINGS_ENUMS = \
-$(filter $(patsubst %,%%,$(SRC_DIRS)), \
+$(filter $(SRC_PATTERNS), \
 	digitalio/Direction.c \
 	digitalio/DriveMode.c \
 	digitalio/Pull.c \
@@ -474,17 +480,14 @@ SRC_BINDINGS_ENUMS += \
 	help.c \
 	util.c
 
-# All possible sources are listed here, and are filtered by SRC_DIRS.
+# All possible sources are listed here, and are filtered by SRC_PATTERNS.
 SRC_SHARED_MODULE = \
-$(filter $(patsubst %,%%,$(SRC_DIRS)), \
+$(filter $(SRC_PATTERNS), \
 	_pixelbuf/PixelBuf.c \
 	_pixelbuf/__init__.c \
 	_stage/Layer.c \
 	_stage/Text.c \
 	_stage/__init__.c \
-	audiobusio/__init__.c \
-	audiobusio/I2SOut.c \
-	audiobusio/PDMIn.c \
 	audioio/__init__.c \
 	audioio/Mixer.c \
 	audioio/RawSample.c \
@@ -594,3 +597,8 @@ $(BUILD)/firmware.uf2: $(BUILD)/firmware.bin
 	$(Q)$(PYTHON3) $(TOP)/tools/uf2/utils/uf2conv.py -b $(BOOTLOADER_SIZE) -c -o $@ $^
 
 include $(TOP)/py/mkrules.mk
+
+# Print out the value of a make variable.
+# https://stackoverflow.com/questions/16467718/how-to-print-out-a-variable-in-makefile
+print-%:
+	@echo $* = $($*)
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
index 6d926778e..e6a7e0676 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h
@@ -46,5 +46,3 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
-
-#define CIRCUITPY_DISPLAYIO (0)
diff --git a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
index f701ef173..aacffffe0 100644
--- a/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.mk
@@ -9,6 +9,9 @@ EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
 
+# Make room for frozen libs.
+CIRCUITPY_DISPLAYIO = 0
+
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
index b13fcbb67..ca6f9b773 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h
@@ -3,9 +3,6 @@
 
 #define MICROPY_HW_LED_STATUS   (&pin_PA17)
 
-// No _pixelbuf to save space.
-#define CIRCUITPY_PIXELBUF          (0)
-
 // Don't allow touch on A0 (PA02), because it's connected to the speaker.
 #define PA02_NO_TOUCH       (true)
 
@@ -49,5 +46,3 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
-
-#define CIRCUITPY_DISPLAYIO (0)
diff --git a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
index b07d63984..eed40f902 100644
--- a/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.mk
@@ -10,6 +10,9 @@ EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 # Turn off longints for Crickit build to make room for additional frozen libs.
 LONGINT_IMPL = NONE
 
+CIRCUITPY_DISPLAYIO = 0
+CIRCUITPY_PIXELBUF = 0
+
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
diff --git a/ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.h b/ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.h
index dbbcd1ea8..99167d31b 100644
--- a/ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.h
+++ b/ports/atmel-samd/boards/datalore_ip_m4/mpconfigboard.h
@@ -43,6 +43,3 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
-
-#define CIRCUITPY_I2CSLAVE     (1)
-#define CIRCUITPY_DISPLAYIO    (1)
diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.h b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.h
index 4a5004b3a..abbf0b08c 100644
--- a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.h
+++ b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.h
@@ -32,5 +32,3 @@
 
 #define DEFAULT_UART_BUS_RX (&pin_PA11)
 #define DEFAULT_UART_BUS_TX (&pin_PA10)
-
-#define CIRCUITPY_DISPLAYIO (0)
diff --git a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
index f773bcb57..c6dc73d39 100644
--- a/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/feather_m0_express_crickit/mpconfigboard.mk
@@ -9,6 +9,9 @@ EXTERNAL_FLASH_DEVICE_COUNT = 2
 EXTERNAL_FLASH_DEVICES = "S25FL216K, GD25Q16C"
 LONGINT_IMPL = MPZ
 
+# Make space for frozen libs
+CIRCUITPY_DISPLAYIO = 0
+
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
diff --git a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.h b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.h
index 1a570092b..4b5460706 100644
--- a/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.h
+++ b/ports/atmel-samd/boards/hallowing_m0_express/mpconfigboard.h
@@ -35,5 +35,3 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
-
-#define CIRCUITPY_DISPLAYIO    (1)
diff --git a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
index 8bac35604..6b252e89b 100644
--- a/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pirkey_m0/mpconfigboard.mk
@@ -13,7 +13,7 @@ LONGINT_IMPL = NONE
 CIRCUITPY_ANALOGIO = 0
 CIRCUITPY_MATH = 0
 CIRCUITPY_NEOPIXEL_WRITE = 0
-CIRCUITPY_RTC = 0
+#CIRCUITPY_RTC = 0
 CIRCUITPY_SAMD = 0
 CIRCUITPY_USB_MIDI = 0
 CIRCUITPY_SMALL_BUILD = 1
diff --git a/ports/atmel-samd/boards/pyportal/mpconfigboard.h b/ports/atmel-samd/boards/pyportal/mpconfigboard.h
index f02d4a372..43346488b 100644
--- a/ports/atmel-samd/boards/pyportal/mpconfigboard.h
+++ b/ports/atmel-samd/boards/pyportal/mpconfigboard.h
@@ -38,5 +38,3 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
-
-#define CIRCUITPY_DISPLAYIO    (1)
diff --git a/ports/atmel-samd/common-hal/busio/I2C.c b/ports/atmel-samd/common-hal/busio/I2C.c
index dac15bcc1..a0c04d65d 100644
--- a/ports/atmel-samd/common-hal/busio/I2C.c
+++ b/ports/atmel-samd/common-hal/busio/I2C.c
@@ -67,10 +67,6 @@ Sercom *samd_i2c_get_sercom(const mcu_pin_obj_t* scl, const mcu_pin_obj_t* sda,
 
 void common_hal_busio_i2c_construct(busio_i2c_obj_t *self,
         const mcu_pin_obj_t* scl, const mcu_pin_obj_t* sda, uint32_t frequency, uint32_t timeout) {
-    #ifdef PIRKEY_M0
-    mp_raise_NotImplementedError(translate("Not enough pins available"));
-    return;
-    #endif
     uint8_t sercom_index;
     uint32_t sda_pinmux, scl_pinmux;
     Sercom* sercom = samd_i2c_get_sercom(scl, sda, &sercom_index, &sda_pinmux, &scl_pinmux);
diff --git a/ports/atmel-samd/fatfs_port.c b/ports/atmel-samd/fatfs_port.c
index 67c6c9d35..c4ce18c2a 100644
--- a/ports/atmel-samd/fatfs_port.c
+++ b/ports/atmel-samd/fatfs_port.c
@@ -29,12 +29,20 @@
 #include "lib/oofatfs/ff.h"        /* FatFs lower layer API */
 #include "lib/oofatfs/diskio.h"    /* FatFs lower layer API */
 #include "lib/timeutils/timeutils.h"
+
+#if CIRCUITPY_RTC
 #include "shared-bindings/rtc/RTC.h"
+#endif
 
 DWORD get_fattime(void) {
+#if CIRCUITPY_RTC
     timeutils_struct_time_t tm;
     common_hal_rtc_get_time(&tm);
-
     return ((tm.tm_year - 1980) << 25) | (tm.tm_mon << 21) | (tm.tm_mday << 16) |
            (tm.tm_hour << 11)          | (tm.tm_min << 5)  | (tm.tm_sec >> 1);
+#else
+    return ((2016 - 1980) << 25) | ((9) << 21) | ((1) << 16) | ((16) << 11) | ((43) << 5) | (35 / 2);
+#endif
+
+
 }
diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
index 15e58065b..f0f6a9d55 100644
--- a/ports/atmel-samd/mpconfigport.h
+++ b/ports/atmel-samd/mpconfigport.h
@@ -43,7 +43,9 @@
 #define MICROPY_PY_BUILTINS_NOTIMPLEMENTED          (0)
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT          (0)
 #define MICROPY_PY_FUNCTION_ATTRS                   (0)
+// MICROPY_PY_UJSON depends on MICROPY_PY_IO
 #define MICROPY_PY_IO                               (0)
+#define MICROPY_PY_UJSON                            (0)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS          (0)
 #define MICROPY_PY_UERRNO_LIST \
     X(EPERM) \
@@ -71,6 +73,7 @@
 #define MICROPY_PY_COLLECTIONS_ORDEREDDICT          (1)
 #define MICROPY_PY_FUNCTION_ATTRS                   (1)
 #define MICROPY_PY_IO                               (1)
+#define MICROPY_PY_UJSON                            (1)
 #define MICROPY_PY_REVERSE_SPECIAL_METHODS          (1)
 //      MICROPY_PY_UERRNO_LIST - Use the default
 #endif
diff --git a/ports/atmel-samd/supervisor/port.c b/ports/atmel-samd/supervisor/port.c
index 3f73d9a8f..282cbf8ff 100644
--- a/ports/atmel-samd/supervisor/port.c
+++ b/ports/atmel-samd/supervisor/port.c
@@ -164,7 +164,7 @@ safe_mode_t port_init(void) {
     // Configure millisecond timer initialization.
     tick_init();
 
-#ifndef PIRKEY_M0
+#if CIRCUITPY_RTC
     rtc_init();
 #endif
 
@@ -209,9 +209,11 @@ void reset_port(void) {
     pulseout_reset();
     pwmout_reset();
 
-#ifndef PIRKEY_M0
+#if CIRCUITPY_ANALOGIO
     analogin_reset();
     analogout_reset();
+#endif
+#if CIRCUITPY_RTC
     rtc_reset();
 #endif
 
diff --git a/ports/circuitpy-common/mpconfig_circuitpy.h b/ports/circuitpy-common/mpconfig_circuitpy.h
index df44245e4..69055f4b1 100644
--- a/ports/circuitpy-common/mpconfig_circuitpy.h
+++ b/ports/circuitpy-common/mpconfig_circuitpy.h
@@ -446,8 +446,7 @@ extern const struct _mp_obj_module_t ustack_module;
 #define USTACK_MODULE
 #endif
 
-// (u)json depends on MICROPY_PY_IO
-#if MICROPY_PY_IO && MICROPY_PY_UJSON
+#if MICROPY_PY_UJSON
 #define JSON_MODULE { MP_ROM_QSTR(MP_QSTR_json), MP_ROM_PTR(&mp_module_ujson) },
 #else
 #define JSON_MODULE
diff --git a/ports/circuitpy-common/mpconfig_circuitpy.mk b/ports/circuitpy-common/mpconfig_circuitpy.mk
index 6d1f1ac78..f9be045a6 100644
--- a/ports/circuitpy-common/mpconfig_circuitpy.mk
+++ b/ports/circuitpy-common/mpconfig_circuitpy.mk
@@ -127,14 +127,14 @@ CFLAGS += -DCIRCUITPY_RTC=$(CIRCUITPY_RTC)
 
 # Only for SAMD chips.
 ifndef CIRCUITPY_SAMD
-ifneq ($findstring samd,$(CHIP_FAMILY),)
+ifneq ($findstring sam,$(CHIP_FAMILY),)
 CIRCUITPY_SAMD = $(CIRCUITPY_FULL_BUILD)
 else
 # Not a SAMD build.
 CIRCUITPY_SAMD = 0
 endif
-CFLAGS += -DCIRCUITPY_SAMD=$(CIRCUITPY_SAMD)
 endif
+CFLAGS += -DCIRCUITPY_SAMD=$(CIRCUITPY_SAMD)
 
 # Currently always off.
 ifndef CIRCUITPY_STAGE