8000 add wifi.radio.power_management et al · rianadon/circuitpython@1ff3dff · GitHub
[go: up one dir, main page]
Skip to content

Commit 1ff3dff

Browse files
dhalbertdhalbert
committed
add wifi.radio.power_management et al
1 parent 97d037b commit 1ff3dff

File tree

12 files changed

+150
-94
lines changed

12 files changed

+150
-94
lines changed

‎ports/espressif/common-hal/wifi/Radio.c

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const mp_float_t
140140
}
141141

142142
wifi_power_management_t common_hal_wifi_radio_get_power_management(wifi_radio_obj_t *self) {
143-
wifi_ps_type ps;
143+
wifi_ps_type_t ps;
144144
esp_err_t ret = esp_wifi_get_ps(&ps);
145145
if (ret == ESP_OK) {
146146
switch (ps) {
@@ -156,30 +156,29 @@ wifi_power_management_t common_hal_wifi_radio_get_power_management(wifi_radio_ob
156156
}
157157

158158

159-
void common_hal_wifi_radio_set_power_management(wifi_radio_obj_t *self, wifi_power_management_t power_management, mp_uint_t listen_interval) {
159+
void common_hal_wifi_radio_set_power_management(wifi_radio_obj_t *self, wifi_power_management_t power_management) {
160160
switch (power_management) {
161161
case POWER_MANAGEMENT_MIN:
162162
esp_wifi_set_ps(WIFI_PS_MIN_MODEM);
163163
break;
164164
case POWER_MANAGEMENT_MAX: {
165165
// listen_interval is only used in this case.
166166
wifi_config_t *config = &self->sta_config;
167-
config->sta.listen_interval = listen_interval;
167+
// This is a typical value seen in various examples.
168+
config->sta.listen_interval = 3;
168169
esp_wifi_set_ps(WIFI_PS_MAX_MODEM);
169170
esp_wifi_set_config(ESP_IF_WIFI_STA, config);
170171
}
171172
break;
172173
case POWER_MANAGEMENT_NONE:
173174
esp_wifi_set_ps(WIFI_PS_NONE);
174175
break;
176+
case POWER_MANAGEMENT_UNKNOWN:
177+
// This should be prevented in shared-bindings.
178+
break;
175179
}
176180
}
177181

178-
mp_int_t common_hal_wifi_radio_get_listen_interval(wifi_radio_obj_t *self) {
179-
wifi_config_t *config = &self->sta_config;
180-
return config->sta.listen_interval;
181-
}
182-
183182
mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self) {
184183
uint8_t mac[MAC_ADDRESS_LENGTH];
185184
esp_wifi_get_mac(ESP_IF_WIFI_AP, mac);

‎ports/espressif/mpconfigport.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,6 @@ CIRCUITPY_FULL_BUILD ?= 1
4040
# If SSL is enabled, it's mbedtls
4141
CIRCUITPY_SSL_MBEDTLS = 1
4242

43-
# Wifi Power Save
44-
CIRCUITPY_WIFI_RADIO_SETTABLE_POWER_MANAGEMENT = 1
45-
4643
# Never use our copy of MBEDTLS
4744
CIRCUITPY_HASHLIB_MBEDTLS_ONLY = 0
4845

‎ports/raspberrypi/bindings/cyw43/__init__.c

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
#include "lib/cyw43-driver/src/cyw43.h"
1818

19-
static int power_management_value = PM_DISABLED;
19+
static uint32_t power_management_value = CONST_CYW43_DEFAULT_PM;
2020

2121
void cyw43_enter_deep_sleep(void) {
2222
#define WL_REG_ON 23
@@ -43,14 +43,23 @@ MP_DEFINE_CONST_OBJ_TYPE(
4343
print, shared_bindings_microcontroller_pin_print
4444
);
4545

46+
uint32_t cyw43_get_power_management_value() {
47+
return power_management_value;
48+
}
49+
50+
void cyw43_set_power_management_value(uint32_t value) {
51+
power_management_value = value;
52+
bindings_cyw43_wifi_enforce_pm();
53+
}
54+
4655
//| PM_STANDARD: int
47-
//| """The standard power management mode"""
56+
//| """The default power management mode; same as PM_PERFORMANCE"""
4857
//| PM_AGGRESSIVE: int
4958
//| """Aggressive power management mode for optimal power usage at the cost of performance"""
5059
//| PM_PERFORMANCE: int
5160
//| """Performance power management mode where more power is used to increase performance"""
5261
//| PM_DISABLED: int
53-
//| """Disable power management and always use highest power mode. CircuitPython sets this value at reset time, because it provides the best connectivity reliability."""
62+
//| """Disable power management and always use highest power mode."""
5463
//|
5564
//|
5665
//| def set_power_management(value: int) -> None:
@@ -85,8 +94,7 @@ MP_DEFINE_CONST_OBJ_TYPE(
8594
//|
8695
static mp_obj_t cyw43_set_power_management(const mp_obj_t value_in) {
8796
mp_int_t value = mp_obj_get_int(value_in);
88-
power_management_value = value;
89-
bindings_cyw43_wifi_enforce_pm();
97+
cyw43_set_power_management_value(value);
9098
return mp_const_none;
9199
}
92100
static MP_DEFINE_CONST_FUN_OBJ_1(cyw43_set_power_management_obj, cyw43_set_power_management);
@@ -126,10 +134,10 @@ static const mp_rom_map_elem_t cyw43_module_globals_table[] = {
126134
{ MP_ROM_QSTR(MP_QSTR_CywPin), MP_ROM_PTR(&cyw43_pin_type) },
127135
{ MP_ROM_QSTR(MP_QSTR_set_power_management), &cyw43_set_power_management_obj },
128136
{ MP_ROM_QSTR(MP_QSTR_get_power_management), &cyw43_get_power_management_obj },
129-
{ MP_ROM_QSTR(MP_QSTR_PM_STANDARD), MP_ROM_INT(PM_STANDARD) },
130-
{ MP_ROM_QSTR(MP_QSTR_PM_AGGRESSIVE), MP_ROM_INT(PM_AGGRESSIVE) },
131-
{ MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(PM_PERFORMANCE) },
132-
{ MP_ROM_QSTR(MP_QSTR_PM_DISABLED), MP_ROM_INT(PM_DISABLED) },
137+
{ MP_ROM_QSTR(MP_QSTR_PM_STANDARD), MP_ROM_INT(CONST_CYW43_DEFAULT_PM) },
138+
{ MP_ROM_QSTR(MP_QSTR_PM_AGGRESSIVE), MP_ROM_INT(CONST_CYW43_AGGRESSIVE_PM) },
139+
{ MP_ROM_QSTR(MP_QSTR_PM_PERFORMANCE), MP_ROM_INT(CONST_CYW43_PERFORMANCE_PM) },
140+
{ MP_ROM_QSTR(MP_QSTR_PM_DISABLED), MP_ROM_INT(CONST_CYW43_NONE_PM) },
133141
};
134142

135143
static MP_DEFINE_CONST_DICT(cyw43_module_globals, cyw43_module_globals_table);

‎ports/raspberrypi/bindings/cyw43/__init__.h

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,25 @@ const mcu_pin_obj_t *validate_obj_is_free_pin_including_cyw43(mp_obj_t obj, qstr
1616
const mcu_pin_obj_t *validate_obj_is_free_pin_or_gpio29(mp_obj_t obj, qstr arg_name);
1717
const mcu_pin_obj_t *validate_obj_is_pin_including_cyw43(mp_obj_t obj, qstr arg_name);
1818

19-
#define CONSTANT_CYW43_PM_VALUE(pm_mode, pm2_sleep_ret_ms, li_beacon_period, li_dtim_period, li_assoc) \
19+
// This is equivalent to the code in cyw43.h, except that the values are computed at compile time.
20+
// A `CONST_` prefix has been added to the computation function (expressed as a macro) and the values.
21+
22+
#define CONST_cyw43_pm_value(pm_mode, pm2_sleep_ret_ms, li_beacon_period, li_dtim_period, li_assoc) \
2023
(li_assoc << 20 | /* listen interval sent to ap */ \
2124
li_dtim_period << 16 | \
2225
li_beacon_period << 12 | \
2326
(pm2_sleep_ret_ms / 10) << 4 | /* cyw43_ll_wifi_pm multiplies this by 10 */ \
2427
pm_mode /* CYW43_PM2_POWERSAVE_MODE etc */)
2528

26-
// CYW43_DEFAULT_PM (except a compile-time constant)
27-
#define PM_STANDARD CONSTANT_CYW43_PM_VALUE(CYW43_PM2_POWERSAVE_MODE, 200, 1, 1, 10)
28-
// CYW43_AGGRESSIVE_PM (except a compile-time constant)
29-
#define PM_AGGRESSIVE CONSTANT_CYW43_PM_VALUE(CYW43_PM2_POWERSAVE_MODE, 2000, 1, 1, 10)
30-
// CYW43_PERFORMANCE_PM (except a compile-time constant)
31-
#define PM_PERFORMANCE CONSTANT_CYW43_PM_VALUE(CYW43_PM2_POWERSAVE_MODE, 20, 1, 1, 1)
32-
// The 0xa11140 magic value
33-
#define PM_DISABLED CONSTANT_CYW43_PM_VALUE(CYW43_NO_POWERSAVE_MODE, 200, 1, 1, 10)
29+
#define CONST_CYW43_DEFAULT_PM (CONST_CYW43_PERFORMANCE_PM)
30+
31+
#define CONST_CYW43_NONE_PM (CONST_cyw43_pm_value(CYW43_NO_POWERSAVE_MODE, 10, 0, 0, 0))
32+
33+
#define CONST_CYW43_AGGRESSIVE_PM (CONST_cyw43_pm_value(CYW43_PM1_POWERSAVE_MODE, 10, 0, 0, 0))
34+
35+
#define CONST_CYW43_PERFORMANCE_PM (CONST_cyw43_pm_value(CYW43_PM2_POWERSAVE_MODE, 200, 1, 1, 10))
3436

37+
extern uint32_t cyw43_get_power_management_value(void);
38+
extern void cyw43_set_power_management_value(uint32_t value);
3539
extern void bindings_cyw43_wifi_enforce_pm(void);
3640
void cyw43_enter_deep_sleep(void);

‎ports/raspberrypi/common-hal/wifi/Radio.c

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// SPDX-License-Identifier: MIT
66

77
#include "supervisor/port.h"
8+
#include "shared-bindings/wifi/PowerManagement.h"
89
#include "shared-bindings/wifi/Radio.h"
910
#include "shared-bindings/wifi/Network.h"
1011

@@ -107,6 +108,41 @@ void common_hal_wifi_radio_set_tx_power(wifi_radio_obj_t *self, const mp_float_t
107108
cyw43_ioctl(&cyw43_state, CYW43_IOCTL_SET_VAR, 9 + 4, buf, CYW43_ITF_AP);
108109
}
109110

111+
wifi_power_management_t common_hal_wifi_radio_get_power_management(wifi_radio_obj_t *self) {
112+
uint32_t pm_value = cyw43_get_power_management_value();
113+
114+
switch (pm_value) {
115+
case CONST_CYW43_PERFORMANCE_PM:
116+
return POWER_MANAGEMENT_MIN;
117+
case CONST_CYW43_AGGRESSIVE_PM:
118+
return POWER_MANAGEMENT_MAX;
119+
case CONST_CYW43_NONE_PM:
120+
return POWER_MANAGEMENT_NONE;
121+
default:
122+
return POWER_MANAGEMENT_UNKNOWN;
123+
}
124+
}
125+
126+
127+
void common_hal_wifi_radio_set_power_management(wifi_radio_obj_t *self, wifi_power_management_t power_management) {
128+
uint32_t pm_setting = CONST_CYW43_DEFAULT_PM;
129+
switch (power_management) {
130+
case POWER_MANAGEMENT_MIN:
131+
pm_setting = CONST_CYW43_PERFORMANCE_PM;
132+
break;
133+
case POWER_MANAGEMENT_MAX:
134+
pm_setting = CONST_CYW43_AGGRESSIVE_PM;
135+
break;
136+
case POWER_MANAGEMENT_NONE:
137+
pm_setting = CONST_CYW43_NONE_PM;
138+
break;
139+
default:
140+
// Should not get here.
141+
break;
142+
}
143+
cyw43_set_power_management_value(pm_setting);
144+
}
145+
110146
mp_obj_t common_hal_wifi_radio_get_mac_address_ap(wifi_radio_obj_t *self) {
111147
return common_hal_wifi_radio_get_mac_address(self);
112148
}

‎py/circuitpy_defns.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -617,6 +617,7 @@ $(filter $(SRC_PATTERNS), \
617617
supervisor/StatusBar.c \
618618
wifi/AuthMode.c \
619619
wifi/Packet.c \
620+
wifi/PowerManagement.c \
620621
)
621622

622623
ifeq ($(CIRCUITPY_BLEIO_HCI),1)

‎py/circuitpy_mpconfig.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,9 +705,6 @@ CFLAGS += -DCIRCUITPY_WEB_WORKFLOW=$(CIRCUITPY_WEB_WORKFLOW)
705705
CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS?= 1
706706
CFLAGS += -DCIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS=$(CIRCUITPY_WIFI_RADIO_SETTABLE_MAC_ADDRESS)
707707

708-
CIRCUITPY_WIFI_RADIO_SETTABLE_POWER_MANAGEMENT?= 0
709-
CFLAGS += -DCIRCUITPY_WIFI_RADIO_SETTABLE_POWER_MANAGEMENT=$(CIRCUITPY_WIFI_RADIO_SETTABLE_POWER_MANAGEMENT)
710-
711708
# tinyusb port tailored configuration
712709
CIRCUITPY_TUSB_MEM_ALIGN ?= 4
713710
CFLAGS += -DCIRCUITPY_TUSB_MEM_ALIGN=$(CIRCUITPY_TUSB_MEM_ALIGN)

‎shared-bindings/wifi/PowerManagement.c

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,38 @@
99
#include "shared-bindings/wifi/PowerManagement.h"
1010

1111
//| class PowerManagement:
12-
//| """Power-saving options for wifi"""
12+
//| """Power-saving options for wifi
13+
//|
14+
//| .. note:: On boards using the CYW43 radio module, the choices below correspond to the
15+
//| power management values defined in the `cyw43` module:
16+
//| `PowerManagement.MIN` is the same as `cyw43.PM_PERFORMANCE`, `PowerManagement.MAX`
17+
//| is the same as `cyw43.PM_AGGRESSIVE`, and `PowerManagement.NONE` is the same as
18+
//| `cyw43.PM_DISABLED`. If a custom value was set with `cyw43.set_power_management()`
19+
//| not corresponding to one of these three values, then `PowerManagement.UNKNOWN` will be returned.
20+
//| """
1321
//|
1422
//| MIN: PowerManagement
1523
//| """Minimum power management (default). The WiFi station wakes up to receive a beacon every DTIM period.
1624
//| The DTIM period is set by the access point."""
1725
//| MAX: PowerManagement
18-
//| """Maximum power management, at the expense of some performance. The WiFi station wakes up every 100 ms."""
26+
//| """Maximum power management, at the expense of some performance. The WiFi station wakes up less often than `MIN`."""
1927
//| NONE: PowerManagement
2028
//| """No power management: the WiFi station does not sleep."""
29+
//| UNKNOWN: PowerManagement
30+
//| """Power management setting cannot be determined."""
31+
//|
2132

2233
// In order of the enum type.
2334
MAKE_ENUM_VALUE(wifi_power_management_type, power_management, NONE, POWER_MANAGEMENT_NONE);
2435
MAKE_ENUM_VALUE(wifi_power_management_type, power_management, MIN, POWER_MANAGEMENT_MIN);
2536
MAKE_ENUM_VALUE(wifi_power_management_type, power_management, MAX, POWER_MANAGEMENT_MAX);
37+
MAKE_ENUM_VALUE(wifi_power_management_type, power_management, UNKNOWN, POWER_MANAGEMENT_UNKNOWN);
2638

2739
MAKE_ENUM_MAP(wifi_power_management) {
2840
MAKE_ENUM_MAP_ENTRY(power_management, NONE),
2941
MAKE_ENUM_MAP_ENTRY(power_management, MIN),
3042
MAKE_ENUM_MAP_ENTRY(power_management, MAX),
43+
MAKE_ENUM_MAP_ENTRY(power_management, UNKNOWN),
3144
};
3245

3346
static MP_DEFINE_CONST_DICT(wifi_power_management_locals_dict, wifi_power_management_locals_table);

‎shared-bindings/wifi/PowerManagement.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99
#include "py/enum.h"
1010

1111
typedef enum {
12-
POWER_MANAGMENT_NONE = 0,
12+
POWER_MANAGEMENT_NONE = 0,
1313
POWER_MANAGEMENT_MIN = 1,
1414
POWER_MANAGEMENT_MAX = 2,
15+
// Value can't be determined.
16+
POWER_MANAGEMENT_UNKNOWN = 3,
1517
} wifi_power_management_t;
1618

1719
extern const mp_obj_type_t wifi_power_management_type;

‎shared-bindings/wifi/Radio.c

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include "shared-bindings/wifi/__init__.h"
88
#include "shared-bindings/wifi/AuthMode.h"
9+
#include "shared-bindings/wifi/PowerManagement.h"
910

1011
#include <string.h>
1112

@@ -189,33 +190,29 @@ MP_PROPERTY_GETSET(wifi_radio_tx_power_obj,
189190
(mp_obj_t)&wifi_radio_set_tx_power_obj);
190191

191192
//| power_management: PowerManagement
192-
//| """Wifi power management setting. The default is `wifi.PowerManagement.MIN.
193+
//| """Wifi power management setting. See `wifi.PowerManagement`. The default is `wifi.PowerManagement.MIN`.
193194
//| """
194195
static mp_obj_t wifi_radio_get_power_management(mp_obj_t self_in) {
195-
#if CIRCUITPY_WIFI_RADIO_SETTABLE_POWER_MANAGEMENT
196196
wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
197197
return cp_enum_find(&wifi_power_management_type, common_hal_wifi_radio_get_power_management(self));
198-
#else
199-
return MP_OBJ_FROM_PTR(&power_management_MIN);
200-
#endif
201198
}
202-
MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_listen_interval_obj, wifi_radio_get_listen_interval);
199+
MP_DEFINE_CONST_FUN_OBJ_1(wifi_radio_get_power_management_obj, wifi_radio_get_power_management);
203200

204201
static mp_obj_t wifi_radio_set_power_management(mp_obj_t self_in, mp_obj_t power_management_in) {
205-
#if CIRCUITPY_WIFI_RADIO_SETTABLE_POWER_MANAGEMENT
206202
wifi_radio_obj_t *self = MP_OBJ_TO_PTR(self_in);
207-
wifi_power_management_t power_management = cp_enum_value(&wifi_power_management_type, power_management_in, MP_QSTR_power_management);
203+
wifi_power_management_t power_management =
204+
cp_enum_value(&wifi_power_management_type, power_management_in, MP_QSTR_power_management);
205+
if (power_management == POWER_MANAGEMENT_UNKNOWN) {
206+
mp_arg_error_invalid(MP_QSTR_power_management);
207+
}
208208
common_hal_wifi_radio_set_power_management(self, power_management);
209-
#else
210-
mp_raise_NotImplementedError(NULL);
211-
#endif
212209
return mp_const_none;
213210
}
214-
MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_listen_interval_obj, wifi_radio_set_listen_interval);
211+
MP_DEFINE_CONST_FUN_OBJ_2(wifi_radio_set_power_management_obj, wifi_radio_set_power_management);
215212

216-
MP_PROPERTY_GETSET(wifi_radio_listen_interval_obj,
217-
(mp_obj_t)&wifi_radio_get_listen_interval_obj,
218-
(mp_obj_t)&wifi_radio_set_listen_interval_obj);
213+
MP_PROPERTY_GETSET(wifi_radio_power_management_obj,
214+
(mp_obj_t)&wifi_radio_get_power_management_obj,
215+
(mp_obj_t)&wifi_radio_set_power_management_obj);
219216

220217
//| mac_address_ap: ReadableBuffer
221218
//| """MAC address for the AP. When the address is altered after interface is started
@@ -870,7 +867,7 @@ static const mp_rom_map_elem_t wifi_radio_locals_dict_table[] = {
870867
{ MP_ROM_QSTR(MP_QSTR_ipv4_subnet_ap), MP_ROM_PTR(&wifi_radio_ipv4_subnet_ap_obj) },
871868
{ MP_ROM_QSTR(MP_QSTR_ipv4_address), MP_ROM_PTR(&wifi_radio_ipv4_address_obj) },
872869
{ MP_ROM_QSTR(MP_QSTR_ipv4_address_ap), MP_ROM_PTR(&wifi_radio_ipv4_address_ap_obj) },
873-
{ MP_ROM_QSTR(MP_QSTR_listen_interval), MP_ROM_PTR(&wifi_radio_listen_interval_obj) },
870+
{ MP_ROM_QSTR(MP_QSTR_power_management), MP_ROM_PTR(&wifi_radio_power_management_obj) },
874871

875872
{ MP_ROM_QSTR(MP_QSTR_set_ipv4_address), MP_ROM_PTR(&wifi_radio_set_ipv4_address_obj) },
876873
{ MP_ROM_QSTR(MP_QSTR_set_ipv4_address_ap), MP_ROM_PTR(&wifi_radio_set_ipv4_address_ap_obj) },

0 commit comments

Comments
 (0)
0