Skip to content

Commit

Permalink
Fix lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Xavier Chapron committed May 13, 2024
1 parent e5fdb50 commit e243c68
Show file tree
Hide file tree
Showing 40 changed files with 207 additions and 209 deletions.
2 changes: 1 addition & 1 deletion Makefile.glyphs
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ $(GLYPH_DESTH): $(GLYPH_FILES) $(ICON_SCRIPT)
$(L)if [ ! -z "$(GLYPH_FILES)" ] ; then python3 $(ICON_SCRIPT) --glyphcheader $(GLYPH_FILES) > $(GLYPH_DESTH) ; fi
$(L)if [ ! -z "$(GLYPH_FILES)" ] ; then python3 $(ICON_SCRIPT) --glyphcfile $(GLYPH_FILES) > $(GLYPH_DESTC) ; fi
#add dependency for generation
$(GLYPH_DESTC): $(GLYPH_DESTH)
$(GLYPH_DESTC): $(GLYPH_DESTH)
22 changes: 11 additions & 11 deletions icon.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
sys.stderr.write("Error: " + filename + " does not exists !\n")
sys.exit(2)
widthmax = int(sys.argv[1])
heightmax = int(sys.argv[2])
heightmax = int(sys.argv[2])
else:
forcedBPP = int(sys.argv[2])
if (sys.argv[3] == "hexbitmaponly"):
Expand All @@ -90,7 +90,7 @@
sys.stderr.write("Error: " + filename + " does not exists !\n")
sys.exit(2)
widthmax = int(sys.argv[1])
heightmax = int(sys.argv[2])
heightmax = int(sys.argv[2])

if (sys.argv[4] == "hexbitmaponly"):
hexbitmaponly = True
Expand All @@ -109,7 +109,7 @@
sys.stderr.write("Error: " + filename + " does not exists !\n")
sys.exit(2)
widthmax = int(sys.argv[1])
heightmax = int(sys.argv[2])
heightmax = int(sys.argv[2])
forcedBPP = int(sys.argv[4])
if (sys.argv[5] == "hexbitmaponly"):
hexbitmaponly = True
Expand Down Expand Up @@ -185,7 +185,7 @@ def hexbyte(b):
i = 0
palette_remapping = {}
new_palette = []
for lum, values in opalette.items():
for lum, values in opalette.items():
# old index to new index
for v in values:
palette_remapping[v[0]] = i
Expand Down Expand Up @@ -221,7 +221,7 @@ def hexbyte(b):
""")
if glyphcheader:
sys.stdout.write("""extern
""")
""")
sys.stdout.write("""unsigned int const C_""" + bname + """_colors[]
""");
if glyphcheader:
Expand All @@ -237,8 +237,8 @@ def hexbyte(b):
sys.stdout.write("""};
""")
if glyphcheader:
sys.stdout.write("""extern""")
sys.stdout.write("""
sys.stdout.write("""extern""")
sys.stdout.write("""
unsigned char const C_""" + bname + """_bitmap[]""");
if glyphcheader:
sys.stdout.write(""";
Expand Down Expand Up @@ -291,7 +291,7 @@ def hexbyte(b):
sys.stdout.write(hexbyte(current_byte))
current_bit = 0
current_byte = 0

# print last byte if any
if (current_bit > 0):
if not hexbitmaponly:
Expand All @@ -317,13 +317,13 @@ def hexbyte(b):
else:
sys.stdout.write("""#ifdef OS_IO_SEPROXYHAL
#include \"os_io_seproxyhal.h\"
""")
""")
if glyphcheader:
sys.stdout.write("""extern
""")
""")
sys.stdout.write("""const bagl_icon_details_t C_""" + bname)

if glyphcheader:
if glyphcheader:
sys.stdout.write(""";
""")
sys.stdout.write("""#endif // GLYPH_""" + bname + """_BPP
Expand Down
1 change: 0 additions & 1 deletion include/cx_errors.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
LEDGER_ASSERT(!_assert_err, "err 0x%X <%s>", _assert_err, #call); \
} while (0)


/** Success. */
#define CX_OK 0x00000000

Expand Down
2 changes: 1 addition & 1 deletion include/os_helpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@ unsigned int os_parse_bertlv(unsigned char *mem,

#ifndef UNUSED
#define UNUSED(x) (void) x
#endif
#endif
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_comic_sans_ms_20px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,6 @@ const bagl_font_t fontCOMIC_SANS_MS_20PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersCOMIC_SANS_MS_20PX
charactersCOMIC_SANS_MS_20PX
,bitmapCOMIC_SANS_MS_20PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_bold_13px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,6 @@ const bagl_font_t fontOPEN_SANS_BOLD_13PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_BOLD_13PX
charactersOPEN_SANS_BOLD_13PX
,bitmapOPEN_SANS_BOLD_13PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_bold_21px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,6 @@ const bagl_font_t fontOPEN_SANS_BOLD_21PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_BOLD_21PX
charactersOPEN_SANS_BOLD_21PX
,bitmapOPEN_SANS_BOLD_21PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_extrabold_11px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -679,6 +679,6 @@ const bagl_font_t fontOPEN_SANS_EXTRABOLD_11PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_EXTRABOLD_11PX
charactersOPEN_SANS_EXTRABOLD_11PX
,bitmapOPEN_SANS_EXTRABOLD_11PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_light_13.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1117,6 +1117,6 @@ const bagl_font_t fontOPEN_SANS_LIGHT_13 = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_LIGHT_13
charactersOPEN_SANS_LIGHT_13
,bitmapOPEN_SANS_LIGHT_13
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_light_13px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1056,6 +1056,6 @@ const bagl_font_t fontOPEN_SANS_LIGHT_13PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_LIGHT_13PX
charactersOPEN_SANS_LIGHT_13PX
,bitmapOPEN_SANS_LIGHT_13PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_light_14px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,6 @@ const bagl_font_t fontOPEN_SANS_LIGHT_14PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_LIGHT_14PX
charactersOPEN_SANS_LIGHT_14PX
,bitmapOPEN_SANS_LIGHT_14PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_light_16_22px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1984,6 +1984,6 @@ const bagl_font_t fontOPEN_SANS_LIGHT_16_22PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_LIGHT_16_22PX
charactersOPEN_SANS_LIGHT_16_22PX
,bitmapOPEN_SANS_LIGHT_16_22PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_light_16px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,6 @@ const bagl_font_t fontOPEN_SANS_LIGHT_16PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_LIGHT_16PX
charactersOPEN_SANS_LIGHT_16PX
,bitmapOPEN_SANS_LIGHT_16PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_light_21px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,6 @@ const bagl_font_t fontOPEN_SANS_LIGHT_21PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_LIGHT_21PX
charactersOPEN_SANS_LIGHT_21PX
,bitmapOPEN_SANS_LIGHT_21PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_light_23_30px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -3260,6 +3260,6 @@ const bagl_font_t fontOPEN_SANS_LIGHT_23_30PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_LIGHT_23_30PX
charactersOPEN_SANS_LIGHT_23_30PX
,bitmapOPEN_SANS_LIGHT_23_30PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_regular_10_13px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1135,6 +1135,6 @@ const bagl_font_t fontOPEN_SANS_REGULAR_10_13PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_REGULAR_10_13PX
charactersOPEN_SANS_REGULAR_10_13PX
,bitmapOPEN_SANS_REGULAR_10_13PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_regular_11_14px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1286,6 +1286,6 @@ const bagl_font_t fontOPEN_SANS_REGULAR_11_14PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_REGULAR_11_14PX
charactersOPEN_SANS_REGULAR_11_14PX
,bitmapOPEN_SANS_REGULAR_11_14PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_regular_11px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -672,6 +672,6 @@ const bagl_font_t fontOPEN_SANS_REGULAR_11PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_REGULAR_11PX
charactersOPEN_SANS_REGULAR_11PX
,bitmapOPEN_SANS_REGULAR_11PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_regular_13_18px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,6 @@ const bagl_font_t fontOPEN_SANS_REGULAR_13_18PX = {
0, /* kerning */
0x002E, /* first character */
0x0039, /* last character */
charactersOPEN_SANS_REGULAR_13_18PX
charactersOPEN_SANS_REGULAR_13_18PX
,bitmapOPEN_SANS_REGULAR_13_18PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_regular_22_30px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,6 @@ const bagl_font_t fontOPEN_SANS_REGULAR_22_30PX = {
0, /* kerning */
0x002E, /* first character */
0x0039, /* last character */
charactersOPEN_SANS_REGULAR_22_30PX
charactersOPEN_SANS_REGULAR_22_30PX
,bitmapOPEN_SANS_REGULAR_22_30PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_regular_8_11px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,6 @@ const bagl_font_t fontOPEN_SANS_REGULAR_8_11PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_REGULAR_8_11PX
charactersOPEN_SANS_REGULAR_8_11PX
,bitmapOPEN_SANS_REGULAR_8_11PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_semibold_10_13px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1149,6 +1149,6 @@ const bagl_font_t fontOPEN_SANS_SEMIBOLD_10_13PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_SEMIBOLD_10_13PX
charactersOPEN_SANS_SEMIBOLD_10_13PX
,bitmapOPEN_SANS_SEMIBOLD_10_13PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_semibold_11_16px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1304,6 +1304,6 @@ const bagl_font_t fontOPEN_SANS_SEMIBOLD_11_16PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_SEMIBOLD_11_16PX
charactersOPEN_SANS_SEMIBOLD_11_16PX
,bitmapOPEN_SANS_SEMIBOLD_11_16PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_semibold_13_18px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,6 @@ const bagl_font_t fontOPEN_SANS_SEMIBOLD_13_18PX = {
0, /* kerning */
0x002E, /* first character */
0x0039, /* last character */
charactersOPEN_SANS_SEMIBOLD_13_18PX
charactersOPEN_SANS_SEMIBOLD_13_18PX
,bitmapOPEN_SANS_SEMIBOLD_13_18PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_semibold_13px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -1149,6 +1149,6 @@ const bagl_font_t fontOPEN_SANS_SEMIBOLD_13PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_SEMIBOLD_13PX
charactersOPEN_SANS_SEMIBOLD_13PX
,bitmapOPEN_SANS_SEMIBOLD_13PX
};
2 changes: 1 addition & 1 deletion lib_bagl/src/bagl_font_open_sans_semibold_18px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -807,6 +807,6 @@ const bagl_font_t fontOPEN_SANS_SEMIBOLD_18PX = {
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_SEMIBOLD_18PX
charactersOPEN_SANS_SEMIBOLD_18PX
,bitmapOPEN_SANS_SEMIBOLD_18PX
};
4 changes: 2 additions & 2 deletions lib_bagl/src/bagl_font_open_sans_semibold_8_11px.inc
Original file line number Diff line number Diff line change
Expand Up @@ -955,13 +955,13 @@ const bagl_font_character_t charactersOPEN_SANS_SEMIBOLD_8_11PX[96] = {
};

const bagl_font_t fontOPEN_SANS_SEMIBOLD_8_11PX = {
BAGL_FONT_OPEN_SANS_SEMIBOLD_8_11PX, /* font id (sparse font array) */
BAGL_FONT_OPEN_SANS_SEMIBOLD_8_11PX, /* font id (sparse font array) */
4, /* font bit per pixels */
11, /* font height in pixels */
8 , /* font ascent (baseline) in pixels */
0, /* kerning */
0x0020, /* first character */
0x007F, /* last character */
charactersOPEN_SANS_SEMIBOLD_8_11PX
charactersOPEN_SANS_SEMIBOLD_8_11PX
,bitmapOPEN_SANS_SEMIBOLD_8_11PX
};
1 change: 0 additions & 1 deletion lib_bagl/src/bagl_font_rom.inc
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@
#include "bagl_font_open_sans_semibold_13_18px.inc"

#include "bagl_font_symbols.inc"

Loading

0 comments on commit e243c68

Please sign in to comment.