Skip to content

Commit 0b4bcd9

Browse files
tannewttannewt
committed
Fix build and more comments
1 parent 40118bc commit 0b4bcd9

13 files changed

Lines changed: 9 additions & 21 deletions

File tree

‎main.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
391391
int64_t connecting_delay_ticks = CIRCUITPY_USB_CONNECTED_SLEEP_DELAY * 1024 - port_get_raw_ticks(NULL);
392392
if (connecting_delay_ticks > 0) {
393393
// Set when we've waited long enough so that we wake up from the
394-
// sleep_until_interrupt below and loop around to the real deep
394+
// port_idle_until_interrupt below and loop around to the real deep
395395
// sleep in the else clause.
396396
port_interrupt_after_ticks(connecting_delay_ticks);
397397
// Deep sleep if we're not connected to a host.
@@ -414,6 +414,11 @@ STATIC bool run_code_py(safe_mode_t safe_mode) {
414414
if (!asleep) {
415415
tick_rgb_status_animation(&animation);
416416
} else {
417+
// This waits until a pretend deep sleep alarm occurs. They are set
418+
// during common_hal_alarm_set_deep_sleep_alarms. On some platforms
419+
// it may also return due to another interrupt, that's why we check
420+
// for deep sleep alarms above. If it wasn't a deep sleep alarm,
421+
// then we'll idle here again.
417422
port_idle_until_interrupt();
418423
}
419424
}

‎ports/atmel-samd/boards/blm_badge/mpconfigboard.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
#define DEFAULT_UART_BUS_RX (&pin_PA01)
1414
#define DEFAULT_UART_BUS_TX (&pin_PA00)
1515

16-
#define USER_NEOPIXELS_PIN (&pin_PA05)
17-
1816
#define IGNORE_PIN_PA09 1
1917
#define IGNORE_PIN_PA12 1
2018
#define IGNORE_PIN_PA13 1

‎ports/atmel-samd/boards/circuitplayground_express/mpconfigboard.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
// Increase stack size slightly due to CPX library import nesting
3131
#define CIRCUITPY_DEFAULT_STACK_SIZE (4248) //divisible by 8
3232

33-
#define USER_NEOPIXELS_PIN (&pin_PB23)
34-
3533
#define DEFAULT_I2C_BUS_SCL (&pin_PB03)
3634
#define DEFAULT_I2C_BUS_SDA (&pin_PB02)
3735

‎ports/atmel-samd/boards/circuitplayground_express_crickit/mpconfigboard.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@
2424

2525
#define CALIBRATE_CRYSTALLESS 1
2626

27-
#define USER_NEOPIXELS_PIN (&pin_PB23)
28-
2927
// Explanation of how a user got into safe mode.
3028
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing both buttons at start up.\n")
3129

‎ports/atmel-samd/boards/circuitplayground_express_displayio/mpconfigboard.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
// Increase stack size slightly due to CPX library import nesting.
3131
#define CIRCUITPY_DEFAULT_STACK_SIZE (4248) // divisible by 8
3232

33-
#define USER_NEOPIXELS_PIN (&pin_PB23)
34-
3533
#define DEFAULT_I2C_BUS_SCL (&pin_PB03)
3634
#define DEFAULT_I2C_BUS_SDA (&pin_PB02)
3735

‎ports/atmel-samd/boards/pybadge/mpconfigboard.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
#define MICROPY_PORT_C (0)
1515
#define MICROPY_PORT_D (0)
1616

17-
#define USER_NEOPIXELS_PIN (&pin_PA15)
18-
1917
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
2018
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
2119

‎ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
#define MICROPY_PORT_C (0)
1515
#define MICROPY_PORT_D (0)
1616

17-
#define USER_NEOPIXELS_PIN (&pin_PA15)
18-
1917
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
2018
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
2119

‎ports/atmel-samd/boards/pygamer/mpconfigboard.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
#define MICROPY_PORT_C (0)
1414
#define MICROPY_PORT_D (0)
1515

16-
#define USER_NEOPIXELS_PIN (&pin_PA15)
17-
1816
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
1917
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
2018

‎ports/atmel-samd/boards/pygamer_advance/mpconfigboard.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
#define MICROPY_PORT_C (0)
1414
#define MICROPY_PORT_D (0)
1515

16-
#define USER_NEOPIXELS_PIN (&pin_PA15)
17-
1816
#define DEFAULT_I2C_BUS_SCL (&pin_PA13)
1917
#define DEFAULT_I2C_BUS_SDA (&pin_PA12)
2018

‎ports/esp32s2/common-hal/alarm/time/TimeAlarm.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ mp_obj_t alarm_time_timealarm_get_wakeup_alarm(size_t n_alarms, const mp_obj_t *
5151
}
5252
alarm_time_time_alarm_obj_t *timer = m_new_obj(alarm_time_time_alarm_obj_t);
5353
timer->base.type = &alarm_time_time_alarm_type;
54+
// TODO: Set monotonic_time based on the RTC state.
5455
return timer;
5556
}
5657

0 commit comments

Comments
 (0)