Skip to content

Commit e7900ee

Browse files
committed
adds cleaning of mpy_cross
1 parent 1695f8d commit e7900ee

File tree

11 files changed

+61
-13
lines changed

11 files changed

+61
-13
lines changed

api_drivers/common_api_drivers/display/ili9341.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ def init(self, sequence=1):
130130
param_buf[0] = 0x00
131131

132132
if sequence == 1:
133-
param_buf[1] = 0x13
133+
param_buf[1] = 0x13 # 0x18 ??
134134
else:
135135
param_buf[1] = 0x1A
136136
self.set_params(_FRMCTR1, param_mv[:2])

builder/__init__.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,12 @@ def spawn(cmd_, out_to_screen=True, spinner=False, env=None, cmpl=False):
478478
return p.returncode, output_buffer
479479

480480

481-
def clean():
481+
def clean(clean_mpy_cross):
482+
if clean_mpy_cross:
483+
cross_clean = mpy_cross_cmd[:]
484+
cross_clean.insert(1, 'clean')
485+
spawn(cross_clean)
486+
482487
spawn(clean_cmd)
483488

484489

builder/esp32.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -332,12 +332,20 @@ def build_manifest(
332332
)
333333

334334

335-
def clean():
335+
def clean(clean_mpy_cross):
336336
env, cmds = setup_idf_environ()
337+
338+
if clean_mpy_cross:
339+
cross_clean = mpy_cross_cmd[:]
340+
cross_clean.insert(1, 'clean')
341+
cross_clean = cmds[:] + [cross_clean]
342+
spawn(cross_clean, env=env)
343+
337344
if 'deploy' in clean_cmd:
338345
clean_cmd.remove('deploy')
339346

340347
cmds.append(clean_cmd)
348+
341349
spawn(cmds, env=env)
342350

343351

builder/macOS.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,12 @@ def build_manifest(_, script_dir, lvgl_api, displays, indevs, frozen_manifest):
113113
)
114114

115115

116-
def clean():
116+
def clean(clean_mpy_cross):
117+
if clean_mpy_cross:
118+
cross_clean = mpy_cross_cmd[:]
119+
cross_clean.insert(1, 'clean')
120+
spawn(cross_clean)
121+
117122
spawn(clean_cmd)
118123

119124

builder/nrf.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,12 @@ def build_manifest(
6565
)
6666

6767

68-
def clean():
68+
def clean(clean_mpy_cross):
69+
if clean_mpy_cross:
70+
cross_clean = mpy_cross_cmd[:]
71+
cross_clean.insert(1, 'clean')
72+
spawn(cross_clean)
73+
6974
spawn(clean_cmd)
7075

7176

builder/renesas.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,12 @@ def build_manifest(
6565
)
6666

6767

68-
def clean():
68+
def clean(clean_mpy_cross):
69+
if clean_mpy_cross:
70+
cross_clean = mpy_cross_cmd[:]
71+
cross_clean.insert(1, 'clean')
72+
spawn(cross_clean)
73+
6974
spawn(clean_cmd)
7075

7176

builder/rp2.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,12 @@ def build_manifest(
8989
)
9090

9191

92-
def clean():
92+
def clean(clean_mpy_cross):
93+
if clean_mpy_cross:
94+
cross_clean = mpy_cross_cmd[:]
95+
cross_clean.insert(1, 'clean')
96+
spawn(cross_clean)
97+
9398
spawn(clean_cmd)
9499

95100

builder/stm32.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,12 @@ def build_manifest(
6767
)
6868

6969

70-
def clean():
70+
def clean(clean_mpy_cross):
71+
if clean_mpy_cross:
72+
cross_clean = mpy_cross_cmd[:]
73+
cross_clean.insert(1, 'clean')
74+
spawn(cross_clean)
75+
7176
spawn(clean_cmd)
7277

7378

builder/unix.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,12 @@ def build_manifest(
107107
)
108108

109109

110-
def clean():
110+
def clean(clean_mpy_cross):
111+
if clean_mpy_cross:
112+
cross_clean = mpy_cross_cmd[:]
113+
cross_clean.insert(1, 'clean')
114+
spawn(cross_clean)
115+
111116
spawn(clean_cmd)
112117

113118

builder/windows.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,12 @@ def build_manifest(target, script_dir, lvgl_api, displays, indevs, frozen_manife
111111
generate_manifest(script_dir, lvgl_api, manifest_path, displays, indevs, frozen_manifest)
112112

113113

114-
def clean():
114+
def clean(clean_mpy_cross):
115+
if clean_mpy_cross:
116+
cross_clean = mpy_cross_cmd[:]
117+
cross_clean.insert(1, 'clean')
118+
spawn(cross_clean)
119+
115120
spawn(clean_cmd)
116121

117122

make.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,12 @@ def create_lvgl_header():
206206
get_submodules()
207207
mod.submodules()
208208

209+
if clean:
210+
mod.clean(mpy_cross)
211+
209212
if mpy_cross:
210213
mod.mpy_cross()
211214

212-
if clean:
213-
mod.clean()
214-
215215
mod.build_manifest(target, SCRIPT_DIR, lvgl_api, displays, indevs, frozen_manifest)
216216
create_lvgl_header()
217217
mod.compile()

0 commit comments

Comments
 (0)