Skip to content

Commit d314df8

Browse files
microdev1microdev1
authored
Merge pull request #5274 from capellini/mp-register-module-pybadge-remaining
Convert more modules to use MP_REGISTER_MODULE
2 parents 513ca09 + 1c88282 commit d314df8

File tree

24 files changed

+69
-177
lines changed

24 files changed

+69
-177
lines changed

‎py/circuitpy_mpconfig.h

Lines changed: 23 additions & 177 deletions
Original file line numberDiff line numberDiff line change
@@ -374,13 +374,7 @@ extern const struct _mp_obj_module_t _eve_module;
374374
#endif
375375

376376
// CIRCUITPY_FRAMEBUFFERIO uses MP_REGISTER_MODULE
377-
378-
#if CIRCUITPY_VECTORIO
379-
extern const struct _mp_obj_module_t vectorio_module;
380-
#define VECTORIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_vectorio), (mp_obj_t)&vectorio_module },
381-
#else
382-
#define VECTORIO_MODULE
383-
#endif
377+
// CIRCUITPY_VECTORIO uses MP_REGISTER_MODULE
384378

385379
// CIRCUITPY_FREQUENCYIO uses MP_REGISTER_MODULE
386380
// CIRCUITPY_GAMEPADSHIFT uses MP_REGISTER_MODULE
@@ -456,25 +450,14 @@ extern const struct _mp_obj_module_t memorymonitor_module;
456450
#endif
457451

458452
// CIRCUITPY_MICROCONTROLLER uses MP_REGISTER_MODULE
459-
460-
#if CIRCUITPY_NEOPIXEL_WRITE
461-
extern const struct _mp_obj_module_t neopixel_write_module;
462-
#define NEOPIXEL_WRITE_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_neopixel_write),(mp_obj_t)&neopixel_write_module },
463-
#else
464-
#define NEOPIXEL_WRITE_MODULE
465-
#endif
453+
// CIRCUITPY_NEOPIXEL_WRITE uses MP_REGISTER_MODULE
466454

467455
// This is not a top-level module; it's microcontroller.nvm.
468456
#if CIRCUITPY_NVM
469457
extern const struct _mp_obj_module_t nvm_module;
470458
#endif
471459

472-
#if CIRCUITPY_ONEWIREIO
473-
extern const struct _mp_obj_module_t onewireio_module;
474-
#define ONEWIREIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_onewireio), (mp_obj_t)&onewireio_module },
475-
#else
476-
#define ONEWIREIO_MODULE
477-
#endif
460+
// CIRCUITPY_ONEWIREIO_WRITE uses MP_REGISTER_MODULE
478461

479462
#if CIRCUITPY_OS
480463
extern const struct _mp_obj_module_t os_module;
@@ -493,43 +476,12 @@ extern const struct _mp_obj_module_t pew_module;
493476
#endif
494477

495478
// CIRCUITPY_PIXELBUF (pixelbuf_module) uses MP_REGISTER_MODULE
496-
497-
#if CIRCUITPY_PS2IO
498-
extern const struct _mp_obj_module_t ps2io_module;
499-
#define PS2IO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_ps2io), (mp_obj_t)&ps2io_module },
500-
#else
501-
#define PS2IO_MODULE
502-
#endif
503-
504-
#if CIRCUITPY_PULSEIO
505-
extern const struct _mp_obj_module_t pulseio_module;
506-
#define PULSEIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_pulseio), (mp_obj_t)&pulseio_module },
507-
#else
508-
#define PULSEIO_MODULE
509-
#endif
510-
511-
#if CIRCUITPY_PWMIO
512-
extern const struct _mp_obj_module_t pwmio_module;
513-
#define PWMIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_pwmio), (mp_obj_t)&pwmio_module },
514-
#else
515-
#define PWMIO_MODULE
516-
#endif
517-
479+
// CIRCUITPY_PS2IO uses MP_REGISTER_MODULE
480+
// CIRCUITPY_PULSEIO uses MP_REGISTER_MODULE
481+
// CIRCUITPY_PWMIO uses MP_REGISTER_MODULE
518482
// CIRCUITPY_QRIO uses MP_REGISTER_MODULE
519-
520-
#if CIRCUITPY_RAINBOWIO
521-
extern const struct _mp_obj_module_t rainbowio_module;
522-
#define RAINBOWIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_rainbowio), (mp_obj_t)&rainbowio_module },
523-
#else
524-
#define RAINBOWIO_MODULE
525-
#endif
526-
527-
#if CIRCUITPY_RANDOM
528-
extern const struct _mp_obj_module_t random_module;
529-
#define RANDOM_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_random), (mp_obj_t)&random_module },
530-
#else
531-
#define RANDOM_MODULE
532-
#endif
483+
// CIRCUITPY_RAINBOWIO uses MP_REGISTER_MODULE
484+
// CIRCUITPY_RANDOM uses MP_REGISTER_MODULE
533485

534486
#if CIRCUITPY_RE
535487
#define MICROPY_PY_URE (1)
@@ -538,19 +490,8 @@ extern const struct _mp_obj_module_t random_module;
538490
#define RE_MODULE
539491
#endif
540492

541-
#if CIRCUITPY_RGBMATRIX
542-
extern const struct _mp_obj_module_t rgbmatrix_module;
543-
#define RGBMATRIX_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_rgbmatrix),(mp_obj_t)&rgbmatrix_module },
544-
#else
545-
#define RGBMATRIX_MODULE
546-
#endif
547-
548-
#if CIRCUITPY_ROTARYIO
549-
extern const struct _mp_obj_module_t rotaryio_module;
550-
#define ROTARYIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_rotaryio), (mp_obj_t)&rotaryio_module },
551-
#else
552-
#define ROTARYIO_MODULE
553-
#endif
493+
// CIRCUITPY_RGBMATRIX uses MP_REGISTER_MODULE
494+
// CIRCUITPY_ROTARYIO uses MP_REGISTER_MODULE
554495

555496
#if CIRCUITPY_RP2PIO
556497
extern const struct _mp_obj_module_t rp2pio_module;
@@ -559,12 +500,7 @@ extern const struct _mp_obj_module_t rp2pio_module;
559500
#define RP2PIO_MODULE
560501
#endif
561502

562-
#if CIRCUITPY_RTC
563-
extern const struct _mp_obj_module_t rtc_module;
564-
#define RTC_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_rtc), (mp_obj_t)&rtc_module },
565-
#else
566-
#define RTC_MODULE
567-
#endif
503+
// CIRCUITPY_RTC uses MP_REGISTER_MODULE
568504

569505
#if CIRCUITPY_SAMD
570506
extern const struct _mp_obj_module_t samd_module;
@@ -573,12 +509,7 @@ extern const struct _mp_obj_module_t samd_module;
573509
#define SAMD_MODULE
574510
#endif
575511

576-
#if CIRCUITPY_SDCARDIO
577-
extern const struct _mp_obj_module_t sdcardio_module;
578-
#define SDCARDIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_sdcardio), (mp_obj_t)&sdcardio_module },
579-
#else
580-
#define SDCARDIO_MODULE
581-
#endif
512+
// CIRCUITPY_SDCARDIO uses MP_REGISTER_MODULE
582513

583514
#if CIRCUITPY_SDIOIO
584515
extern const struct _mp_obj_module_t sdioio_module;
@@ -587,12 +518,7 @@ extern const struct _mp_obj_module_t sdioio_module;
587518
#define SDIOIO_MODULE
588519
#endif
589520

590-
#if CIRCUITPY_SHARPDISPLAY
591-
extern const struct _mp_obj_module_t sharpdisplay_module;
592-
#define SHARPDISPLAY_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_sharpdisplay),(mp_obj_t)&sharpdisplay_module },
593-
#else
594-
#define SHARPDISPLAY_MODULE
595-
#endif
521+
// CIRCUITPY_SHARPDISPLAY uses MP_REGISTER_MODULE
596522

597523
#if CIRCUITPY_SOCKETPOOL
598524
extern const struct _mp_obj_module_t socketpool_module;
@@ -608,40 +534,11 @@ extern const struct _mp_obj_module_t ssl_module;
608534
#define SSL_MODULE
609535
#endif
610536

611-
#if CIRCUITPY_STAGE
612-
extern const struct _mp_obj_module_t stage_module;
613-
#define STAGE_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR__stage), (mp_obj_t)&stage_module },
614-
#else
615-
#define STAGE_MODULE
616-
#endif
617-
618-
#if CIRCUITPY_STORAGE
619-
extern const struct _mp_obj_module_t storage_module;
620-
#define STORAGE_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_storage), (mp_obj_t)&storage_module },
621-
#else
622-
#define STORAGE_MODULE
623-
#endif
624-
625-
#if CIRCUITPY_STRUCT
626-
extern const struct _mp_obj_module_t struct_module;
627-
#define STRUCT_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_struct), (mp_obj_t)&struct_module },
628-
#else
629-
#define STRUCT_MODULE
630-
#endif
631-
632-
#if CIRCUITPY_SUPERVISOR
633-
extern const struct _mp_obj_module_t supervisor_module;
634-
#define SUPERVISOR_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_supervisor), (mp_obj_t)&supervisor_module },
635-
#else
636-
#define SUPERVISOR_MODULE
637-
#endif
638-
639-
#if CIRCUITPY_SYNTHIO
640-
#define SYNTHIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_synthio), (mp_obj_t)&synthio_module },
641-
extern const struct _mp_obj_module_t synthio_module;
642-
#else
643-
#define SYNTHIO_MODULE
644-
#endif
537+
// CIRCUITPY_STAGE uses MP_REGISTER_MODULE
538+
// CIRCUITPY_STORAGE uses MP_REGISTER_MODULE
539+
// CIRCUITPY_STRUCT uses MP_REGISTER_MODULE
540+
// CIRCUITPY_SUPERVISOR uses MP_REGISTER_MODULE
541+
// CIRCUITPY_SYNTHIO uses MP_REGISTER_MODULE
645542

646543
#if CIRCUITPY_TIME
647544
extern const struct _mp_obj_module_t time_module;
@@ -652,19 +549,8 @@ extern const struct _mp_obj_module_t time_module;
652549
#define TIME_MODULE_ALT_NAME
653550
#endif
654551

655-
#if CIRCUITPY_TOUCHIO
656-
extern const struct _mp_obj_module_t touchio_module;
657-
#define TOUCHIO_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_touchio), (mp_obj_t)&touchio_module },
658-
#else
659-
#define TOUCHIO_MODULE
660-
#endif
661-
662-
#if CIRCUITPY_TRACEBACK
663-
extern const struct _mp_obj_module_t traceback_module;
664-
#define TRACEBACK_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_traceback), (mp_obj_t)&traceback_module },
665-
#else
666-
#define TRACEBACK_MODULE
667-
#endif
552+
// CIRCUITPY_TOUCHIO uses MP_REGISTER_MODULE
553+
// CIRCUITPY_TRACEBACK uses MP_REGISTER_MODULE
668554

669555
#if CIRCUITPY_UHEAP
670556
extern const struct _mp_obj_module_t uheap_module;
@@ -673,26 +559,9 @@ extern const struct _mp_obj_module_t uheap_module;
673559
#define UHEAP_MODULE
674560
#endif
675561

676-
#if CIRCUITPY_USB_CDC
677-
extern const struct _mp_obj_module_t usb_cdc_module;
678-
#define USB_CDC_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_usb_cdc),(mp_obj_t)&usb_cdc_module },
679-
#else
680-
#define USB_CDC_MODULE
681-
#endif
682-
683-
#if CIRCUITPY_USB_HID
684-
extern const struct _mp_obj_module_t usb_hid_module;
685-
#define USB_HID_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_usb_hid),(mp_obj_t)&usb_hid_module },
686-
#else
687-
#define USB_HID_MODULE
688-
#endif
689-
690-
#if CIRCUITPY_USB_MIDI
691-
extern const struct _mp_obj_module_t usb_midi_module;
692-
#define USB_MIDI_MODULE { MP_OBJ_NEW_QSTR(MP_QSTR_usb_midi),(mp_obj_t)&usb_midi_module },
693-
#else
694-
#define USB_MIDI_MODULE
695-
#endif
562+
// CIRCUITPY_USB_CDC uses MP_REGISTER_MODULE
563+
// CIRCUITPY_USB_HID uses MP_REGISTER_MODULE
564+
// CIRCUITPY_USB_MIDI uses MP_REGISTER_MODULE
696565

697566
#if CIRCUITPY_USTACK
698567
extern const struct _mp_obj_module_t ustack_module;
@@ -756,7 +625,6 @@ extern const struct _mp_obj_module_t wifi_module;
756625
CAMERA_MODULE \
757626
CANIO_MODULE \
758627
DUALBANK_MODULE \
759-
VECTORIO_MODULE \
760628
ERRNO_MODULE \
761629
ESPIDF_MODULE \
762630
_EVE_MODULE \
@@ -766,36 +634,14 @@ extern const struct _mp_obj_module_t wifi_module;
766634
IMAGECAPTURE_MODULE \
767635
JSON_MODULE \
768636
MEMORYMONITOR_MODULE \
769-
NEOPIXEL_WRITE_MODULE \
770-
ONEWIREIO_MODULE \
771637
PEW_MODULE \
772-
PS2IO_MODULE \
773-
PULSEIO_MODULE \
774-
PWMIO_MODULE \
775-
RAINBOWIO_MODULE \
776-
RANDOM_MODULE \
777638
RE_MODULE \
778-
RGBMATRIX_MODULE \
779-
ROTARYIO_MODULE \
780639
RP2PIO_MODULE \
781-
RTC_MODULE \
782640
SAMD_MODULE \
783-
SDCARDIO_MODULE \
784641
SDIOIO_MODULE \
785-
SHARPDISPLAY_MODULE \
786642
SOCKETPOOL_MODULE \
787643
SSL_MODULE \
788-
STAGE_MODULE \
789-
STORAGE_MODULE \
790-
STRUCT_MODULE \
791-
SUPERVISOR_MODULE \
792-
SYNTHIO_MODULE \
793-
TOUCHIO_MODULE \
794-
TRACEBACK_MODULE \
795644
UHEAP_MODULE \
796-
USB_CDC_MODULE \
797-
USB_HID_MODULE \
798-
USB_MIDI_MODULE \
799645
USTACK_MODULE \
800646
WATCHDOG_MODULE \
801647
WIFI_MODULE \

‎shared-bindings/_stage/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,5 @@ const mp_obj_module_t stage_module = {
111111
.base = { &mp_type_module },
112112
.globals = (mp_obj_dict_t *)&stage_module_globals,
113113
};
114+
115+
MP_REGISTER_MODULE(MP_QSTR__stage, stage_module, CIRCUITPY_STAGE);

‎shared-bindings/neopixel_write/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,5 @@ const mp_obj_module_t neopixel_write_module = {
8181
.base = { &mp_type_module },
8282
.globals = (mp_obj_dict_t *)&neopixel_write_module_globals,
8383
};
84+
85+
MP_REGISTER_MODULE(MP_QSTR_neopixel_write, neopixel_write_module, CIRCUITPY_NEOPIXEL_WRITE);

‎shared-bindings/onewireio/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,5 @@ const mp_obj_module_t onewireio_module = {
5151
.base = { &mp_type_module },
5252
.globals = (mp_obj_dict_t *)&onewireio_module_globals,
5353
};
54+
55+
MP_REGISTER_MODULE(MP_QSTR_onewireio, onewireio_module, CIRCUITPY_ONEWIREIO);

‎shared-bindings/ps2io/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,5 @@ const mp_obj_module_t ps2io_module = {
5959
.base = { &mp_type_module },
6060
.globals = (mp_obj_dict_t *)&ps2io_module_globals,
6161
};
62+
63+
MP_REGISTER_MODULE(MP_QSTR_ps2io, ps2io_module, CIRCUITPY_PS2IO);

‎shared-bindings/pulseio/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,5 @@ const mp_obj_module_t pulseio_module = {
5858
.base = { &mp_type_module },
5959
.globals = (mp_obj_dict_t *)&pulseio_module_globals,
6060
};
61+
62+
MP_REGISTER_MODULE(MP_QSTR_pulseio, pulseio_module, CIRCUITPY_PULSEIO);

‎shared-bindings/pwmio/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,3 +71,5 @@ const mp_obj_module_t pwmio_module = {
7171
.base = { &mp_type_module },
7272
.globals = (mp_obj_dict_t *)&pwmio_module_globals,
7373
};
74+
75+
MP_REGISTER_MODULE(MP_QSTR_pwmio, pwmio_module, CIRCUITPY_PWMIO);

‎shared-bindings/rainbowio/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,5 @@ const mp_obj_module_t rainbowio_module = {
5252
.base = { &mp_type_module },
5353
.globals = (mp_obj_dict_t *)&rainbowio_module_globals,
5454
};
55+
56+
MP_REGISTER_MODULE(MP_QSTR_rainbowio, rainbowio_module, CIRCUITPY_RAINBOWIO);

‎shared-bindings/random/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,5 @@ const mp_obj_module_t random_module = {
184184
.base = { &mp_type_module },
185185
.globals = (mp_obj_dict_t *)&mp_module_random_globals,
186186
};
187+
188+
MP_REGISTER_MODULE(MP_QSTR_random, random_module, CIRCUITPY_RANDOM);

‎shared-bindings/rgbmatrix/__init__.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,5 @@ const mp_obj_module_t rgbmatrix_module = {
4545
.base = { &mp_type_module },
4646
.globals = (mp_obj_dict_t *)&rgbmatrix_module_globals,
4747
};
48+
49+
MP_REGISTER_MODULE(MP_QSTR_rgbmatrix, rgbmatrix_module, CIRCUITPY_RGBMATRIX);

0 commit comments

Comments
 (0)