djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CI formatting issues

Browse Source
This commit is contained in:
Lucian Copeland 2021-04-20 15:04:52 -04:00
parent a702409983
commit 436e33e7ec
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
locale/circuitpython.pot
View File

@ -309,10 +309,6 @@ msgstr ""
msgid "Address type out of range"
msgstr ""
#: ports/nrf/common-hal/alarm/time/TimeAlarm.c
msgid "Alarm time must be < 512 seconds."
msgstr ""
#: ports/esp32s2/common-hal/canio/CAN.c
msgid "All CAN peripherals are in use"
msgstr ""
@ -3722,6 +3718,7 @@ msgstr ""
#: ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/mpconfigboard.h
#: ports/esp32s2/boards/adafruit_metro_esp32s2/mpconfigboard.h
#: ports/esp32s2/boards/artisense_rd00/mpconfigboard.h
#: ports/esp32s2/boards/atmegazero_esp32s2/mpconfigboard.h
#: ports/esp32s2/boards/electroniccats_bastwifi/mpconfigboard.h
#: ports/esp32s2/boards/espressif_kaluga_1/mpconfigboard.h
#: ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.h

10
supervisor/shared/serial.c
View File

@ -40,7 +40,7 @@
#ifdef NRF_DEBUG_PRINT
// XXX these functions are in nrf/supervisor/debug_uart.c
extern void _debug_uart_init(void);
extern void _debug_print_substr(const char* text, uint32_t length);
extern void _debug_print_substr(const char *text, uint32_t length);
#endif
/*
@ -72,15 +72,15 @@ void serial_early_init(void) {
#endif
#ifdef NRF_DEBUG_PRINT
_debug_uart_init();
_debug_uart_init();
#endif
}
void serial_init(void) {
usb_init();
#ifdef NRF_DEBUG_PRINT
#ifdef NRF_DEBUG_PRINT
_debug_uart_init();
#endif
#endif
}
bool serial_connected(void) {
@ -160,7 +160,7 @@ void serial_write_substring(const char *text, uint32_t length) {
#if defined(DEBUG_UART_TX) && defined(DEBUG_UART_RX)
int uart_errcode;
common_hal_busio_uart_write(&debug_uart, (const uint8_t*) text, length, &uart_errcode);
common_hal_busio_uart_write(&debug_uart, (const uint8_t *)text, length, &uart_errcode);
#endif
#ifdef NRF_DEBUG_PRINT