8000 Merge pull request #13 from kwagyeman/openmv · WeActStudio/micropython@38ddfd4 · GitHub
[go: up one dir, main page]
Skip to content

Commit 38ddfd4

Browse files
iabdalkaderiabdalkader
committed
Merge pull request micropython#13 from kwagyeman/openmv
Rename MLX module and add qstrings.
2 parents 7cd9a14 + 80733e7 commit 38ddfd4

File tree

2 files changed

+21
-31
lines changed

2 files changed

+21
-31
lines changed

‎stmhal/mpconfigport.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ extern const struct _mp_obj_module_t mp_module_network;
109109
extern const struct _mp_obj_module_t time_module;
110110
extern const struct _mp_obj_module_t sensor_module;
111111
extern const struct _mp_obj_module_t image_module;
112+
extern const struct _mp_obj_module_t lcd_module;
113+
extern const struct _mp_obj_module_t flir_module;
112114
extern const struct _mp_obj_module_t gif_module;
113115
extern const struct _mp_obj_module_t mjpeg_module;
114-
extern const struct _mp_obj_module_t lcd_module;
115-
extern const struct _mp_obj_module_t mlx_module;
116116

117117
#define MICROPY_PORT_BUILTIN_MODULES \
118118
{ MP_OBJ_NEW_QSTR(MP_QSTR_pyb), (mp_obj_t)&pyb_module }, \
@@ -125,10 +125,10 @@ extern const struct _mp_obj_module_t mlx_module;
125125
{ MP_OBJ_NEW_QSTR(MP_QSTR_time), (mp_obj_t)&time_module }, \
126126
{ MP_OBJ_NEW_QSTR(MP_QSTR_sensor), (mp_obj_t)&sensor_module }, \
127127
{ MP_OBJ_NEW_QSTR(MP_QSTR_image), (mp_obj_t)&image_module }, \
128+
{ MP_OBJ_NEW_QSTR(MP_QSTR_lcd), (mp_obj_t)&lcd_module }, \
129+
{ MP_OBJ_NEW_QSTR(MP_QSTR_flir), (mp_obj_t)&flir_module }, \
128130
{ MP_OBJ_NEW_QSTR(MP_QSTR_gif), (mp_obj_t)&gif_module }, \
129131
{ MP_OBJ_NEW_QSTR(MP_QSTR_mjpeg), (mp_obj_t)&mjpeg_module }, \
130-
{ MP_OBJ_NEW_QSTR(MP_QSTR_lcd), (mp_obj_t)&lcd_module }, \
131-
{ MP_OBJ_NEW_QSTR(MP_QSTR_mlx), (mp_obj_t)&mlx_module },
132132

133133
#define MICROPY_PORT_BUILTIN_MODULE_WEAK_LINKS \
134134
{ MP_OBJ_NEW_QSTR(MP_QSTR_os), (mp_obj_t)&mp_module_uos }, \

‎stmhal/qstrdefsport.h

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,6 @@ Q(lbp_desc)
766766
Q(Cascade)
767767
Q(blit)
768768
Q(blend)
769-
Q(scale)
770769
Q(scaled)
771770
Q(subimg)
772771
Q(compress)
@@ -800,26 +799,34 @@ Q(load_descriptor)
800799
Q(save_descriptor)
801800
Q(match_descriptor)
802801

802+
// Lcd Module
803+
Q(lcd)
804+
Q(type)
805+
Q(set_backlight)
806+
Q(get_backlight)
807+
Q(display)
808+
Q(clear)
809+
810+
// Flir Module
811+
Q(flir)
812+
Q(read_ta)
813+
Q(read_ir)
814+
Q(display_ta)
815+
Q(display_ir)
816+
Q(alpha)
817+
Q(scale)
818+
803819
// Gif module
804820
Q(gif)
805821
Q(Gif)
806822
Q(open)
807823
Q(add_frame)
808-
Q(close)
809824
Q(loop)
810825

811826
// Mjpeg module
812827
Q(mjpeg)
813828
Q(Mjpeg)
814829

815-
// Lcd Module
816-
Q(lcd)
817-
Q(type)
818-
Q(set_backlight)
819-
Q(get_backlight)
820-
Q(display)
821-
Q(clear)
822-
823830
// Led Module
824831
Q(led)
825832
Q(RED)
@@ -958,20 +965,3 @@ Q(IPPROTO_TCP)
958965
Q(IPPROTO_UDP)
959966
Q(IPPROTO_IPV6)
960967
Q(IPPROTO_RAW)
961-
962-
// MLX90620
963-
Q(mlx)
964-
Q(init)
965-
Q(read_ta)
966-
Q(read_ir)
967-
Q(read_raw)
968-
Q(RAINBOW)
969-
Q(GRAYSCALE)
970-
Q(GRAYSCALE)
971-
Q(IR_REFRESH_8HZ)
972-
Q(IR_REFRESH_16HZ)
973-
Q(IR_REFRESH_32HZ)
974-
Q(IR_REFRESH_64HZ)
975-
Q(IR_REFRESH_128HZ)
976-
Q(IR_REFRESH_256HZ)
977-
Q(IR_REFRESH_512HZ)

0 commit comments

Comments
 (0)
0