Skip to content

Commit f542dea

Browse files
GadgetoidGadgetoid
committed
System Speed module for #24.
1 parent 5d3b139 commit f542dea

File tree

8 files changed

+177
-0
lines changed

8 files changed

+177
-0
lines changed

‎firmware/PIMORONI_BADGER2040/micropython.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@ target_compile_definitions(usermod_wakeup INTERFACE
3939
-DWAKEUP_PIN_VALUE=0b10000000000000010000000000
4040
)
4141

42+
# Use our LOCAL system_speed module from firmware/modules/system_speed
43+
include(firmware/modules/system_speed/micropython)
44+
4245
# Note: cppmem is *required* for C++ code to function on MicroPython
4346
# it redirects `malloc` and `free` calls to MicroPython's heap
4447
include(cppmem/micropython)

‎firmware/PIMORONI_BADGER2040/mpconfigboard.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
// This is a hack! Need to replace with upstream board definition.
22
#define MICROPY_HW_BOARD_NAME "Pimoroni Badger2040 2MB"
33
#define MICROPY_HW_FLASH_STORAGE_BYTES (1408 * 1024)
4+
#define PICO_VBUS_PIN 24

‎firmware/PIMORONI_BADGER2040W/micropython.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ target_compile_definitions(usermod_wakeup INTERFACE
4040
-DWAKEUP_PIN_VALUE=0b10000000000010000000000
4141
)
4242

43+
# Use our LOCAL system_speed module from firmware/modules/system_speed
44+
include(firmware/modules/system_speed/micropython)
45+
4346
# Note: cppmem is *required* for C++ code to function on MicroPython
4447
# it redirects `malloc` and `free` calls to MicroPython's heap
4548
include(cppmem/micropython)

‎firmware/PIMORONI_BADGER2040W/mpconfigboard.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#define CYW43_LWIP (1)
1212
#define CYW43_GPIO (1)
1313
#define CYW43_SPI_PIO (1)
14+
#define CYW43_WL_GPIO_VBUS_PIN (2)
1415

1516
// For debugging mbedtls - also set
1617
// Debug level (0-4) 1=warning, 2=info, 3=debug, 4=verbose

‎firmware/modules/system_speed/micropython.cmake‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
add_library(usermod_system_speed INTERFACE)
2+
3+
target_sources(usermod_system_speed INTERFACE
4+
${CMAKE_CURRENT_LIST_DIR}/system_speed.c
5+
${CMAKE_CURRENT_LIST_DIR}/system_speed.cpp
6+
)
7+
8+
target_include_directories(usermod_system_speed INTERFACE
9+
${CMAKE_CURRENT_LIST_DIR}
10+
)
11+
12+
target_compile_definitions(usermod_system_speed INTERFACE
13+
-DMODULE_SYSTEM_SPEED_ENABLED=1
14+
)
15+
16+
target_link_libraries(usermod INTERFACE usermod_system_speed
17+
hardware_vreg
18+
hardware_pll
19+
hardware_resets
20+
)
21+
22+
set_source_files_properties(
23+
${CMAKE_CURRENT_LIST_DIR}/system_speed.c
24+
PROPERTIES COMPILE_FLAGS
25+
"-Wno-discarded-qualifiers"
26+
)

‎firmware/modules/system_speed/system_speed.c‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#include "system_speed.h"
2+
3+
STATIC MP_DEFINE_CONST_FUN_OBJ_1(system_speed_set_obj, system_speed_set);
4+
5+
STATIC const mp_map_elem_t system_speed_globals_table[] = {
6+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_system_speed) },
7+
{ MP_ROM_QSTR(MP_QSTR_set_speed), MP_ROM_PTR(&system_speed_set_obj) },
8+
9+
{ MP_ROM_QSTR(MP_QSTR_SYSTEM_VERY_SLOW), MP_ROM_INT(0) },
10+
{ MP_ROM_QSTR(MP_QSTR_SYSTEM_SLOW), MP_ROM_INT(1) },
11+
{ MP_ROM_QSTR(MP_QSTR_SYSTEM_NORMAL), MP_ROM_INT(2) },
12+
{ MP_ROM_QSTR(MP_QSTR_SYSTEM_FAST), MP_ROM_INT(3) },
13+
{ MP_ROM_QSTR(MP_QSTR_SYSTEM_TURBO), MP_ROM_INT(4) },
14+
};
15+
STATIC MP_DEFINE_CONST_DICT(mp_module_system_speed_globals, system_speed_globals_table);
16+
17+
const mp_obj_module_t system_speed_user_cmodule = {
18+
.base = { &mp_type_module },
19+
.globals = (mp_obj_dict_t*)&mp_module_system_speed_globals,
20+
};
21+
22+
#if MICROPY_VERSION <= 70144
23+
MP_REGISTER_MODULE(MP_QSTR_system_speed, system_speed_user_cmodule, MODULE_SYSTEM_SPEED_ENABLED);
24+
#else
25+
MP_REGISTER_MODULE(MP_QSTR_system_speed, system_speed_user_cmodule);
26+
#endif

‎firmware/modules/system_speed/system_speed.cpp‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
#include "hardware/gpio.h"
2+
3+
extern "C" {
4+
#include "system_speed.h"
5+
#include "pico/stdlib.h"
6+
#include "hardware/vreg.h"
7+
#include "hardware/clocks.h"
8+
#include "hardware/pll.h"
9+
10+
#if defined CYW43_WL_GPIO_VBUS_PIN
11+
#warning "Using CYW43_WL_GPIO_VBUS_PIN"
12+
#include "extmod/modnetwork.h"
13+
#include "lib/cyw43-driver/src/cyw43.h"
14+
#endif
15+
16+
#if MICROPY_HW_ENABLE_UART_REPL
17+
#include "uart.h"
18+
#endif
19+
20+
static void _set_system_speed(uint32_t selected_speed) {
21+
uint32_t sys_freq;
22+
23+
switch (selected_speed)
24+
{
25+
case 4: // TURBO: 250 MHZ, 1.2V
26+
vreg_set_voltage(VREG_VOLTAGE_1_20);
27+
set_sys_clock_khz(250000, true);
28+
return;
29+
case 3: // FAST: 133 MHZ
30+
vreg_set_voltage(VREG_VOLTAGE_1_10);
31+
set_sys_clock_khz(133000, true);
32+
return;
33+
34+
default:
35+
case 2: // NORMAL: 48 MHZ
36+
vreg_set_voltage(VREG_VOLTAGE_1_10);
37+
set_sys_clock_48mhz();
38+
return;
39+
40+
case 1: // SLOW: 12 MHZ, 1.0V
41+
sys_freq = 12 * MHZ;
42+
break;
43+
44+
case 0: // VERY_SLOW: 4 MHZ, 1.0V
45+
sys_freq = 4 * MHZ;
46+
break;
47+
}
48+
49+
// Set the configured clock speed, by dividing the USB PLL
50+
clock_configure(clk_sys,
51+
CLOCKS_CLK_SYS_CTRL_SRC_VALUE_CLKSRC_CLK_SYS_AUX,
52+
CLOCKS_CLK_SYS_CTRL_AUXSRC_VALUE_CLKSRC_PLL_USB,
53+
48 * MHZ,
54+
sys_freq);
55+
56+
clock_configure(clk_peri,
57+
0,
58+
CLOCKS_CLK_PERI_CTRL_AUXSRC_VALUE_CLK_SYS,
59+
sys_freq,
60+
sys_freq);
61+
62+
clock_configure(clk_adc,
63+
0,
64+
CLOCKS_CLK_ADC_CTRL_AUXSRC_VALUE_CLKSRC_PLL_USB,
65+
48 * MHZ,
66+
sys_freq);
67+
68+
// No longer using the SYS PLL so disable it
69+
pll_deinit(pll_sys);
70+
71+
// Not using USB so stop the clock
72+
clock_stop(clk_usb);
73+
74+
// Drop the core voltage
75+
vreg_set_voltage(VREG_VOLTAGE_1_00);
76+
}
77+
78+
mp_obj_t system_speed_set(mp_obj_t speed) {
79+
uint32_t selected_speed = mp_obj_get_int(speed);
80+
bool vbus = false;
81+
#if defined CYW43_WL_GPIO_VBUS_PIN
82+
cyw43_gpio_get(&cyw43_state, CYW43_WL_GPIO_VBUS_PIN, &vbus);
83+
#else
84+
gpio_set_function(PICO_VBUS_PIN, GPIO_FUNC_SIO);
85+
vbus = gpio_get(PICO_VBUS_PIN);
86+
#endif
87+
if (vbus && selected_speed < 2) {
88+
// If on USB never go slower than normal speed.
89+
selected_speed = 2;
90+
}
91+
92+
_set_system_speed(selected_speed);
93+
94+
#if MICROPY_HW_ENABLE_UART_REPL
95+
setup_default_uart();
96+
mp_uart_init();
97+
#endif
98+
99+
// TODO Make this work...
100+
/*if (selected_speed >= 2) {
101+
spi_set_baudrate(PIMORONI_SPI_DEFAULT_INSTANCE, 12 * MHZ);
102+
}
103+
else {
104+
// Set the SPI baud rate for communicating with the display to
105+
// go as fast as possible (which is now 6 or 2 MHz)
106+
spi_get_hw(PIMORONI_SPI_DEFAULT_INSTANCE)->cpsr = 2;
107+
hw_write_masked(&spi_get_hw(PIMORONI_SPI_DEFAULT_INSTANCE)->cr0, 0, SPI_SSPCR0_SCR_BITS);
108+
}*/
109+
110+
return mp_const_none;
111+
}
112+
113+
}

‎firmware/modules/system_speed/system_speed.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#include "py/runtime.h"
2+
#include "py/objstr.h"
3+
4+
extern mp_obj_t system_speed_set(mp_obj_t speed);

0 commit comments

Comments
 (0)