Skip to content

Commit db065a2

Browse files
dhalbertdhalbert
authored
Merge pull request #6933 from jepler/🥧🐮
Implement a useful subset of `wifi` and `socketpool` modules on 🥧🐮
2 parents d3449bd + 2dd6df9 commit db065a2

File tree

70 files changed

+3710
-110
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+3710
-110
lines changed

‎.gitmodules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,3 +310,9 @@
310310
[submodule "ports/espressif/esp32-camera"]
311311
path = ports/espressif/esp32-camera
312312
url = https://github.com/adafruit/esp32-camera/
313+
[submodule "ports/raspberrypi/lib/cyw43-driver"]
314+
path = ports/raspberrypi/lib/cyw43-driver
315+
url = https://github.com/georgerobotics/cyw43-driver.git
316+
[submodule "ports/raspberrypi/lib/lwip"]
317+
path = ports/raspberrypi/lib/lwip
318+
url = https://github.com/lwip-tcpip/lwip.git

‎locale/circuitpython.pot

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ msgstr ""
9595
msgid "%q failure: %d"
9696
msgstr ""
9797

98+
#: shared-bindings/digitalio/DigitalInOut.c
9899
#: shared-bindings/microcontroller/Pin.c
99100
msgid "%q in use"
100101
msgstr ""
@@ -302,7 +303,7 @@ msgstr ""
302303
msgid "'%s' object doesn't support item deletion"
303304
msgstr ""
304305

305-
#: py/runtime.c
306+
#: ports/raspberrypi/common-hal/wifi/Radio.c py/runtime.c
306307
msgid "'%s' object has no attribute '%q'"
307308
msgstr ""
308309

@@ -488,6 +489,7 @@ msgid "Already running"
488489
msgstr ""
489490

490491
#: ports/espressif/common-hal/wifi/Radio.c
492+
#: ports/raspberrypi/common-hal/wifi/Radio.c
491493
msgid "Already scanning for wifi networks"
492494
msgstr ""
493495

@@ -916,6 +918,10 @@ msgstr ""
916918
msgid "Expected a %q"
917919
msgstr ""
918920

921+
#: ports/raspberrypi/bindings/cyw43/__init__.c
922+
msgid "Expected a %q or %q"
923+
msgstr ""
924+
919925
#: shared-bindings/alarm/__init__.c
920926
msgid "Expected an %q"
921927
msgstr ""
@@ -1177,7 +1183,7 @@ msgstr ""
11771183
msgid "Internal watchdog timer expired."
11781184
msgstr ""
11791185

1180-
#: py/argcheck.c
1186+
#: py/argcheck.c shared-bindings/digitalio/DigitalInOut.c
11811187
msgid "Invalid %q"
11821188
msgstr ""
11831189

@@ -2203,6 +2209,11 @@ msgstr ""
22032209
msgid "Unknown system firmware error: %d"
22042210
msgstr ""
22052211

2212+
#: ports/raspberrypi/common-hal/wifi/__init__.c
2213+
#, c-format
2214+
msgid "Unkown error code %d"
2215+
msgstr ""
2216+
22062217
#: shared-bindings/adafruit_pixelbuf/PixelBuf.c
22072218
#, c-format
22082219
msgid "Unmatched number of items on RHS (expected %d, got %d)."
@@ -4115,14 +4126,10 @@ msgstr ""
41154126
msgid "type is not an acceptable base type"
41164127
msgstr ""
41174128

4118-
#: py/runtime.c
4129+
#: py/objgenerator.c py/runtime.c
41194130
msgid "type object '%q' has no attribute '%q'"
41204131
msgstr ""
41214132

4122-
#: py/objgenerator.c
4123-
msgid "type object 'generator' has no attribute '__await__'"
4124-
msgstr ""
4125-
41264133
#: py/objtype.c
41274134
msgid "type takes 1 or 3 arguments"
41284135
msgstr ""
@@ -4253,9 +4260,14 @@ msgid "width must be greater than zero"
42534260
msgstr ""
42544261

42554262
#: ports/espressif/common-hal/wifi/Radio.c
4263+
#: ports/raspberrypi/common-hal/wifi/Radio.c
42564264
msgid "wifi is not enabled"
42574265
msgstr ""
42584266

4267+
#: ports/raspberrypi/common-hal/wifi/Monitor.c
4268+
msgid "wifi.Monitor not available"
4269+
msgstr ""
4270+
42594271
#: shared-bindings/_bleio/Adapter.c
42604272
msgid "window must be <= interval"
42614273
msgstr ""

‎main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
784784
mp_printf(&mp_plat_print, "%02X", raw_id[i]);
785785
}
786786
mp_printf(&mp_plat_print, "\n");
787+
port_boot_info();
787788
#endif
788789

789790
bool found_boot = maybe_run_list(boot_py_filenames);

‎mpy-cross/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ override undefine PROG
2020
endif
2121

2222
include mpy-cross.mk
23+
CFLAGS += -g
24+
STRIP = :

‎ports/atmel-samd/boards/arduino_nano_33_iot/mpconfigboard.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ CIRCUITPY_BUILD_EXTENSIONS = bin,uf2
1111
INTERNAL_FLASH_FILESYSTEM = 1
1212
LONGINT_IMPL = NONE
1313
CIRCUITPY_FULL_BUILD = 0
14+
CIRCUITPY_RAINBOWIO = 0

‎ports/atmel-samd/common-hal/digitalio/DigitalInOut.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,12 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
6666
self->pin = NULL;
6767
}
6868

69-
void common_hal_digitalio_digitalinout_switch_to_input(
69+
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
7070
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
7171
self->output = false;
7272
// This also sets direction to input.
7373
common_hal_digitalio_digitalinout_set_pull(self, pull);
74+
return DIGITALINOUT_OK;
7475
}
7576

7677
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -151,7 +152,7 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
151152
}
152153
}
153154

154-
void common_hal_digitalio_digitalinout_set_pull(
155+
digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
155156
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
156157
enum gpio_pull_mode asf_pull = GPIO_PULL_OFF;
157158
switch (pull) {
@@ -168,6 +169,7 @@ void common_hal_digitalio_digitalinout_set_pull(
168169
// Must set pull after setting direction.
169170
gpio_set_pin_direction(self->pin->number, GPIO_DIRECTION_IN);
170171
gpio_set_pin_pull_mode(self->pin->number, asf_pull);
172+
return DIGITALINOUT_OK;
171173
}
172174

173175
digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(

‎ports/broadcom/common-hal/digitalio/DigitalInOut.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,12 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
6363
self->pin = NULL;
6464
}
6565

66-
void common_hal_digitalio_digitalinout_switch_to_input(
66+
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
6767
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
6868
self->output = false;
6969
// This also sets direction to input.
7070
common_hal_digitalio_digitalinout_set_pull(self, pull);
71+
return DIGITALINOUT_OK;
7172
}
7273

7374
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -134,7 +135,7 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
134135
}
135136
}
136137

137-
void common_hal_digitalio_digitalinout_set_pull(
138+
digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
138139
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
139140
const uint8_t pin = self->pin->number;
140141
BP_PULL_Enum bp_pull = BP_PULL_NONE;
@@ -144,6 +145,7 @@ void common_hal_digitalio_digitalinout_set_pull(
144145
bp_pull = BP_PULL_DOWN;
145146
}
146147
gpio_set_pull(pin, bp_pull);
148+
return DIGITALINOUT_OK;
147149
}
148150

149151
digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(

‎ports/cxd56/common-hal/digitalio/DigitalInOut.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,12 @@ bool common_hal_digitalio_digitalinout_deinited(digitalio_digitalinout_obj_t *se
6464
return self->pin == NULL;
6565
}
6666

67-
void common_hal_digitalio_digitalinout_switch_to_input(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
67+
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
6868
self->input = true;
6969
self->pull = pull;
7070
board_gpio_write(self->pin->number, -1);
7171
board_gpio_config(self->pin->number, 0, true, true, pull);
72+
return DIGITALINOUT_OK;
7273
}
7374

7475
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(digitalio_digitalinout_obj_t *self, bool value, digitalio_drive_mode_t drive_mode) {
@@ -124,10 +125,11 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(digitali
124125
return self->open_drain ? DRIVE_MODE_OPEN_DRAIN : DRIVE_MODE_PUSH_PULL;
125126
}
126127

127-
void common_hal_digitalio_digitalinout_set_pull(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
128+
digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
128129
self->pull = pull;
129130
board_gpio_write(self->pin->number, -1);
130131
board_gpio_config(self->pin->number, 0, true, true, pull);
132+
return DIGITALINOUT_OK;
131133
}
132134

133135
digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(digitalio_digitalinout_obj_t *self) {

‎ports/espressif/common-hal/digitalio/DigitalInOut.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,11 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
8282
self->pin = NULL;
8383
}
8484

85-
void common_hal_digitalio_digitalinout_switch_to_input(
85+
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
8686
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
8787
common_hal_digitalio_digitalinout_set_pull(self, pull);
8888
gpio_set_direction(self->pin->number, GPIO_MODE_INPUT);
89+
return DIGITALINOUT_OK;
8990
}
9091

9192
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -140,7 +141,7 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
140141
return DRIVE_MODE_PUSH_PULL;
141142
}
142143

143-
void common_hal_digitalio_digitalinout_set_pull(
144+
digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
144145
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
145146
gpio_num_t number = self->pin->number;
146147
gpio_pullup_dis(number);
@@ -150,6 +151,7 @@ void common_hal_digitalio_digitalinout_set_pull(
150151
} else if (pull == PULL_DOWN) {
151152
gpio_pulldown_en(number);
152153
}
154+
return DIGITALINOUT_OK;
153155
}
154156

155157
digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(

‎ports/litex/common-hal/digitalio/DigitalInOut.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,11 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
5858
self->pin = NULL;
5959
}
6060

61-
void common_hal_digitalio_digitalinout_switch_to_input(
61+
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
6262
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
6363
(void)pull;
6464
touch_oe_write(touch_oe_read() & ~(1 << self->pin->number));
65+
return DIGITALINOUT_OK;
6566
}
6667

6768
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -111,10 +112,11 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
111112
}
112113
}
113114

114-
void common_hal_digitalio_digitalinout_set_pull(
115+
digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
115116
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
116117
(void)self;
117118
(void)pull;
119+
return DIGITALINOUT_OK;
118120
}
119121

120122
digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(

‎ports/mimxrt10xx/common-hal/digitalio/DigitalInOut.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,13 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
8888
self->pin = NULL;
8989
}
9090

91-
void common_hal_digitalio_digitalinout_switch_to_input(
91+
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
9292
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
9393
self->output = false;
9494

9595
// This also sets direction to input.
9696
common_hal_digitalio_digitalinout_set_pull(self, pull);
97+
return DIGITALINOUT_OK;
9798
}
9899

99100
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -150,14 +151,15 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
150151
}
151152
}
152153

153-
void common_hal_digitalio_digitalinout_set_pull(
154+
digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
154155
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
155156
self->pull = pull;
156157

157158
pin_config(self->pin, self->open_drain, self->pull);
158159

159160
const gpio_pin_config_t config = { kGPIO_DigitalInput, 0, kGPIO_NoIntmode };
160161
GPIO_PinInit(self->pin->gpio, self->pin->number, &config);
162+
return DIGITALINOUT_OK;
161163
}
162164

163165
digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(

‎ports/nrf/common-hal/digitalio/DigitalInOut.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,11 @@ void common_hal_digitalio_digitalinout_deinit(digitalio_digitalinout_obj_t *self
5959
self->pin = NULL;
6060
}
6161

62-
void common_hal_digitalio_digitalinout_switch_to_input(
62+
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_input(
6363
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
6464
nrf_gpio_cfg_input(self->pin->number, NRF_GPIO_PIN_NOPULL);
6565
common_hal_digitalio_digitalinout_set_pull(self, pull);
66+
return DIGITALINOUT_OK;
6667
}
6768

6869
digitalinout_result_t common_hal_digitalio_digitalinout_switch_to_output(
@@ -120,7 +121,7 @@ digitalio_drive_mode_t common_hal_digitalio_digitalinout_get_drive_mode(
120121
}
121122
}
122123

123-
void common_hal_digitalio_digitalinout_set_pull(
124+
digitalinout_result_t common_hal_digitalio_digitalinout_set_pull(
124125
digitalio_digitalinout_obj_t *self, digitalio_pull_t pull) {
125126
nrf_gpio_pin_pull_t hal_pull = NRF_GPIO_PIN_NOPULL;
126127

@@ -137,6 +138,7 @@ void common_hal_digitalio_digitalinout_set_pull(
137138
}
138139

139140
nrf_gpio_cfg_input(self->pin->number, hal_pull);
141+
return DIGITALINOUT_OK;
140142
}
141143

142144
digitalio_pull_t common_hal_digitalio_digitalinout_get_pull(

0 commit comments

Comments
 (0)