Skip to content

Commit 2c7ad7a

Browse files
committed
make translate and pre-commit formatting fixes
1 parent a9d4f09 commit 2c7ad7a

File tree

7 files changed

+14
-32
lines changed

7 files changed

+14
-32
lines changed

locale/circuitpython.pot

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3739,7 +3739,12 @@ msgstr ""
37393739
msgid "pow() with 3 arguments requires integers"
37403740
msgstr ""
37413741

3742+
#: ports/espressif/boards/adafruit_feather_esp32_v2/mpconfigboard.h
3743+
msgid "pressing SW38 button at start up.\n"
3744+
msgstr ""
3745+
37423746
#: ports/espressif/boards/adafruit_qtpy_esp32c3/mpconfigboard.h
3747+
#: ports/espressif/boards/lolin_c3_mini/mpconfigboard.h
37433748
#: supervisor/shared/safe_mode.c
37443749
msgid "pressing boot button at start up.\n"
37453750
msgstr ""

ports/espressif/common-hal/analogio/AnalogOut.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ void common_hal_analogio_analogout_construct(analogio_analogout_obj_t *self,
5656
self->channel = DAC_CHANNEL_1;
5757
} else if (pin == &pin_CHANNEL_2) {
5858
self->channel = DAC_CHANNEL_2;
59-
}
60-
else {
59+
} else {
6160
raise_ValueError_invalid_pin();
6261
}
6362
dac_output_enable(self->channel);

ports/espressif/common-hal/microcontroller/Pin.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static const uint64_t pin_mask_reset_forbidden =
7777
// Never ever reset pins used to communicate with SPI flash and PSRAM.
7878
GPIO_SEL_19 | // USB D-
7979
GPIO_SEL_20 | // USB D+
80-
#if defined (CONFIG_ESP32_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S2_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S3_SPIRAM_SUPPORT)
80+
#if defined(CONFIG_ESP32_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S2_SPIRAM_SUPPORT) || defined(CONFIG_ESP32S3_SPIRAM_SUPPORT)
8181
// Note ESP32-C3 does not have SPIRAM support.
8282
// Board uses PSRAM, and needs another chip select.
8383
GPIO_SEL_26 | // SPICS1

ports/espressif/common-hal/microcontroller/__init__.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void common_hal_mcu_enable_interrupts(void) {
8989
void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
9090
switch (runmode) {
9191
case RUNMODE_UF2:
92-
#if defined(CONFIG_IDF_TARGET_ESP32) ||defined(CONFIG_IDF_TARGET_ESP32C3)
92+
#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3)
9393
mp_arg_error_invalid(MP_QSTR_run_mode);
9494
#else
9595
// 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) {
112112
break;
113113
case RUNMODE_BOOTLOADER:
114114
// DFU download
115-
#if defined(CONFIG_IDF_TARGET_ESP32) ||defined(CONFIG_IDF_TARGET_ESP32C3)
115+
#if defined(CONFIG_IDF_TARGET_ESP32) || defined(CONFIG_IDF_TARGET_ESP32C3)
116116
mp_arg_error_invalid(MP_QSTR_run_mode);
117117
#else
118118
chip_usb_set_persist_flags(USBDC_BOOT_DFU);

py/circuitpy_mpconfig.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,9 @@ typedef long mp_off_t;
200200
// extra built in names to add to the global namespace
201201
// Not indented so as not to confused the editor.
202202
#define MICROPY_PORT_BUILTINS \
203-
{ MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \
204-
{ MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
205-
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, \
203+
{ MP_OBJ_NEW_QSTR(MP_QSTR_help), (mp_obj_t)&mp_builtin_help_obj }, \
204+
{ MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
205+
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, \
206206

207207
//////////////////////////////////////////////////////////////////////////////////////////////////
208208
// board-specific definitions, which control and may override definitions below.

supervisor/shared/workflow.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ static void supervisor_workflow_update_status_bar(void) {
6363
#endif
6464

6565
static void workflow_background(void *data) {
66-
#if CIRCUITPY_STATUS_BAR
66+
#if CIRCUITPY_STATUS_BAR
6767
supervisor_workflow_update_status_bar();
68-
#endif
68+
#endif
6969
}
7070

7171
// Called during a VM reset. Doesn't actually reset things.

tools/ci_check_duplicate_usb_vid_pid.py

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -121,28 +121,6 @@ def check_vid_pid(files, clusterlist):
121121
)
122122
sys.exit(duplicate_message)
123123

124-
125-
126-
127-
128-
129-
130-
131-
132-
133-
134-
135-
136-
137-
138-
139-
140-
141-
142-
143-
144-
145-
146124
else:
147125
print("No USB PID duplicates found.")
148126

0 commit comments

Comments
 (0)