8000 Merge branch 'master' into framebuf-remap · micropython/micropython@75ab6d2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 75ab6d2

Browse files
deshipudeshipu
committed
Merge branch 'master' into framebuf-remap
2 parents 2648da2 + bbced3b commit 75ab6d2

24 files changed

+268
-246
lines changed

‎.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ before_script:
2020
# For teensy build
2121
- sudo apt-get install realpath
2222
# For coverage testing
23-
- sudo pip install cpp-coveralls
23+
# cpp-coveralls 0.4 conflicts with urllib3 preinstalled in Travis VM
24+
- sudo pip install cpp-coveralls==0.3.12
2425
- gcc --version
2526
- arm-none-eabi-gcc --version
2627
- python3 --version

‎esp8266/machine_adc.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,14 @@ STATIC mp_obj_t pyb_adc_read(mp_obj_t self_in) {
7070
}
7171
STATIC MP_DEFINE_CONST_FUN_OBJ_1(pyb_adc_read_obj, pyb_adc_read);
7272

73-
STATIC const mp_map_elem_t pyb_adc_locals_dict_table[] = {
74-
{ MP_OBJ_NEW_QSTR(MP_QSTR_read), (mp_obj_t)&pyb_adc_read_obj }
73+
STATIC const mp_rom_map_elem_t pyb_adc_locals_dict_table[] = {
74+
{ MP_ROM_QSTR(MP_QSTR_read), MP_ROM_PTR(&pyb_adc_read_obj) }
7575
};
7676
STATIC MP_DEFINE_CONST_DICT(pyb_adc_locals_dict, pyb_adc_locals_dict_table);
7777

7878
const mp_obj_type_t pyb_adc_type = {
7979
{ &mp_type_type },
8080
.name = MP_QSTR_ADC,
8181
.make_new = pyb_adc_make_new,
82-
.locals_dict = (mp_obj_t)&pyb_adc_locals_dict,
82+
.locals_dict = (mp_obj_dict_t*)&pyb_adc_locals_dict,
8383
};

‎esp8266/machine_pin.c

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -426,24 +426,24 @@ STATIC mp_uint_t pin_ioctl(mp_obj_t self_in, mp_uint_t request, uintptr_t arg, i
426426
return -1;
427427
}
428428

429-
STATIC const mp_map_elem_t pyb_pin_locals_dict_table[] = {
429+
STATIC const mp_rom_map_elem_t pyb_pin_locals_dict_table[] = {
430430
// instance methods
431-
{ MP_OBJ_NEW_QSTR(MP_QSTR_init), (mp_obj_t)&pyb_pin_init_obj },
432-
{ MP_OBJ_NEW_QSTR(MP_QSTR_value), (mp_obj_t)&pyb_pin_value_obj },
433-
{ MP_OBJ_NEW_QSTR(MP_QSTR_off), (mp_obj_t)&pyb_pin_off_obj },
434-
{ MP_OBJ_NEW_QSTR(MP_QSTR_on), (mp_obj_t)&pyb_pin_on_obj },
435-
{ MP_OBJ_NEW_QSTR(MP_QSTR_irq), (mp_obj_t)&pyb_pin_irq_obj },
431+
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&pyb_pin_init_obj) },
432+
{ MP_ROM_QSTR(MP_QSTR_value), MP_ROM_PTR(&pyb_pin_value_obj) },
433+
{ MP_ROM_QSTR(MP_QSTR_off), MP_ROM_PTR(&pyb_pin_off_obj) },
434+
{ MP_ROM_QSTR(MP_QSTR_on), MP_ROM_PTR(&pyb_pin_on_obj) },
435+
{ MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&pyb_pin_irq_obj) },
436436

437437
// class constants
438-
{ MP_OBJ_NEW_QSTR(MP_QSTR_IN), MP_OBJ_NEW_SMALL_INT(GPIO_MODE_INPUT) },
439-
{ MP_OBJ_NEW_QSTR(MP_QSTR_OUT), MP_OBJ_NEW_SMALL_INT(GPIO_MODE_OUTPUT) },
440-
{ MP_OBJ_NEW_QSTR(MP_QSTR_OPEN_DRAIN), MP_OBJ_NEW_SMALL_INT(GPIO_MODE_OPEN_DRAIN) },
441-
{ MP_OBJ_NEW_QSTR(MP_QSTR_PULL_UP), MP_OBJ_NEW_SMALL_INT(GPIO_PULL_UP) },
442-
//{ MP_OBJ_NEW_QSTR(MP_QSTR_PULL_DOWN), MP_OBJ_NEW_SMALL_INT(GPIO_PULL_DOWN) },
443-
444-
// IRG triggers, can be or'd together
445-
{ MP_OBJ_NEW_QSTR(MP_QSTR_IRQ_RISING), MP_OBJ_NEW_SMALL_INT(GPIO_PIN_INTR_POSEDGE) },
446-
{ MP_OBJ_NEW_QSTR(MP_QSTR_IRQ_FALLING), MP_OBJ_NEW_SMALL_INT(GPIO_PIN_INTR_NEGEDGE) },
438+
{ MP_ROM_QSTR(MP_QSTR_IN), MP_ROM_INT(GPIO_MODE_INPUT) },
439+
{ MP_ROM_QSTR(MP_QSTR_OUT), MP_ROM_INT(GPIO_MODE_OUTPUT) },
440+
{ MP_ROM_QSTR(MP_QSTR_OPEN_DRAIN), MP_ROM_INT(GPIO_MODE_OPEN_DRAIN) },
441+
{ MP_ROM_QSTR(MP_QSTR_PULL_UP), MP_ROM_INT(GPIO_PULL_UP) },
442+
//{ MP_ROM_QSTR(MP_QSTR_PULL_DOWN), MP_ROM_INT(GPIO_PULL_DOWN) },
443+
444+
// IRQ triggers, can be or'd together
445+
{ MP_ROM_QSTR(MP_QSTR_IRQ_RISING), MP_ROM_INT(GPIO_PIN_INTR_POSEDGE) },
446+
{ MP_ROM_QSTR(MP_QSTR_IRQ_FALLING), MP_ROM_INT(GPIO_PIN_INTR_NEGEDGE) },
447447
};
448448

449449
STATIC MP_DEFINE_CONST_DICT(pyb_pin_locals_dict, pyb_pin_locals_dict_table);
@@ -459,7 +459,7 @@ const mp_obj_type_t pyb_pin_type = {
459459
.make_new = mp_pin_make_new,
460460
.call = pyb_pin_call,
461461
.protocol = &pin_pin_p,
462-
.locals_dict = (mp_obj_t)&pyb_pin_locals_dict,
462+
.locals_dict = (mp_obj_dict_t*)&pyb_pin_locals_dict,
463463
};
464464

465465
/******************************************************************************/

‎esp8266/machine_rtc.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,19 +255,19 @@ STATIC mp_obj_t pyb_rtc_irq(size_t n_args, const mp_obj_t *pos_args, mp_map_t *k
255255
}
256256
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(pyb_rtc_irq_obj, 1, pyb_rtc_irq);
257257

258-
STATIC const mp_map_elem_t pyb_rtc_locals_dict_table[] = {
259-
{ MP_OBJ_NEW_QSTR(MP_QSTR_datetime), (mp_obj_t)&pyb_rtc_datetime_obj },
260-
{ MP_OBJ_NEW_QSTR(MP_QSTR_memory), (mp_obj_t)&pyb_rtc_memory_obj },
261-
{ MP_OBJ_NEW_QSTR(MP_QSTR_alarm), (mp_obj_t)&pyb_rtc_alarm_obj },
262-
{ MP_OBJ_NEW_QSTR(MP_QSTR_alarm_left), (mp_obj_t)&pyb_rtc_alarm_left_obj },
263-
{ MP_OBJ_NEW_QSTR(MP_QSTR_irq), (mp_obj_t)&pyb_rtc_irq_obj },
264-
{ MP_OBJ_NEW_QSTR(MP_QSTR_ALARM0), MP_OBJ_NEW_SMALL_INT(0) },
258+
STATIC const mp_rom_map_elem_t pyb_rtc_locals_dict_table[] = {
259+
{ MP_ROM_QSTR(MP_QSTR_datetime), MP_ROM_PTR(&pyb_rtc_datetime_obj) },
260+
{ MP_ROM_QSTR(MP_QSTR_memory), MP_ROM_PTR(&pyb_rtc_memory_obj) },
261+
{ MP_ROM_QSTR(MP_QSTR_alarm), MP_ROM_PTR(&pyb_rtc_alarm_obj) },
262+
{ MP_ROM_QSTR(MP_QSTR_alarm_left), MP_ROM_PTR(&pyb_rtc_alarm_left_obj) },
263+
{ MP_ROM_QSTR(MP_QSTR_irq), MP_ROM_PTR(&pyb_rtc_irq_obj) },
264+
{ MP_ROM_QSTR(MP_QSTR_ALARM0), MP_ROM_INT(0) },
265265
};
266266
STATIC MP_DEFINE_CONST_DICT(pyb_rtc_locals_dict, pyb_rtc_locals_dict_table);
267267

268268
const mp_obj_type_t pyb_rtc_type = {
269269
{ &mp_type_type },
270270
.name = MP_QSTR_RTC,
271271
.make_new = pyb_rtc_make_new,
272-
.locals_dict = (mp_obj_t)&pyb_rtc_locals_dict,
272+
.locals_dict = (mp_obj_dict_t*)&pyb_rtc_locals_dict,
273273
};

‎esp8266/machine_wdt.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ STATIC mp_obj_t machine_wdt_deinit(mp_obj_t self_in) {
7171
}
7272
STATIC MP_DEFINE_CONST_FUN_OBJ_1(machine_wdt_deinit_obj, machine_wdt_deinit);
7373

74-
STATIC const mp_map_elem_t machine_wdt_locals_dict_table[] = {
75-
{ MP_OBJ_NEW_QSTR(MP_QSTR_feed), (mp_obj_t)&machine_wdt_feed_obj },
76-
{ MP_OBJ_NEW_QSTR(MP_QSTR_deinit), (mp_obj_t)&machine_wdt_deinit_obj },
74+
STATIC const mp_rom_map_elem_t machine_wdt_locals_dict_table[] = {
75+
{ MP_ROM_QSTR(MP_QSTR_feed), MP_ROM_PTR(&machine_wdt_feed_obj) },
76+
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&machine_wdt_deinit_obj) },
7777
};
7878
STATIC MP_DEFINE_CONST_DICT(machine_wdt_locals_dict, machine_wdt_locals_dict_table);
7979

8080
const mp_obj_type_t esp_wdt_type = {
8181
{ &mp_type_type },
8282
.name = MP_QSTR_WDT,
8383
.make_new = machine_wdt_make_new,
84-
.locals_dict = (mp_obj_t)&machine_wdt_locals_dict,
84+
.locals_dict = (mp_obj_dict_t*)&machine_wdt_locals_dict,
8585
};

‎esp8266/modesp.c

Lines changed: 26 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -347,50 +347,40 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_2(esp_set_native_code_location_obj, esp_set_nativ
347347

348348
#endif
349349

350-
STATIC const mp_map_elem_t esp_module_globals_table[] = {
351-
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_esp) },
352-
353-
{ MP_OBJ_NEW_QSTR(MP_QSTR_osdebug), (mp_obj_t)&esp_osdebug_obj },
354-
{ MP_OBJ_NEW_QSTR(MP_QSTR_sleep_type), (mp_obj_t)&esp_sleep_type_obj },
355-
{ MP_OBJ_NEW_QSTR(MP_QSTR_deepsleep), (mp_obj_t)&esp_deepsleep_obj },
356-
{ MP_OBJ_NEW_QSTR(MP_QSTR_flash_id), (mp_obj_t)&esp_flash_id_obj },
357-
{ MP_OBJ_NEW_QSTR(MP_QSTR_flash_read), (mp_obj_t)&esp_flash_read_obj },
358-
{ MP_OBJ_NEW_QSTR(MP_QSTR_flash_write), (mp_obj_t)&esp_flash_write_obj },
359-
{ MP_OBJ_NEW_QSTR(MP_QSTR_flash_erase), (mp_obj_t)&esp_flash_erase_obj },
360-
{ MP_OBJ_NEW_QSTR(MP_QSTR_flash_size), (mp_obj_t)&esp_flash_size_obj },
361-
{ MP_OBJ_NEW_QSTR(MP_QSTR_flash_user_start), (mp_obj_t)&esp_flash_user_start_obj },
350+
STATIC const mp_rom_map_elem_t esp_module_globals_table[] = {
351+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_esp) },
352+
353+
{ MP_ROM_QSTR(MP_QSTR_osdebug), MP_ROM_PTR(&esp_osdebug_obj) },
354+
{ MP_ROM_QSTR(MP_QSTR_sleep_type), MP_ROM_PTR(&esp_sleep_type_obj) },
355+
{ MP_ROM_QSTR(MP_QSTR_deepsleep), MP_ROM_PTR(&esp_deepsleep_obj) },
356+
{ MP_ROM_QSTR(MP_QSTR_flash_id), MP_ROM_PTR(&esp_flash_id_obj) },
357+
{ MP_ROM_QSTR(MP_QSTR_flash_read), MP_ROM_PTR(&esp_flash_read_obj) },
358+
{ MP_ROM_QSTR(MP_QSTR_flash_write), MP_ROM_PTR(&esp_flash_write_obj) },
359+
{ MP_ROM_QSTR(MP_QSTR_flash_erase), MP_ROM_PTR(&esp_flash_erase_obj) },
360+
{ MP_ROM_QSTR(MP_QSTR_flash_size), MP_ROM_PTR(&esp_flash_size_obj) },
361+
{ MP_ROM_QSTR(MP_QSTR_flash_user_start), MP_ROM_PTR(&esp_flash_user_start_obj) },
362362
#if MICROPY_ESP8266_NEOPIXEL
363-
{ MP_OBJ_NEW_QSTR(MP_QSTR_neopixel_write), (mp_obj_t)&esp_neopixel_write_obj },
363+
{ MP_ROM_QSTR(MP_QSTR_neopixel_write), MP_ROM_PTR(&esp_neopixel_write_obj) },
364364
#endif
365365
#if MICROPY_ESP8266_APA102
366-
{ MP_OBJ_NEW_QSTR(MP_QSTR_apa102_write), (mp_obj_t)&esp_apa102_write_obj },
366+
{ MP_ROM_QSTR(MP_QSTR_apa102_write), MP_ROM_PTR(&esp_apa102_write_obj) },
367367
#endif
368-
{ MP_OBJ_NEW_QSTR(MP_QSTR_dht_readinto), (mp_obj_t)&dht_readinto_obj },
369-
{ MP_OBJ_NEW_QSTR(MP_QSTR_freemem), (mp_obj_t)&esp_freemem_obj },
370-
{ MP_OBJ_NEW_QSTR(MP_QSTR_meminfo), (mp_obj_t)&esp_meminfo_obj },
371-
{ MP_OBJ_NEW_QSTR(MP_QSTR_check_fw), (mp_obj_t)&esp_check_fw_obj },
372-
{ MP_OBJ_NEW_QSTR(MP_QSTR_info), (mp_obj_t)&pyb_info_obj }, // TODO delete/rename/move elsewhere
373-
{ MP_OBJ_NEW_QSTR(MP_QSTR_malloc), (mp_obj_t)&esp_malloc_obj },
374-
{ MP_OBJ_NEW_QSTR(MP_QSTR_free), (mp_obj_t)&esp_free_obj },
375-
{ MP_OBJ_NEW_QSTR(MP_QSTR_esf_free_bufs), (mp_obj_t)&esp_esf_free_bufs_obj },
368+
{ MP_ROM_QSTR(MP_QSTR_dht_readinto), MP_ROM_PTR(&dht_readinto_obj) },
369+
{ MP_ROM_QSTR(MP_QSTR_freemem), MP_ROM_PTR(&esp_freemem_obj) },
370+
{ MP_ROM_QSTR(MP_QSTR_meminfo), MP_ROM_PTR(&esp_meminfo_obj) },
371+
{ MP_ROM_QSTR(MP_QSTR_check_fw), MP_ROM_PTR(&esp_check_fw_obj) },
372+
{ MP_ROM_QSTR(MP_QSTR_info), MP_ROM_PTR(&pyb_info_obj) }, // TODO delete/rename/move elsewhere
373+
{ MP_ROM_QSTR(MP_QSTR_malloc), MP_ROM_PTR(&esp_malloc_obj) },
374+
{ MP_ROM_QSTR(MP_QSTR_free), MP_ROM_PTR(&esp_free_obj) },
375+
{ MP_ROM_QSTR(MP_QSTR_esf_free_bufs), MP_ROM_PTR(&esp_esf_free_bufs_obj) },
376376
#if MICROPY_EMIT_XTENSA || MICROPY_EMIT_INLINE_XTENSA
377-
{ MP_OBJ_NEW_QSTR(MP_QSTR_set_native_code_location), (mp_obj_t)&esp_set_native_code_location_obj },
377+
{ MP_ROM_QSTR(MP_QSTR_set_native_code_location), MP_ROM_PTR(&esp_set_native_code_location_obj) },
378378
#endif
379379

380380
#if MODESP_INCLUDE_CONSTANTS
381-
{ MP_OBJ_NEW_QSTR(MP_QSTR_SLEEP_NONE),
382-
MP_OBJ_NEW_SMALL_INT(NONE_SLEEP_T) },
383-
{ MP_OBJ_NEW_QSTR(MP_QSTR_SLEEP_LIGHT),
384-
MP_OBJ_NEW_SMALL_INT(LIGHT_SLEEP_T) },
385-
{ MP_OBJ_NEW_QSTR(MP_QSTR_SLEEP_MODEM),
386-
MP_OBJ_NEW_SMALL_INT(MODEM_SLEEP_T) },
387-
388-
{ MP_OBJ_NEW_QSTR(MP_QSTR_STA_MODE),
389-
MP_OBJ_NEW_SMALL_INT(STATION_MODE)},
390-
{ MP_OBJ_NEW_QSTR(MP_QSTR_AP_MODE),
391-
MP_OBJ_NEW_SMALL_INT(SOFTAP_MODE)},
392-
{ MP_OBJ_NEW_QSTR(MP_QSTR_STA_AP_MODE),
393-
MP_OBJ_NEW_SMALL_INT(STATIONAP_MODE)},
381+
{ MP_ROM_QSTR(MP_QSTR_SLEEP_NONE), MP_ROM_INT(NONE_SLEEP_T) },
382+
{ MP_ROM_QSTR(MP_QSTR_SLEEP_LIGHT), MP_ROM_INT(LIGHT_SLEEP_T) },
383+
{ MP_ROM_QSTR(MP_QSTR_SLEEP_MODEM), MP_ROM_INT(MODEM_SLEEP_T) },
394384
#endif
395385
};
396386

‎esp8266/modmachine.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -193,12 +193,12 @@ STATIC mp_obj_t esp_timer_deinit(mp_obj_t self_in) {
193193
}
194194
STATIC MP_DEFINE_CONST_FUN_OBJ_1(esp_timer_deinit_obj, esp_timer_deinit);
195195

196-
STATIC const mp_map_elem_t esp_timer_locals_dict_table[] = {
197-
{ MP_OBJ_NEW_QSTR(MP_QSTR_deinit), (mp_obj_t)&esp_timer_deinit_obj },
198-
{ MP_OBJ_NEW_QSTR(MP_QSTR_init), (mp_obj_t)&esp_timer_init_obj },
199-
// { MP_OBJ_NEW_QSTR(MP_QSTR_callback), (mp_obj_t)&esp_timer_callback_obj },
200-
{ MP_OBJ_NEW_QSTR(MP_QSTR_ONE_SHOT), MP_OBJ_NEW_SMALL_INT(false) },
201-
{ MP_OBJ_NEW_QSTR(MP_QSTR_PERIODIC), MP_OBJ_NEW_SMALL_INT(true) },
196+
STATIC const mp_rom_map_elem_t esp_timer_locals_dict_table[] = {
197+
{ MP_ROM_QSTR(MP_QSTR_deinit), MP_ROM_PTR(&esp_timer_deinit_obj) },
198+
{ MP_ROM_QSTR(MP_QSTR_init), MP_ROM_PTR(&esp_timer_init_obj) },
199+
// { MP_ROM_QSTR(MP_QSTR_callback), MP_ROM_PTR(&esp_timer_callback_obj) },
200+
{ MP_ROM_QSTR(MP_QSTR_ONE_SHOT), MP_ROM_INT(false) },
201+
{ MP_ROM_QSTR(MP_QSTR_PERIODIC), MP_ROM_INT(true) },
202202
};
203203
STATIC MP_DEFINE_CONST_DICT(esp_timer_locals_dict, esp_timer_locals_dict_table);
204204

@@ -207,7 +207,7 @@ const mp_obj_type_t esp_timer_type = {
207207
.name = MP_QSTR_Timer,
208208
.print = esp_timer_print,
209209
.make_new = esp_timer_make_new,
210-
.locals_dict = (mp_obj_t)&esp_timer_locals_dict,
210+
.locals_dict = (mp_obj_dict_t*)&esp_timer_locals_dict,
211211
};
212212

213213
// this bit is unused in the Xtensa PS register

‎esp8266/modnetwork.c

Lines changed: 34 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* The MIT License (MIT)
55
*
6-
* Copyright (c) 2015 Paul Sokolovsky
6+
* Copyright (c) 2015-2016 Paul Sokolovsky
77
*
88
* Permission is hereby granted, free of charge, to any person obtaining a copy
99
* of this software and associated documentation files (the "Software"), to deal
@@ -427,23 +427,23 @@ STATIC mp_obj_t esp_config(size_t n_args, const mp_obj_t *args, mp_map_t *kwargs
427427
}
428428
STATIC MP_DEFINE_CONST_FUN_OBJ_KW(esp_config_obj, 1, esp_config);
429429

430-
STATIC const mp_map_elem_t wlan_if_locals_dict_table[] = {
431-
{ MP_OBJ_NEW_QSTR(MP_QSTR_active), (mp_obj_t)&esp_active_obj },
432-
{ MP_OBJ_NEW_QSTR(MP_QSTR_connect), (mp_obj_t)&esp_connect_obj },
433-
{ MP_OBJ_NEW_QSTR(MP_QSTR_disconnect), (mp_obj_t)&esp_disconnect_obj },
434-
{ MP_OBJ_NEW_QSTR(MP_QSTR_status), (mp_obj_t)&esp_status_obj },
435-
{ MP_OBJ_NEW_QSTR(MP_QSTR_scan), (mp_obj_t)&esp_scan_obj },
436-
{ MP_OBJ_NEW_QSTR(MP_QSTR_isconnected), (mp_obj_t)&esp_isconnected_obj },
437-
{ MP_OBJ_NEW_QSTR(MP_QSTR_config), (mp_obj_t)&esp_config_obj },
438-
{ MP_OBJ_NEW_QSTR(MP_QSTR_ifconfig), (mp_obj_t)&esp_ifconfig_obj },
430+
STATIC const mp_rom_map_elem_t wlan_if_locals_dict_table[] = {
431+
{ MP_ROM_QSTR(MP_QSTR_active), MP_ROM_PTR(&esp_active_obj) },
432+
{ MP_ROM_QSTR(MP_QSTR_connect), MP_ROM_PTR(&esp_connect_obj) },
433+
{ MP_ROM_QSTR(MP_QSTR_disconnect), MP_ROM_PTR(&esp_disconnect_obj) },
434+
{ MP_ROM_QSTR(MP_QSTR_status), MP_ROM_PTR(&esp_status_obj) },
435+
{ MP_ROM_QSTR(MP_QSTR_scan), MP_ROM_PTR(&esp_scan_obj) },
436+
{ MP_ROM_QSTR(MP_QSTR_isconnected), MP_ROM_PTR(&esp_isconnected_obj) },
437+
{ MP_ROM_QSTR(MP_QSTR_config), MP_ROM_PTR(&esp_config_obj) },
438+
{ MP_ROM_QSTR(MP_QSTR_ifconfig), MP_ROM_PTR(&esp_ifconfig_obj) },
439439
};
440440

441441
STATIC MP_DEFINE_CONST_DICT(wlan_if_locals_dict, wlan_if_locals_dict_table);
442442

443443
const mp_obj_type_t wlan_if_type = {
444444
{ &mp_type_type },
445445
.name = MP_QSTR_WLAN,
446-
.locals_dict = (mp_obj_t)&wlan_if_locals_dict,
446+
.locals_dict = (mp_obj_dict_t*)&wlan_if_locals_dict,
447447
};
448448

449449
STATIC mp_obj_t esp_phy_mode(mp_uint_t n_args, const mp_obj_t *args) {
@@ -456,47 +456,31 @@ STATIC mp_obj_t esp_phy_mode(mp_uint_t n_args, const mp_obj_t *args) {
456456
}
457457
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(esp_phy_mode_obj, 0, 1, esp_phy_mode);
458458

459-
STATIC const mp_map_elem_t mp_module_network_globals_table[] = {
460-
{ MP_OBJ_NEW_QSTR(MP_QSTR___name__), MP_OBJ_NEW_QSTR(MP_QSTR_network) },
461-
{ MP_OBJ_NEW_QSTR(MP_QSTR_WLAN), (mp_obj_t)&get_wlan_obj },
462-
{ MP_OBJ_NEW_QSTR(MP_QSTR_phy_mode), (mp_obj_t)&esp_phy_mode_obj },
459+
STATIC const mp_rom_map_elem_t mp_module_network_globals_table[] = {
460+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_network) },
461+
{ MP_ROM_QSTR(MP_QSTR_WLAN), MP_ROM_PTR(&get_wlan_obj) },
462+
{ MP_ROM_QSTR(MP_QSTR_phy_mode), MP_ROM_PTR(&esp_phy_mode_obj) },
463463

464464
#if MODNETWORK_INCLUDE_CONSTANTS
465-
{ MP_OBJ_NEW_QSTR(MP_QSTR_STA_IF),
466-
MP_OBJ_NEW_SMALL_INT(STATION_IF)},
467-
{ MP_OBJ_NEW_QSTR(MP_QSTR_AP_IF),
468-
MP_OBJ_NEW_SMALL_INT(SOFTAP_IF)},
469-
470-
{ MP_OBJ_NEW_QSTR(MP_QSTR_STAT_IDLE),
471-
MP_OBJ_NEW_SMALL_INT(STATION_IDLE)},
472-
{ MP_OBJ_NEW_QSTR(MP_QSTR_STAT_CONNECTING),
473-
MP_OBJ_NEW_SMALL_INT(STATION_CONNECTING)},
474-
{ MP_OBJ_NEW_QSTR(MP_QSTR_STAT_WRONG_PASSWORD),
475-
MP_OBJ_NEW_SMALL_INT(STATION_WRONG_PASSWORD)},
476-
{ MP_OBJ_NEW_QSTR(MP_QSTR_STAT_NO_AP_FOUND),
477-
MP_OBJ_NEW_SMALL_INT(STATION_NO_AP_FOUND)},
478-
{ MP_OBJ_NEW_QSTR(MP_QSTR_STAT_CONNECT_FAIL),
479-
MP_OBJ_NEW_SMALL_INT(STATION_CONNECT_FAIL)},
480-
{ MP_OBJ_NEW_QSTR(MP_QSTR_STAT_GOT_IP),
481-
MP_OBJ_NEW_SMALL_INT(STATION_GOT_IP)},
482-
483-
{ MP_OBJ_NEW_QSTR(MP_QSTR_MODE_11B),
484-
MP_OBJ_NEW_SMALL_INT(PHY_MODE_11B) },
485-
{ MP_OBJ_NEW_QSTR(MP_QSTR_MODE_11G),
486-
MP_OBJ_NEW_SMALL_INT(PHY_MODE_11G) },
487-
{ MP_OBJ_NEW_QSTR(MP_QSTR_MODE_11N),
488-
MP_OBJ_NEW_SMALL_INT(PHY_MODE_11N) },
489-
490-
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_OPEN),
491-
MP_OBJ_NEW_SMALL_INT(AUTH_OPEN) },
492-
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WEP),
493-
MP_OBJ_NEW_SMALL_INT(AUTH_WEP) },
494-
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WPA_PSK),
495-
MP_OBJ_NEW_SMALL_INT(AUTH_WPA_PSK) },
496-
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WPA2_PSK),
497-
MP_OBJ_NEW_SMALL_INT(AUTH_WPA2_PSK) },
498-
{ MP_OBJ_NEW_QSTR(MP_QSTR_AUTH_WPA_WPA2_PSK),
499-
MP_OBJ_NEW_SMALL_INT(AUTH_WPA_WPA2_PSK) },
465+
{ MP_ROM_QSTR(MP_QSTR_STA_IF), MP_ROM_INT(STATION_IF)},
466+
{ MP_ROM_QSTR(MP_QSTR_AP_IF), MP_ROM_INT(SOFTAP_IF)},
467+
468+
{ MP_ROM_QSTR(MP_QSTR_STAT_IDLE), MP_ROM_INT(STATION_IDLE)},
469+
{ MP_ROM_QSTR(MP_QSTR_STAT_CONNECTING), MP_ROM_INT(STATION_CONNECTING)},
470+
{ MP_ROM_QSTR(MP_QSTR_STAT_WRONG_PASSWORD), MP_ROM_INT(STATION_WRONG_PASSWORD)},
471+
{ MP_ROM_QSTR(MP_QSTR_STAT_NO_AP_FOUND), MP_ROM_INT(STATION_NO_AP_FOUND)},
472+
{ MP_ROM_QSTR(MP_QSTR_STAT_CONNECT_FAIL), MP_ROM_INT(STATION_CONNECT_FAIL)},
473+
{ MP_ROM_QSTR(MP_QSTR_STAT_GOT_IP), MP_ROM_INT(STATION_GOT_IP)},
474+
475+
{ MP_ROM_QSTR(MP_QSTR_MODE_11B), MP_ROM_INT(PHY_MODE_11B) },
476+
{ MP_ROM_QSTR(MP_QSTR_MODE_11G), MP_ROM_INT(PHY_MODE_11G) },
477+
{ MP_ROM_QSTR(MP_QSTR_MODE_11N), MP_ROM_INT(PHY_MODE_11N) },
478+
479+
{ MP_ROM_QSTR(MP_QSTR_AUTH_OPEN), MP_ROM_INT(AUTH_OPEN) },
480+
{ MP_ROM_QSTR(MP_QSTR_AUTH_WEP), MP_ROM_INT(AUTH_WEP) },
481+
{ MP_ROM_QSTR(MP_QSTR_AUTH_WPA_PSK), MP_ROM_INT(AUTH_WPA_PSK) },
482+
{ MP_ROM_QSTR(MP_QSTR_AUTH_WPA2_PSK), MP_ROM_INT(AUTH_WPA2_PSK) },
483+
{ MP_ROM_QSTR(MP_QSTR_AUTH_WPA_WPA2_PSK), MP_ROM_INT(AUTH_WPA_WPA2_PSK) },
500484
#endif
501485
};
502486

‎extmod/machine_signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ STATIC mp_obj_t signal_make_new(const mp_obj_type_t *type, size_t n_args, size_t
9696
if (n_args == 1) {
9797
if (n_kw == 0) {
9898
} else if (n_kw == 1 && args[1] == MP_OBJ_NEW_QSTR(MP_QSTR_invert)) {
99-
invert = mp_obj_is_true(args[1]);
99+
invert = mp_obj_is_true(args[2]);
100100
} else {
101101
goto error;
102102
}

0 commit comments

Comments
 (0)
0