Merge pull request #4754 from dhalbert/fix-endpoint-checking

Fix endpoint checking; Clean up safe mode printing

Author: tannewt

locale/ID.po

@@ -4581,7 +4581,7 @@ msgstr ""
 #~ msgstr "Berjalan di mode aman(safe mode)! Auto-reload tidak aktif.\n"
 
 #~ msgid "Running in safe mode! Not running saved code.\n"
-#~ msgstr ""
+#~ msgstr "Berjalan di mode aman(safe mode)! Tidak menjalankan kode yang disimpan.\n"
 #~ "Berjalan di mode aman(safe mode)! tidak menjalankan kode yang tersimpan.\n"
 
 #~ msgid "'async for' or 'async with' outside async function"

locale/circuitpython.pot

@@ -710,13 +710,7 @@ msgid "CircuitPython core code crashed hard. Whoops!\n"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid ""
-"CircuitPython is in safe mode because you pressed the reset button during "
-"boot. Press again to exit safe mode.\n"
-msgstr ""
-
-#: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
+msgid "CircuitPython was unable to allocate the heap."
 msgstr ""
 
 #: shared-module/bitbangio/SPI.c
@@ -1638,10 +1632,6 @@ msgstr ""
 msgid "Not playing"
 msgstr ""
 
-#: main.c
-msgid "Not running saved code.\n"
-msgstr ""
-
 #: shared-bindings/_bleio/__init__.c
 msgid "Not settable"
 msgstr ""
@@ -1964,7 +1954,7 @@ msgid "Row entry must be digitalio.DigitalInOut"
 msgstr ""
 
 #: main.c
-msgid "Running in safe mode! "
+msgid "Running in safe mode! Not running saved code.\n"
 msgstr ""
 
 #: shared-module/sdcardio/SDCard.c
@@ -2089,13 +2079,13 @@ msgstr ""
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The CircuitPython heap was corrupted because the stack was too small.\n"
-"Please increase the stack size if you know how, or if not:"
+"Increase the stack size if you know how. If not:"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
 msgid ""
 "The `microcontroller` module was used to boot into safe mode. Press reset to "
-"exit safe mode.\n"
+"exit safe mode."
 msgstr ""
 
 #: shared-bindings/rgbmatrix/RGBMatrix.c
@@ -2106,7 +2096,7 @@ msgstr ""
 msgid ""
 "The microcontroller's power dipped. Make sure your power supply provides\n"
 "enough power for the whole circuit and press reset (after ejecting "
-"CIRCUITPY).\n"
+"CIRCUITPY)."
 msgstr ""
 
 #: shared-module/audiomixer/MixerVoice.c
@@ -2404,7 +2394,12 @@ msgid "Writes not supported on Characteristic"
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "You are in safe mode: something unanticipated happened.\n"
+msgid "You are in safe mode because:\n"
+msgstr ""
+
+#: supervisor/shared/safe_mode.c
+msgid ""
+"You pressed the reset button during boot. Press again to exit safe mode."
 msgstr ""
 
 #: supervisor/shared/safe_mode.c

locale/de_DE.po

@@ -732,8 +732,8 @@ msgstr ""
 "zu verlassen.\n"
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
-msgstr "CircuitPython war es nicht möglich heap-Speicher zu allozieren.\n"
+msgid "CircuitPython was unable to allocate the heap."
+msgstr "CircuitPython war es nicht möglich heap-Speicher zu allozieren."
 
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."

locale/en_GB.po

@@ -729,8 +729,8 @@ msgstr ""
 "boot. Press again to exit safe mode.\n"
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
-msgstr "CircuitPython was unable to allocate the heap.\n"
+msgid "CircuitPython was unable to allocate the heap."
+msgstr "CircuitPython was unable to allocate the heap."
 
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."

locale/es.po

@@ -738,8 +738,8 @@ msgstr ""
 "durante el arranque. Presione nuevamente para salir del modo seguro.\n"
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
-msgstr "CircuitPython no puedo encontrar el montículo.\n"
+msgid "CircuitPython was unable to allocate the heap."
+msgstr "CircuitPython no puedo encontrar el montículo."
 
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."
@@ -4820,7 +4820,7 @@ msgstr "zi debe ser una forma (n_section,2)"
 #~ msgstr "Ejecutando en modo seguro! La auto-recarga esta deshabilitada.\n"
 
 #~ msgid "Running in safe mode! Not running saved code.\n"
-#~ msgstr ""
+#~ msgstr "Ejecutando en modo seguro!  No ejecutando el código almacenado.\n"
 #~ "Ejecutando en modo seguro! No se esta ejecutando el código guardado.\n"
 
 #~ msgid "__init__() should return None, not '%s'"

locale/fr.po

@@ -745,8 +745,8 @@ msgstr ""
 "mode sans échec.\n"
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
-msgstr "CircuitPython n'as pu faire l'allocation de la pile.\n"
+msgid "CircuitPython was unable to allocate the heap."
+msgstr "CircuitPython n'as pu faire l'allocation de la pile."
 
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."

locale/hi.po

@@ -716,7 +716,7 @@ msgid ""
 msgstr ""
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
+msgid "CircuitPython was unable to allocate the heap."
 msgstr ""
 
 #: shared-module/bitbangio/SPI.c

locale/ja.po

@@ -727,8 +727,8 @@ msgstr ""
 "度押すとセーフモードを終了します。\n"
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
-msgstr "CircuitPythonはヒープを確保できませんでした\n"
+msgid "CircuitPython was unable to allocate the heap."
+msgstr "CircuitPythonはヒープを確保できませんでした"
 
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."
@@ -1980,8 +1980,8 @@ msgid "Row entry must be digitalio.DigitalInOut"
 msgstr "Rowの各要素は digitalio.DigitalInOut でなければなりません"
 
 #: main.c
-msgid "Running in safe mode! "
-msgstr "セーフモードで実行中！ "
+msgid "Running in safe mode! Not running saved code.\n"
+msgstr "セーフモードで実行中！ 保存されたコードは実行していません。\n"
 
 #: shared-module/sdcardio/SDCard.c
 msgid "SD card CSD format not supported"

locale/nl.po

@@ -725,8 +725,8 @@ msgstr ""
 "het opstarten. Druk nogmaals om veilige modus te verlaten\n"
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
-msgstr "CircuitPython kon het heap geheugen niet toewijzen.\n"
+msgid "CircuitPython was unable to allocate the heap."
+msgstr "CircuitPython kon het heap geheugen niet toewijzen."
 
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."

locale/pl.po

@@ -725,8 +725,8 @@ msgstr ""
 "przycisk resetowania. Naciśnij ponownie, aby wyjść z trybu awaryjnego.\n"
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
-msgstr "CircuitPython nie mógł przydzielić sterty.\n"
+msgid "CircuitPython was unable to allocate the heap."
+msgstr "CircuitPython nie mógł przydzielić sterty."
 
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."

locale/pt_BR.po

@@ -743,8 +743,8 @@ msgstr ""
 "de segurança.\n"
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
-msgstr "O CircuitPython não conseguiu alocar o heap.\n"
+msgid "CircuitPython was unable to allocate the heap."
+msgstr "O CircuitPython não conseguiu alocar o heap."
 
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."
@@ -4861,7 +4861,7 @@ msgstr "zi deve estar na forma (n_section, 2)"
 #~ msgstr "Rodando em modo seguro! Atualização automática está desligada.\n"
 
 #~ msgid "Running in safe mode! Not running saved code.\n"
-#~ msgstr "Rodando em modo seguro! Não está executando o código salvo.\n"
+#~ msgstr "Rodando em modo seguro! O código salvo não está em execução.\n"
 
 #~ msgid "__init__() should return None, not '%s'"
 #~ msgstr "O __init__() deve retornar Nenhum, não '%s'"

locale/sv.po

@@ -731,8 +731,8 @@ msgstr ""
 "under start. Tryck igen för att lämna säkert läge.\n"
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
-msgstr "CircuitPython kunde inte allokera heap.\n"
+msgid "CircuitPython was unable to allocate the heap."
+msgstr "CircuitPython kunde inte allokera heap."
 
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."

locale/zh_Latn_pinyin.po

@@ -732,8 +732,8 @@ msgstr ""
 "chóng zhì ànniǔ. Zài àn yīcì tuìchū ānquán móshì.\n"
 
 #: supervisor/shared/safe_mode.c
-msgid "CircuitPython was unable to allocate the heap.\n"
-msgstr "CircuitPython wúfǎ fēnpèi duī.\n"
+msgid "CircuitPython was unable to allocate the heap."
+msgstr "CircuitPython wúfǎ fēnpèi duī."
 
 #: shared-module/bitbangio/SPI.c
 msgid "Clock pin init failed."

main.c

@@ -261,18 +261,20 @@ STATIC void print_code_py_status_message(safe_mode_t safe_mode) {
         serial_write_compressed(translate("Auto-reload is off.\n"));
     }
     if (safe_mode != NO_SAFE_MODE) {
-        serial_write_compressed(translate("Running in safe mode! "));
-        serial_write_compressed(translate("Not running saved code.\n"));
+        serial_write_compressed(translate("Running in safe mode! Not running saved code.\n"));
     }
 }
 
 STATIC bool run_code_py(safe_mode_t safe_mode) {
     bool serial_connected_at_start = serial_connected();
+    bool printed_safe_mode_message = false;
     #if CIRCUITPY_AUTORELOAD_DELAY_MS > 0
-    serial_write("\n");
-    print_code_py_status_message(safe_mode);
-    print_safe_mode_message(safe_mode);
-    serial_write("\n");
+    if (serial_connected_at_start) {
+        serial_write("\r\n");
+        print_code_py_status_message(safe_mode);
+        print_safe_mode_message(safe_mode);
+        printed_safe_mode_message = true;
+    }
     #endif
 
     pyexec_result_t result;
@@ -388,8 +390,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
                 print_code_py_status_message(safe_mode);
             }
 
-            print_safe_mode_message(safe_mode);
-            serial_write("\n");
+            if (!printed_safe_mode_message) {
+                print_safe_mode_message(safe_mode);
+                printed_safe_mode_message = true;
+            }
+            serial_write("\r\n");
             serial_write_compressed(translate("Press any key to enter the REPL. Use CTRL-D to reload.\n"));
             printed_press_any_key = true;
         }
@@ -526,7 +531,6 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
     usb_set_defaults();
 #endif
 
-    // TODO(tannewt): Re-add support for flashing boot error output.
     if (ok_to_run) {
         bool found_boot = maybe_run_list(boot_py_filenames, NULL);
         (void) found_boot;

ports/atmel-samd/mpconfigport.mk

@@ -21,7 +21,7 @@ endif
 INTERNAL_LIBM = 1
 
 # Number of USB endpoint pairs.
-USB_NUM_EP = 8
+USB_NUM_ENDPOINT_PAIRS = 8
 
 CIRCUITPY_ROTARYIO_SOFTENCODER = 1
 

ports/cxd56/mpconfigport.mk

@@ -1,7 +1,7 @@
 USB_HIGHSPEED = 1
 
 # Number of USB endpoint pairs.
-USB_NUM_EP = 6
+USB_NUM_ENDPOINT_PAIRS = 6
 
 # Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk
 # $(MPY-TOOL) needs to know what kind of longint to use (if any) to freeze long integers.

ports/esp32s2/mpconfigport.mk

@@ -27,16 +27,21 @@ CIRCUITPY_ROTARYIO = 1
 CIRCUITPY_NVM = 1
 CIRCUITPY_PS2IO ?= 1
 CIRCUITPY_TOUCHIO_USE_NATIVE ?= 1
-# We don't have enough endpoints to include MIDI.
-CIRCUITPY_USB_MIDI ?= 0
-CIRCUITPY_USB_HID ?= 1
-# We have borrowed the VENDOR nomenclature from tinyusb. VENDOR AKA WEBUSB
-CIRCUITPY_USB_VENDOR ?= 0
 CIRCUITPY_WIFI = 1
 CIRCUITPY_WATCHDOG ?= 1
 
 CIRCUITPY_ESPIDF = 1
 
 CIRCUITPY_MODULE ?= none
 
-USB_NUM_EP = 5
+# From the ESP32-S2 datasheet:
+#
+# Endpoint number 0 always present (bi-directional, consisting of EP0 IN and EP0 OUT)
+# Six additional endpoints (endpoint numbers 1 to 6), configurable as IN or OUT
+# Maximum of five IN endpoints concurrently active at any time (including EP0 IN)
+#
+# Due to the limited number of endpoints, some USB devices will be off by default.
+# For instance MIDI is available, but the device is turned off. It can be turned on
+# only if something else is turned off, such as HID.
+USB_NUM_ENDPOINT_PAIRS = 7
+USB_NUM_IN_ENDPOINTS = 5

ports/litex/mpconfigport.mk

@@ -7,7 +7,7 @@ MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
 INTERNAL_LIBM = 1
 
 # Number of USB endpoint pairs.
-USB_NUM_EP = 16
+USB_NUM_ENDPOINT_PAIRS = 16
 
 # Longints can be implemented as mpz, as longlong, or not
 LONGINT_IMPL = MPZ

ports/mimxrt10xx/mpconfigport.mk

@@ -17,7 +17,7 @@ INTERNAL_LIBM = 1
 USB_HIGHSPEED = 1
 
 # Number of USB endpoint pairs.
-USB_NUM_EP = 8
+USB_NUM_ENDPOINT_PAIRS = 8
 
 INTERNAL_FLASH_FILESYSTEM = 1
 

ports/nrf/mpconfigport.mk

@@ -10,7 +10,7 @@ MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
 INTERNAL_LIBM = 1
 
 # Number of USB endpoint pairs.
-USB_NUM_EP = 8
+USB_NUM_ENDPOINT_PAIRS = 8
 
 # All nRF ports have longints.
 LONGINT_IMPL = MPZ

ports/raspberrypi/mpconfigport.mk

@@ -49,6 +49,6 @@ CIRCUITPY_AUDIOMIXER = 1
 INTERNAL_LIBM = 1
 
 # Number of USB endpoint pairs.
-USB_NUM_EP = 8
+USB_NUM_ENDPOINT_PAIRS = 8
 
 INTERNAL_FLASH_FILESYSTEM = 1

ports/stm/boards/espruino_pico/mpconfigboard.mk

@@ -22,6 +22,8 @@ CIRCUITPY_AUDIOPWMIO = 0
 CIRCUITPY_BUSDEVICE = 0
 CIRCUITPY_BITMAPTOOLS = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_MIDI = 0
+CIRCUITPY_MSGPACK = 0
 CIRCUITPY_ULAB = 0
 CIRCUITPY_VECTORIO = 0
 

ports/stm/boards/pyb_nano_v2/mpconfigboard.mk

@@ -16,3 +16,5 @@ LD_FILE = boards/STM32F411_fs.ld
 # Too big for the flash
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_AUDIOPWMIO = 0
+CIRCUITPY_MIDI = 0
+CIRCUITPY_MSGPACK = 0

ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk

@@ -15,3 +15,5 @@ LD_FILE = boards/STM32F411_fs.ld
 # Too big for the flash
 CIRCUITPY_AUDIOCORE = 0
 CIRCUITPY_AUDIOPWMIO = 0
+CIRCUITPY_MIDI = 0
+CIRCUITPY_MSGPACK = 0