Skip to content

Commit b605e22

Browse files
committed
fixes a couple compile issues
1 parent b15cfed commit b605e22

File tree

2 files changed

+18
-9
lines changed

2 files changed

+18
-9
lines changed

builder/__init__.py

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -331,11 +331,12 @@ def generate_manifest(
331331

332332
file_path, file_name = os.path.split(tmp_file)
333333
entry = f"freeze('{file_path}', '{file_name}')"
334-
manifest_files.append(entry)
335334
else:
336335
print(file)
337336
file_path, file_name = os.path.split(file)
338337
entry = f"freeze('{file_path}', '{file_name}')"
338+
339+
if entry not in manifest_files:
339340
manifest_files.append(entry)
340341

341342
for file in indevs:
@@ -356,7 +357,9 @@ def generate_manifest(
356357
print(focaltech_touch)
357358
directory, file_name = os.path.split(focaltech_touch)
358359
entry = f"freeze('{directory}', '{file_name}')"
359-
manifest_files.append(entry)
360+
361+
if entry not in manifest_files:
362+
manifest_files.append(entry)
360363

361364
file = tmp_file
362365

@@ -367,12 +370,16 @@ def generate_manifest(
367370
if os.path.exists(extension):
368371
print(extension)
369372
entry = f"freeze('{directory}', '{extension_file}')"
370-
manifest_files.append(entry)
373+
374+
if entry not in manifest_files:
375+
manifest_files.append(entry)
371376

372377
print(file)
373378
file_path, file_name = os.path.split(file)
374379
entry = f"freeze('{file_path}', '{file_name}')"
375-
manifest_files.append(entry)
380+
381+
if entry not in manifest_files:
382+
manifest_files.append(entry)
376383

377384
display_paths = []
378385

@@ -394,13 +401,15 @@ def generate_manifest(
394401
print(os.path.join(tmp_file, file_name))
395402

396403
entry = f"freeze('{tmp_file}', '{file_name}')"
397-
manifest_files.append(entry)
404+
if entry not in manifest_files:
405+
manifest_files.append(entry)
398406
else:
399407
print(file)
400408
file_path, file_name = os.path.split(file)
401409
entry = f"freeze('{file_path}', '{file_name}')"
402-
manifest_files.append(entry)
403-
410+
if entry not in manifest_files:
411+
manifest_files.append(entry)
412+
404413
manifest_files = '\n'.join(manifest_files)
405414

406415
with open('build/manifest.py', 'w') as f:

ext_mod/lcd_bus/esp32_include/rgb565_dither.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef __RGB565_DITHER_H__
22
#define __RGB565_DITHER_H__
33

4-
#define CALC_THRESHOLD(x, y) (uint8_t)((y & 7) << 3) + (x & 7);
4+
#define CALC_THRESHOLD(x, y) (uint8_t)((y & 7) << 3) + (x & 7)
55

66
extern uint8_t *red_thresh;
77
extern uint8_t *green_thresh;
@@ -13,7 +13,7 @@
1313
{
1414
*pixel = (((((*pixel >> 8) & 0xF8) + red_thresh[treshold_id]) << 8) |
1515
((((*pixel >> 3) & 0xFC) + green_thresh[treshold_id]) << 3) |
16-
((((*pixel & 0x1F) << 3) + blue_thresh[treshold_id]) >> 3)) ;
16+
((((*pixel & 0x1F) << 3) + blue_thresh[treshold_id]) >> 3));
1717
}
1818

1919
#endif

0 commit comments

Comments
 (0)