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

make translate and pre-commit formatting fixes

Browse Source
This commit is contained in:
Dan Halbert 2022-07-08 16:53:53 -04:00
parent a9d4f09360
commit 2c7ad7a39f
7 changed files with 14 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
locale/circuitpython.pot
View File

@ -3739,7 +3739,12 @@ msgstr ""
msgid "pow() with 3 arguments requires integers" msgid "pow() with 3 arguments requires integers"
msgstr "" msgstr ""
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
msgid "pressing SW38 button at start up.\n"
msgstr ""
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h #: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
#: supervisor/shared/safe_mode.c #: supervisor/shared/safe_mode.c
msgid "pressing boot button at start up.\n" msgid "pressing boot button at start up.\n"
msgstr "" msgstr ""

3
ports/espressif/common-hal/analogio/AnalogOut.c
View File

@ -56,8 +56,7 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
self->channel = DAC_CHANNEL_1; self->channel = DAC_CHANNEL_1;
} else if (pin == &pin_CHANNEL_2) { } else if (pin == &pin_CHANNEL_2) {
self->channel = DAC_CHANNEL_2; self->channel = DAC_CHANNEL_2;
} } else {
else {
raise_ValueError_invalid_pin(); raise_ValueError_invalid_pin();
} }
dac_output_enable(self->channel); dac_output_enable(self->channel);

2
ports/espressif/common-hal/microcontroller/Pin.c
View File

@ -77,7 +77,7 @@ static const uint64_t pin_mask_reset_forbidden =
// Never ever reset pins used to communicate with SPI flash and PSRAM. // Never ever reset pins used to communicate with SPI flash and PSRAM.
GPIO_SEL_19 | // USB D- GPIO_SEL_19 | // USB D-
GPIO_SEL_20 | // USB D+ GPIO_SEL_20 | // USB D+
#if defined (CONFIG_ESP32_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S2_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S3_SPIRAM_SUPPORT) #if defined(CONFIG_ESP32_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S2_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S3_SPIRAM_SUPPORT)
// Note ESP32-C3 does not have SPIRAM support. // Note ESP32-C3 does not have SPIRAM support.
// Board uses PSRAM, and needs another chip select. // Board uses PSRAM, and needs another chip select.
GPIO_SEL_26 | // SPICS1 GPIO_SEL_26 | // SPICS1

4
ports/espressif/common-hal/microcontroller/__init__.c
View File

@ -89,7 +89,7 @@ void common_hal_mcu_enable_interrupts(void) {
void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) { void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
switch (runmode) { switch (runmode) {
case RUNMODE_UF2: case RUNMODE_UF2:
#if defined(CONFIG_IDF_TARGET_ESP32) ||defined(CONFIG_IDF_TARGET_ESP32C3) #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3)
mp_arg_error_invalid(MP_QSTR_run_mode); mp_arg_error_invalid(MP_QSTR_run_mode);
#else #else
// 0x11F2 is APP_REQUEST_UF2_RESET_HINT & is defined by TinyUF2 // 0x11F2 is APP_REQUEST_UF2_RESET_HINT & is defined by TinyUF2
@ -112,7 +112,7 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
break; break;
case RUNMODE_BOOTLOADER: case RUNMODE_BOOTLOADER:
// DFU download // DFU download
#if defined(CONFIG_IDF_TARGET_ESP32) ||defined(CONFIG_IDF_TARGET_ESP32C3) #if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3)
mp_arg_error_invalid(MP_QSTR_run_mode); mp_arg_error_invalid(MP_QSTR_run_mode);
#else #else
chip_usb_set_persist_flags(USBDC_BOOT_DFU); chip_usb_set_persist_flags(USBDC_BOOT_DFU);

6
py/circuitpy_mpconfig.h
View File

@ -200,9 +200,9 @@ typedef long mp_off_t;
// extra built in names to add to the global namespace // extra built in names to add to the global namespace
// Not indented so as not to confused the editor. // Not indented so as not to confused the editor.
#define MICROPY_PORT_BUILTINS \ #define MICROPY_PORT_BUILTINS \
{ MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, \ { MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, \
////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////
// board-specific definitions, which control and may override definitions below. // board-specific definitions, which control and may override definitions below.

4
supervisor/shared/workflow.c
View File

@ -63,9 +63,9 @@ static void supervisor_workflow_update_status_bar(void) {
#endif #endif
static void workflow_background(void *data) { static void workflow_background(void *data) {
#if CIRCUITPY_STATUS_BAR #if CIRCUITPY_STATUS_BAR
supervisor_workflow_update_status_bar(); supervisor_workflow_update_status_bar();
#endif #endif
} }
// Called during a VM reset. Doesn't actually reset things. // Called during a VM reset. Doesn't actually reset things.

22
tools/ci_check_duplicate_usb_vid_pid.py
View File

@ -121,28 +121,6 @@ def check_vid_pid(files, clusterlist):
) )
sys.exit(duplicate_message) sys.exit(duplicate_message)
else: else:
print("No USB PID duplicates found.") print("No USB PID duplicates found.")