Commit 1ea77a5
rp2/modmachine: Restore original CPU speed after lightsleep.
This commit lets `machine.lightsleep` restore the original CPU and
peripherals frequencies upon wakeup if they were previously set to
different values than the defaults.
The original implementation of `machine.lightsleep` would restore the
default speed for CPU and peripherals as part of the wakeup procedure,
which would ignore previously set values. These changes force an
optional frequency values set once the MCU wakes up, by simply jumping
into the internal implementation for `machine.freq`.
The relevant lightsleep test was also updated to verify the changes in
question.
Signed-off-by: Alessandro Gatti <a.gatti@frob.it>1 parent 11094ea commit 1ea77a5
3 files changed
Lines changed: 26 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -100,6 +100,8 @@ static mp_obj_t mp_machine_get_freq(void) { | |||
| 100 | 100 | return MP_OBJ_NEW_SMALL_INT(mp_hal_get_cpu_freq()); | |
| 101 | 101 | } | |
| 102 | 102 | ||
| 103 | + static mp_obj_t frequency_overrides[2] = {}; | ||
| 104 | + | ||
| 103 | 105 | static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) { | |
| 104 | 106 | mp_int_t freq = mp_obj_get_int(args[0]); | |
| 105 | 107 | ||
@@ -141,6 +143,10 @@ static void mp_machine_set_freq(size_t n_args, const mp_obj_t *args) { | |||
| 141 | 143 | psram_reinitialize(); | |
| 142 | 144 | } | |
| 143 | 145 | #endif | |
| 146 | + | ||
| 147 | + if (n_args > 0) { | ||
| 148 | + memcpy(frequency_overrides, args, MIN(n_args, 2) * sizeof(mp_obj_t)); | ||
| 149 | + } | ||
| 144 | 150 | } | |
| 145 | 151 | ||
| 146 | 152 | static void mp_machine_idle(void) { | |
@@ -364,6 +370,10 @@ static void mp_machine_lightsleep(size_t n_args, const mp_obj_t *args) { | |||
| 364 | 370 | // (higher up, inside the critical section) | |
| 365 | 371 | in_lightsleep = false; | |
| 366 | 372 | #endif | |
| 373 | + | ||
| 374 | + if (frequency_overrides[0] != MP_OBJ_NULL) { | ||
| 375 | + mp_machine_set_freq(1 + (frequency_overrides[1] != NULL ? 1 : 0), frequency_overrides); | ||
| 376 | + } | ||
| 367 | 377 | } | |
| 368 | 378 | ||
| 369 | 379 | MP_NORETURN static void mp_machine_deepsleep(size_t n_args, const mp_obj_t *args) { | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -27,4 +27,15 @@ | |||
| 27 | 27 | sys.stdout.write(chr(ord("a") + (n % 26))) | |
| 28 | 28 | lightsleep(2 ** (n % 10)) | |
| 29 | 29 | ||
| 30 | - print("\nDONE") | ||
| 30 | + old_freq = machine.freq() | ||
| 31 | + machine.freq(50_000_000) | ||
| 32 | + print("\n{}".format(machine.freq())) | ||
| 33 | + lightsleep(500) | ||
| 34 | + print(machine.freq()) | ||
| 35 | + machine.freq(51_000_000, 48_000_000) | ||
| 36 | + print(machine.freq()) | ||
| 37 | + lightsleep(500) | ||
| 38 | + print(machine.freq()) | ||
| 39 | + machine.freq(old_freq) | ||
| 40 | + | ||
| 41 | + print("DONE") | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,2 +1,6 @@ | |||
| 1 | 1 | abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuv | |
| 2 | + 50000000 | ||
| 3 | + 50000000 | ||
| 4 | + 51000000 | ||
| 5 | + 51000000 | ||
| 2 | 6 | DONE | |
0 commit comments