Skip to content

Commit 2bc9a9e

Browse files
imliuboimliubo
committed
add code format script and clean code
code format rule follow the micropython upstream
1 parent 1fda504 commit 2bc9a9e

File tree

5 files changed

+3409
-149
lines changed

5 files changed

+3409
-149
lines changed

‎m5stack/cmodules/m5unified/m5unified.c

Lines changed: 143 additions & 144 deletions
Original file line numberDiff line numberDiff line change
@@ -1,186 +1,185 @@
11
#include <mpy_m5unified.h>
22

3+
/* *FORMAT-OFF* */
34
#define MAKE_METHOD_V(prefix, func, arg_min, arg_max) extern mp_obj_t prefix##_##func(size_t,const mp_obj_t*); STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN( prefix##_##func##_obj, arg_min, arg_max, prefix##_##func );
45
#define MAKE_METHOD_0(prefix, func) extern mp_obj_t prefix##_##func(mp_obj_t ); STATIC MP_DEFINE_CONST_FUN_OBJ_1( prefix##_##func##_obj, prefix##_##func );
56
#define MAKE_METHOD_1(prefix, func) extern mp_obj_t prefix##_##func(mp_obj_t,mp_obj_t ); STATIC MP_DEFINE_CONST_FUN_OBJ_2( prefix##_##func##_obj, prefix##_##func );
67
#define MAKE_METHOD_2(prefix, func) extern mp_obj_t prefix##_##func(mp_obj_t,mp_obj_t,mp_obj_t); STATIC MP_DEFINE_CONST_FUN_OBJ_3( prefix##_##func##_obj, prefix##_##func );
78
#define MAKE_METHOD_KW(prefix, func, args) extern mp_obj_t prefix##_##func(size_t,const mp_obj_t*,mp_map_t*); STATIC MP_DEFINE_CONST_FUN_OBJ_KW( prefix##_##func##_obj, args, prefix##_##func );
8-
9-
#define MAKE_TABLE( prefix, func ) \
10-
{ MP_ROM_QSTR(MP_QSTR_##func), MP_ROM_PTR(&prefix##_##func##_obj) }
11-
12-
//-------- GFX common wrapper
13-
MAKE_METHOD_0( gfx, width );
14-
MAKE_METHOD_0( gfx, height );
15-
MAKE_METHOD_0( gfx, getRotation );
16-
MAKE_METHOD_0( gfx, getColorDepth);
17-
MAKE_METHOD_0( gfx, getCursor );
18-
MAKE_METHOD_1( gfx, setRotation );
19-
MAKE_METHOD_1( gfx, setColorDepth);
20-
MAKE_METHOD_1( gfx, setFont );
21-
MAKE_METHOD_1( gfx, print );
22-
MAKE_METHOD_2( gfx, setCursor );
23-
MAKE_METHOD_V( gfx, clear , 1, 2 );
24-
MAKE_METHOD_V( gfx, fillScreen , 1, 2 );
25-
MAKE_METHOD_V( gfx, drawPixel , 3, 4 );
26-
MAKE_METHOD_V( gfx, drawCircle , 4, 5 );
27-
MAKE_METHOD_V( gfx, fillCircle , 4, 5 );
28-
MAKE_METHOD_V( gfx, drawLine , 5, 6 );
29-
MAKE_METHOD_V( gfx, drawRect , 5, 6 );
30-
MAKE_METHOD_V( gfx, fillRect , 5, 6 );
31-
MAKE_METHOD_V( gfx, drawRoundRect, 6, 7 );
32-
MAKE_METHOD_V( gfx, fillRoundRect, 6, 7 );
33-
MAKE_METHOD_V( gfx, printf , 2, 32);
34-
MAKE_METHOD_V( gfx, newCanvas , 3, 5 );
9+
/* *FORMAT-ON* */
10+
11+
#define MAKE_TABLE(prefix, func) \
12+
{ MP_ROM_QSTR(MP_QSTR_##func), MP_ROM_PTR(&prefix##_##func##_obj) }
13+
14+
// -------- GFX common wrapper
15+
MAKE_METHOD_0(gfx, width);
16+
MAKE_METHOD_0(gfx, height);
17+
MAKE_METHOD_0(gfx, getRotation);
18+
MAKE_METHOD_0(gfx, getColorDepth);
19+
MAKE_METHOD_0(gfx, getCursor);
20+
MAKE_METHOD_1(gfx, setRotation);
21+
MAKE_METHOD_1(gfx, setColorDepth);
22+
MAKE_METHOD_1(gfx, setFont);
23+
MAKE_METHOD_1(gfx, print);
24+
MAKE_METHOD_2(gfx, setCursor);
25+
MAKE_METHOD_V(gfx, clear, 1, 2);
26+
MAKE_METHOD_V(gfx, fillScreen, 1, 2);
27+
MAKE_METHOD_V(gfx, drawPixel, 3, 4);
28+
MAKE_METHOD_V(gfx, drawCircle, 4, 5);
29+
MAKE_METHOD_V(gfx, fillCircle, 4, 5);
30+
MAKE_METHOD_V(gfx, drawLine, 5, 6);
31+
MAKE_METHOD_V(gfx, drawRect, 5, 6);
32+
MAKE_METHOD_V(gfx, fillRect, 5, 6);
33+
MAKE_METHOD_V(gfx, drawRoundRect, 6, 7);
34+
MAKE_METHOD_V(gfx, fillRoundRect, 6, 7);
35+
MAKE_METHOD_V(gfx, printf, 2, 32);
36+
MAKE_METHOD_V(gfx, newCanvas, 3, 5);
3537

3638
#define TABLE_PARTS_GFX_BASE \
37-
MAKE_TABLE( gfx, clear ), \
38-
MAKE_TABLE( gfx, drawCircle ), \
39-
MAKE_TABLE( gfx, drawLine ), \
40-
MAKE_TABLE( gfx, drawPixel ), \
41-
MAKE_TABLE( gfx, drawRect ), \
42-
MAKE_TABLE( gfx, drawRoundRect), \
43-
MAKE_TABLE( gfx, fillCircle ), \
44-
MAKE_TABLE( gfx, fillRect ), \
45-
MAKE_TABLE( gfx, fillRoundRect), \
46-
MAKE_TABLE( gfx, fillScreen ), \
47-
MAKE_TABLE( gfx, getColorDepth), \
48-
MAKE_TABLE( gfx, getCursor ), \
49-
MAKE_TABLE( gfx, getRotation ), \
50-
MAKE_TABLE( gfx, height ), \
51-
MAKE_TABLE( gfx, newCanvas ), \
52-
MAKE_TABLE( gfx, print ), \
53-
MAKE_TABLE( gfx, printf ), \
54-
MAKE_TABLE( gfx, setColorDepth), \
55-
MAKE_TABLE( gfx, setCursor ), \
56-
MAKE_TABLE( gfx, setFont ), \
57-
MAKE_TABLE( gfx, setRotation ), \
58-
MAKE_TABLE( gfx, width ), \
59-
{ MP_ROM_QSTR(MP_QSTR_FONT0 ), MP_ROM_PTR(&gfx_font_0_obj) }, \
60-
{ MP_ROM_QSTR(MP_QSTR_FONT2 ), MP_ROM_PTR(&gfx_font_2_obj) }, \
61-
{ MP_ROM_QSTR(MP_QSTR_FONT4 ), MP_ROM_PTR(&gfx_font_4_obj) }, \
62-
{ MP_ROM_QSTR(MP_QSTR_FONT6 ), MP_ROM_PTR(&gfx_font_6_obj) }, \
63-
{ MP_ROM_QSTR(MP_QSTR_FONT7 ), MP_ROM_PTR(&gfx_font_7_obj) }, \
64-
{ MP_ROM_QSTR(MP_QSTR_FONT8 ), MP_ROM_PTR(&gfx_font_8_obj) }, \
65-
{ MP_ROM_QSTR(MP_QSTR_FONT_DejaVu9 ), MP_ROM_PTR(&gfx_font_DejaVu9_obj ) }, \
66-
{ MP_ROM_QSTR(MP_QSTR_FONT_DejaVu12), MP_ROM_PTR(&gfx_font_DejaVu12_obj) }, \
67-
{ MP_ROM_QSTR(MP_QSTR_FONT_DejaVu18), MP_ROM_PTR(&gfx_font_DejaVu18_obj) }, \
68-
{ MP_ROM_QSTR(MP_QSTR_FONT_DejaVu24), MP_ROM_PTR(&gfx_font_DejaVu24_obj) }, \
69-
{ MP_ROM_QSTR(MP_QSTR_BLACK ), MP_ROM_INT( 0x000000 ) }, \
70-
{ MP_ROM_QSTR(MP_QSTR_NAVY ), MP_ROM_INT( 0x000080 ) }, \
71-
{ MP_ROM_QSTR(MP_QSTR_DARKGREEN ), MP_ROM_INT( 0x008000 ) }, \
72-
{ MP_ROM_QSTR(MP_QSTR_DARKCYAN ), MP_ROM_INT( 0x008080 ) }, \
73-
{ MP_ROM_QSTR(MP_QSTR_MAROON ), MP_ROM_INT( 0x800000 ) }, \
74-
{ MP_ROM_QSTR(MP_QSTR_PURPLE ), MP_ROM_INT( 0x800080 ) }, \
75-
{ MP_ROM_QSTR(MP_QSTR_OLIVE ), MP_ROM_INT( 0x808000 ) }, \
76-
{ MP_ROM_QSTR(MP_QSTR_LIGHTGREY ), MP_ROM_INT( 0xC0C0C0 ) }, \
77-
{ MP_ROM_QSTR(MP_QSTR_DARKGREY ), MP_ROM_INT( 0x808080 ) }, \
78-
{ MP_ROM_QSTR(MP_QSTR_BLUE ), MP_ROM_INT( 0x0000FF ) }, \
79-
{ MP_ROM_QSTR(MP_QSTR_GREEN ), MP_ROM_INT( 0x00FF00 ) }, \
80-
{ MP_ROM_QSTR(MP_QSTR_CYAN ), MP_ROM_INT( 0x00FFFF ) }, \
81-
{ MP_ROM_QSTR(MP_QSTR_RED ), MP_ROM_INT( 0xFF0000 ) }, \
82-
{ MP_ROM_QSTR(MP_QSTR_MAGENTA ), MP_ROM_INT( 0xFF00FF ) }, \
83-
{ MP_ROM_QSTR(MP_QSTR_YELLOW ), MP_ROM_INT( 0xFFFF00 ) }, \
84-
{ MP_ROM_QSTR(MP_QSTR_WHITE ), MP_ROM_INT( 0xFFFFFF ) }, \
85-
{ MP_ROM_QSTR(MP_QSTR_ORANGE ), MP_ROM_INT( 0xFFA500 ) }, \
86-
{ MP_ROM_QSTR(MP_QSTR_GREENYELLOW ), MP_ROM_INT( 0xADFF2F ) }, \
87-
{ MP_ROM_QSTR(MP_QSTR_PINK ), MP_ROM_INT( 0xFFC0CB ) }
88-
89-
90-
//-------- GFX device wrapper
91-
MAKE_METHOD_0( gfx, startWrite );
92-
MAKE_METHOD_0( gfx, endWrite );
39+
MAKE_TABLE(gfx, clear), \
40+
MAKE_TABLE(gfx, drawCircle), \
41+
MAKE_TABLE(gfx, drawLine), \
42+
MAKE_TABLE(gfx, drawPixel), \
43+
MAKE_TABLE(gfx, drawRect), \
44+
MAKE_TABLE(gfx, drawRoundRect), \
45+
MAKE_TABLE(gfx, fillCircle), \
46+
MAKE_TABLE(gfx, fillRect), \
47+
MAKE_TABLE(gfx, fillRoundRect), \
48+
MAKE_TABLE(gfx, fillScreen), \
49+
MAKE_TABLE(gfx, getColorDepth), \
50+
MAKE_TABLE(gfx, getCursor), \
51+
MAKE_TABLE(gfx, getRotation), \
52+
MAKE_TABLE(gfx, height), \
53+
MAKE_TABLE(gfx, newCanvas), \
54+
MAKE_TABLE(gfx, print), \
55+
MAKE_TABLE(gfx, printf), \
56+
MAKE_TABLE(gfx, setColorDepth), \
57+
MAKE_TABLE(gfx, setCursor), \
58+
MAKE_TABLE(gfx, setFont), \
59+
MAKE_TABLE(gfx, setRotation), \
60+
MAKE_TABLE(gfx, width), \
61+
{ MP_ROM_QSTR(MP_QSTR_FONT0), MP_ROM_PTR(&gfx_font_0_obj) }, \
62+
{ MP_ROM_QSTR(MP_QSTR_FONT2), MP_ROM_PTR(&gfx_font_2_obj) }, \
63+
{ MP_ROM_QSTR(MP_QSTR_FONT4), MP_ROM_PTR(&gfx_font_4_obj) }, \
64+
{ MP_ROM_QSTR(MP_QSTR_FONT6), MP_ROM_PTR(&gfx_font_6_obj) }, \
65+
{ MP_ROM_QSTR(MP_QSTR_FONT7), MP_ROM_PTR(&gfx_font_7_obj) }, \
66+
{ MP_ROM_QSTR(MP_QSTR_FONT8), MP_ROM_PTR(&gfx_font_8_obj) }, \
67+
{ MP_ROM_QSTR(MP_QSTR_FONT_DejaVu9), MP_ROM_PTR(&gfx_font_DejaVu9_obj) }, \
68+
{ MP_ROM_QSTR(MP_QSTR_FONT_DejaVu12), MP_ROM_PTR(&gfx_font_DejaVu12_obj) }, \
69+
{ MP_ROM_QSTR(MP_QSTR_FONT_DejaVu18), MP_ROM_PTR(&gfx_font_DejaVu18_obj) }, \
70+
{ MP_ROM_QSTR(MP_QSTR_FONT_DejaVu24), MP_ROM_PTR(&gfx_font_DejaVu24_obj) }, \
71+
{ MP_ROM_QSTR(MP_QSTR_BLACK), MP_ROM_INT(0x000000) }, \
72+
{ MP_ROM_QSTR(MP_QSTR_NAVY), MP_ROM_INT(0x000080) }, \
73+
{ MP_ROM_QSTR(MP_QSTR_DARKGREEN), MP_ROM_INT(0x008000) }, \
74+
{ MP_ROM_QSTR(MP_QSTR_DARKCYAN), MP_ROM_INT(0x008080) }, \
75+
{ MP_ROM_QSTR(MP_QSTR_MAROON), MP_ROM_INT(0x800000) }, \
76+
{ MP_ROM_QSTR(MP_QSTR_PURPLE), MP_ROM_INT(0x800080) }, \
77+
{ MP_ROM_QSTR(MP_QSTR_OLIVE), MP_ROM_INT(0x808000) }, \
78+
{ MP_ROM_QSTR(MP_QSTR_LIGHTGREY), MP_ROM_INT(0xC0C0C0) }, \
79+
{ MP_ROM_QSTR(MP_QSTR_DARKGREY), MP_ROM_INT(0x808080) }, \
80+
{ MP_ROM_QSTR(MP_QSTR_BLUE), MP_ROM_INT(0x0000FF) }, \
81+
{ MP_ROM_QSTR(MP_QSTR_GREEN), MP_ROM_INT(0x00FF00) }, \
82+
{ MP_ROM_QSTR(MP_QSTR_CYAN), MP_ROM_INT(0x00FFFF) }, \
83+
{ MP_ROM_QSTR(MP_QSTR_RED), MP_ROM_INT(0xFF0000) }, \
84+
{ MP_ROM_QSTR(MP_QSTR_MAGENTA), MP_ROM_INT(0xFF00FF) }, \
85+
{ MP_ROM_QSTR(MP_QSTR_YELLOW), MP_ROM_INT(0xFFFF00) }, \
86+
{ MP_ROM_QSTR(MP_QSTR_WHITE), MP_ROM_INT(0xFFFFFF) }, \
87+
{ MP_ROM_QSTR(MP_QSTR_ORANGE), MP_ROM_INT(0xFFA500) }, \
88+
{ MP_ROM_QSTR(MP_QSTR_GREENYELLOW), MP_ROM_INT(0xADFF2F) }, \
89+
{ MP_ROM_QSTR(MP_QSTR_PINK), MP_ROM_INT(0xFFC0CB) }
90+
91+
// -------- GFX device wrapper
92+
MAKE_METHOD_0(gfx, startWrite);
93+
MAKE_METHOD_0(gfx, endWrite);
9394

9495
STATIC const mp_rom_map_elem_t gfxdevice_member_table[] = {
95-
TABLE_PARTS_GFX_BASE ,
96-
MAKE_TABLE( gfx, startWrite ),
97-
MAKE_TABLE( gfx, endWrite ),
96+
TABLE_PARTS_GFX_BASE,
97+
MAKE_TABLE(gfx, startWrite),
98+
MAKE_TABLE(gfx, endWrite),
9899
};
99100
STATIC MP_DEFINE_CONST_DICT(gfxdevice_member, gfxdevice_member_table);
101+
100102
const mp_obj_type_t gfxdevice_type = {
101-
{ &mp_type_type },
102-
.locals_dict = (mp_obj_dict_t *)&gfxdevice_member,
103+
{ &mp_type_type },
104+
.locals_dict = (mp_obj_dict_t *)&gfxdevice_member,
103105
};
104106

105-
//-------- GFX canvas wrapper
106-
MAKE_METHOD_0( gfx, delete );
107-
MAKE_METHOD_2( gfx, push );
107+
// -------- GFX canvas wrapper
108+
MAKE_METHOD_0(gfx, delete);
109+
MAKE_METHOD_2(gfx, push);
108110

109111
STATIC const mp_rom_map_elem_t gfxcanvas_member_table[] = {
110-
TABLE_PARTS_GFX_BASE ,
111-
MAKE_TABLE( gfx, delete),
112-
MAKE_TABLE( gfx, push),
112+
TABLE_PARTS_GFX_BASE,
113+
MAKE_TABLE(gfx, delete),
114+
MAKE_TABLE(gfx, push),
113115
};
114116
STATIC MP_DEFINE_CONST_DICT(gfxcanvas_member, gfxcanvas_member_table);
117+
115118
const mp_obj_type_t gfxcanvas_type = {
116-
{ &mp_type_type },
117-
.flags = MP_TYPE_FLAG_IS_SUBCLASSED,
118-
.locals_dict = (mp_obj_dict_t *)&gfxcanvas_member,
119+
{ &mp_type_type },
120+
.flags = MP_TYPE_FLAG_IS_SUBCLASSED,
121+
.locals_dict = (mp_obj_dict_t *)&gfxcanvas_member,
119122
};
120123

121-
//-------- Button wrapper
122-
MAKE_METHOD_0( btn, isHolding );
123-
MAKE_METHOD_0( btn, isPressed );
124-
MAKE_METHOD_0( btn, isReleased );
125-
MAKE_METHOD_0( btn, wasChangePressed );
126-
MAKE_METHOD_0( btn, wasClicked );
127-
MAKE_METHOD_0( btn, wasHold );
128-
MAKE_METHOD_0( btn, wasPressed );
129-
MAKE_METHOD_0( btn, wasReleased );
130-
MAKE_METHOD_0( btn, lastChange );
131-
MAKE_METHOD_1( btn, pressedFor );
132-
MAKE_METHOD_1( btn, releasedFor );
133-
MAKE_METHOD_1( btn, setDebounceThresh);
134-
MAKE_METHOD_1( btn, setHoldThresh );
124+
// -------- Button wrapper
125+
MAKE_METHOD_0(btn, isHolding);
126+
MAKE_METHOD_0(btn, isPressed);
127+
MAKE_METHOD_0(btn, isReleased);
128+
MAKE_METHOD_0(btn, wasChangePressed);
129+
MAKE_METHOD_0(btn, wasClicked);
130+
MAKE_METHOD_0(btn, wasHold);
131+
MAKE_METHOD_0(btn, wasPressed);
132+
MAKE_METHOD_0(btn, wasReleased);
133+
MAKE_METHOD_0(btn, lastChange);
134+
MAKE_METHOD_1(btn, pressedFor);
135+
MAKE_METHOD_1(btn, releasedFor);
136+
MAKE_METHOD_1(btn, setDebounceThresh);
137+
MAKE_METHOD_1(btn, setHoldThresh);
135138

136139
STATIC const mp_rom_map_elem_t btn_member_table[] = {
137-
MAKE_TABLE( btn, isHolding ),
138-
MAKE_TABLE( btn, isPressed ),
139-
MAKE_TABLE( btn, isReleased ),
140-
MAKE_TABLE( btn, wasChangePressed ),
141-
MAKE_TABLE( btn, wasClicked ),
142-
MAKE_TABLE( btn, wasHold ),
143-
MAKE_TABLE( btn, wasPressed ),
144-
MAKE_TABLE( btn, wasReleased ),
145-
MAKE_TABLE( btn, lastChange ),
146-
MAKE_TABLE( btn, pressedFor ),
147-
MAKE_TABLE( btn, releasedFor ),
148-
MAKE_TABLE( btn, setDebounceThresh),
149-
MAKE_TABLE( btn, setHoldThresh ),
140+
MAKE_TABLE(btn, isHolding),
141+
MAKE_TABLE(btn, isPressed),
142+
MAKE_TABLE(btn, isReleased),
143+
MAKE_TABLE(btn, wasChangePressed),
144+
MAKE_TABLE(btn, wasClicked),
145+
MAKE_TABLE(btn, wasHold),
146+
MAKE_TABLE(btn, wasPressed),
147+
MAKE_TABLE(btn, wasReleased),
148+
MAKE_TABLE(btn, lastChange),
149+
MAKE_TABLE(btn, pressedFor),
150+
MAKE_TABLE(btn, releasedFor),
151+
MAKE_TABLE(btn, setDebounceThresh),
152+
MAKE_TABLE(btn, setHoldThresh),
150153
};
151-
152154
STATIC MP_DEFINE_CONST_DICT(btn_member, btn_member_table);
155+
153156
const mp_obj_type_t btn_type = {
154-
{ &mp_type_type },
155-
.locals_dict = (mp_obj_dict_t *)&btn_member,
157+
{ &mp_type_type },
158+
.locals_dict = (mp_obj_dict_t *)&btn_member,
156159
};
157160

158-
159-
//-------- M5 wrapper
160-
161+
// -------- M5 wrapper
161162
STATIC MP_DEFINE_CONST_FUN_OBJ_0(m5_begin_obj, m5_begin);
162163
STATIC MP_DEFINE_CONST_FUN_OBJ_0(m5_update_obj, m5_update);
163164

164165
STATIC const mp_rom_map_elem_t m5_globals_table[] = {
165-
{ MP_ROM_QSTR(MP_QSTR___name__ ), MP_ROM_QSTR(MP_QSTR_m5) },
166-
{ MP_ROM_QSTR(MP_QSTR_begin ), MP_ROM_PTR(&m5_begin_obj) },
167-
{ MP_ROM_QSTR(MP_QSTR_update ), MP_ROM_PTR(&m5_update_obj) },
168-
{ MP_ROM_QSTR(MP_QSTR_btnA ), MP_OBJ_FROM_PTR(&m5_btnA) },
169-
{ MP_ROM_QSTR(MP_QSTR_btnB ), MP_OBJ_FROM_PTR(&m5_btnB) },
170-
{ MP_ROM_QSTR(MP_QSTR_btnC ), MP_OBJ_FROM_PTR(&m5_btnC) },
171-
{ MP_ROM_QSTR(MP_QSTR_btnPWR ), MP_OBJ_FROM_PTR(&m5_btnPWR) },
172-
{ MP_ROM_QSTR(MP_QSTR_btnEXT ), MP_OBJ_FROM_PTR(&m5_btnEXT) },
173-
{ MP_ROM_QSTR(MP_QSTR_display ), MP_OBJ_FROM_PTR(&m5_display) },
174-
{ MP_ROM_QSTR(MP_QSTR_lcd ), MP_OBJ_FROM_PTR(&m5_display) },
166+
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_m5) },
167+
{ MP_ROM_QSTR(MP_QSTR_begin), MP_ROM_PTR(&m5_begin_obj) },
168+
{ MP_ROM_QSTR(MP_QSTR_update), MP_ROM_PTR(&m5_update_obj) },
169+
{ MP_ROM_QSTR(MP_QSTR_btnA), MP_OBJ_FROM_PTR(&m5_btnA) },
170+
{ MP_ROM_QSTR(MP_QSTR_btnB), MP_OBJ_FROM_PTR(&m5_btnB) },
171+
{ MP_ROM_QSTR(MP_QSTR_btnC), MP_OBJ_FROM_PTR(&m5_btnC) },
172+
{ MP_ROM_QSTR(MP_QSTR_btnPWR), MP_OBJ_FROM_PTR(&m5_btnPWR) },
173+
{ MP_ROM_QSTR(MP_QSTR_btnEXT), MP_OBJ_FROM_PTR(&m5_btnEXT) },
174+
{ MP_ROM_QSTR(MP_QSTR_display), MP_OBJ_FROM_PTR(&m5_display) },
175+
{ MP_ROM_QSTR(MP_QSTR_lcd), MP_OBJ_FROM_PTR(&m5_display) },
175176
};
176-
177177
STATIC MP_DEFINE_CONST_DICT(mp_module_m5_globals, m5_globals_table);
178178

179179
// Define module object.
180180
const mp_obj_module_t m5m5unified_user_cmodule = {
181-
.base = { &mp_type_module },
182-
.globals = (mp_obj_dict_t *)&mp_module_m5_globals,
181+
.base = { &mp_type_module },
182+
.globals = (mp_obj_dict_t *)&mp_module_m5_globals,
183183
};
184184

185-
186185
MP_REGISTER_MODULE(MP_QSTR_m5, m5m5unified_user_cmodule, MODULE_M5UNIFIED_ENABLED);

‎m5stack/modules/_boot.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
import uos as os
33
from flashbdev import bdev
44

5-
uiflow_str = '''
5+
uiflow_str = """
66
_ __ _
77
_ _(_)/ _| | _____ __
88
| | | | | |_| |/ _ \ \ /\ / /
99
| |_| | | _| | (_) \ V V /
1010
\__,_|_|_| |_|\___/ \_/\_/
11-
'''
11+
"""
1212
print(uiflow_str)
1313
del uiflow_str
1414

@@ -18,12 +18,13 @@
1818
os.mount(vfs, "/flash")
1919
except OSError:
2020
import inisetup
21+
2122
vfs = inisetup.setup()
2223

2324

2425
gc.collect()
2526
gc.threshold(56 * 1024)
2627

2728
import micropython
28-
micropython.alloc_emergency_exception_buf(256)
2929

30+
micropython.alloc_emergency_exception_buf(256)

‎tests/display/fillecircle.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@
77
m5.begin()
88

99
while True:
10-
lcd.fillCircle(random.randint(20, 300), random.randint(20, 220),
11-
random.randint(5, 30), random.randint(0, 0xffffff))
10+
lcd.fillCircle(
11+
random.randint(20, 300),
12+
random.randint(20, 220),
13+
random.randint(5, 30),
14+
random.randint(0, 0xFFFFFF),
15+
)

0 commit comments

Comments
 (0)