diff --git a/csrc/u8x8_d_st7586s_jlx384160.c b/csrc/u8x8_d_st7586s_jlx384160.c index 35a23e20..9b4da3ee 100644 --- a/csrc/u8x8_d_st7586s_jlx384160.c +++ b/csrc/u8x8_d_st7586s_jlx384160.c @@ -170,7 +170,7 @@ static const uint8_t u8x8_d_st7586s_jlx384160_init_seq[] = { U8X8_A(0x000), // COM0 -> COM159 SEG0 -> SEG384 U8X8_C(0x0B0), // Duty Setting (num rows - 1) - U8X8_A(0x087), // should be 0x87 but caused flicker 0x9F + U8X8_A(0x09f), // 160-1 U8X8_C(0x020), // Display inversion off diff --git a/tools/font/bdfconv/Makefile b/tools/font/bdfconv/Makefile index e28e2e55..c8d7c5bd 100644 --- a/tools/font/bdfconv/Makefile +++ b/tools/font/bdfconv/Makefile @@ -468,19 +468,37 @@ CalLite24: bdfconv ./bdfconv -v -f 1 -m '32-79' ./tmp/7_Seg_33x19.bdf -o tmp.c -n u8g2_font_helvB18_tn -d ../bdf/helvB18.bdf convert bdf.tga out.png -noto: bdfconv +notos: bdfconv ./bdfconv -v -f 1 -m '32-65535,~9939,~10084' NotoEmoji-SemiBold-32.bdf -o u8g2_font_noto_semi_32_t.c -n u8g2_font_noto_semi_32_t -d ../bdf/helvB18.bdf convert bdf.tga u8g2_font_noto_semi_32_t.png ./bdfconv -v -f 1 -m '32-127,$$1f300-$$1ffff>$$f300,~127995' NotoEmoji-SemiBold-32.bdf -o u8g2_font_noto_semi_32_t2.c -n u8g2_font_noto_semi_32_t2 -d ../bdf/helvB18.bdf convert bdf.tga u8g2_font_noto_semi_32_t2.png - ./bdfconv -v -f 1 -m '32-127,$$1f300-$$1f32c>$$f300' NotoEmoji-SemiBold-32.bdf -o u8g2_font_noto_semi_32_t_weather.c -n u8g2_font_noto_semi_32_t_weather -d ../bdf/helvB18.bdf + ./bdfconv -v -f 1 -m '32-127,$$1f300-$$1f32c>$$f300,$$2600-$$2604,$$2614,$$26c4,$$26c5,$$26c8,$$26f1' NotoEmoji-SemiBold-24.bdf -o u8g2_font_noto_semi_24_t_weather.c -n u8g2_font_noto_semi_24_t_weather -d ../bdf/helvB18.bdf + convert bdf.tga u8g2_font_noto_semi_24_t_weather.png + ./bdfconv -v -f 1 -m '32-127,$$1f600-$$1f637>$$f600,$$1f641-$$1f64f>$$f641, $$1f910-$$1f917>$$f910, $$1f920-$$1f92f>$$f920, $$1f970-$$1f97a>$$f970, $$1fae0-$$1fae5>$$fae0' NotoEmoji-SemiBold-24.bdf -o u8g2_font_noto_semi_24_t_emoji.c -n u8g2_font_noto_semi_24_t_emoji -d ../bdf/helvB18.bdf + convert bdf.tga u8g2_font_noto_semi_24_t_emoji.png + ./bdfconv -v -f 1 -m '32-127,$$1f300-$$1f32c>$$f300,$$2600-$$2604,$$2614,$$26c4,$$26c5,$$26c8,$$26f1' NotoEmoji-SemiBold-32.bdf -o u8g2_font_noto_semi_32_t_weather.c -n u8g2_font_noto_semi_32_t_weather -d ../bdf/helvB18.bdf convert bdf.tga u8g2_font_noto_semi_32_t_weather.png - ./bdfconv -v -f 1 -m '32-127,$$1f600-$$1f64f>$$f600, $$1f910-$$1f92f>$$f910, $$1f970-$$1f97a>$$f970, $$1fae0-$$1fae5>$$fae0' NotoEmoji-SemiBold-32.bdf -o u8g2_font_noto_semi_32_t_emoji.c -n u8g2_font_noto_semi_32_t_emoji -d ../bdf/helvB18.bdf + ./bdfconv -v -f 1 -m '32-127,$$1f600-$$1f637>$$f600,$$1f641-$$1f64f>$$f641, $$1f910-$$1f917>$$f910, $$1f920-$$1f92f>$$f920, $$1f970-$$1f97a>$$f970, $$1fae0-$$1fae5>$$fae0' NotoEmoji-SemiBold-32.bdf -o u8g2_font_noto_semi_32_t_emoji.c -n u8g2_font_noto_semi_32_t_emoji -d ../bdf/helvB18.bdf convert bdf.tga u8g2_font_noto_semi_32_t_emoji.png - ./bdfconv -v -f 1 -m '32-127,$$1f300-$$1f32c>$$f300,~127745,~127746,~127747,~127748,~127749,~127750,~127751' NotoEmoji-SemiBold-48.bdf -o u8g2_font_noto_semi_48_t_weather.c -n u8g2_font_noto_semi_48_t_weather -d ../bdf/helvB18.bdf - convert bdf.tga u8g2_font_noto_semi_48_t_weather.png - ./bdfconv -v -f 1 -m '32-127,$$1f600-$$1f64f>$$f600, $$1f910-$$1f92f>$$f910, $$1f970-$$1f97a>$$f970, $$1fae0-$$1fae5>$$fae0' NotoEmoji-SemiBold-48.bdf -o u8g2_font_noto_semi_48_t_emoji.c -n u8g2_font_noto_semi_48_t_emoji -d ../bdf/helvB18.bdf - convert bdf.tga u8g2_font_noto_semi_48_t_emoji.png + ./bdfconv -v -f 1 -m '32-127,$$1f300-$$1f32c>$$f300,$$2600-$$2604,$$2614,$$26c4,$$26c5,$$26c8,$$26f1,~127747,~127751' NotoEmoji-SemiBold-40.bdf -o u8g2_font_noto_semi_40_t_weather.c -n u8g2_font_noto_semi_40_t_weather -d ../bdf/helvB18.bdf + convert bdf.tga u8g2_font_noto_semi_40_t_weather.png + ./bdfconv -v -f 1 -m '32-127,$$1f600-$$1f637>$$f600,$$1f641-$$1f64f>$$f641, $$1f910-$$1f917>$$f910, $$1f920-$$1f92f>$$f920, $$1f970-$$1f97a>$$f970, $$1fae0-$$1fae5>$$fae0, ~128561, ~128576' NotoEmoji-SemiBold-40.bdf -o u8g2_font_noto_semi_40_t_emoji.c -n u8g2_font_noto_semi_40_t_emoji -d ../bdf/helvB18.bdf + convert bdf.tga u8g2_font_noto_semi_40_t_emoji.png + +notob: bdfconv + ./bdfconv -v -f 1 -m '32-127,$$1f300-$$1f32c>$$f300,$$2600-$$2604,$$2614,$$26c4,$$26c5,$$26c8,$$26f1' NotoEmoji-Bold-24.bdf -o u8g2_font_noto_bold_24_t_weather.c -n u8g2_font_noto_bold_24_t_weather -d ../bdf/helvB18.bdf + convert bdf.tga u8g2_font_noto_bold_24_t_weather.png + ./bdfconv -v -f 1 -m '32-127,$$1f600-$$1f637>$$f600,$$1f641-$$1f64f>$$f641, $$1f910-$$1f917>$$f910, $$1f920-$$1f92f>$$f920, $$1f970-$$1f97a>$$f970, $$1fae0-$$1fae5>$$fae0' NotoEmoji-Bold-24.bdf -o u8g2_font_noto_bold_24_t_emoji.c -n u8g2_font_noto_bold_24_t_emoji -d ../bdf/helvB18.bdf + convert bdf.tga u8g2_font_noto_bold_24_t_emoji.png + ./bdfconv -v -f 1 -m '32-127,$$1f300-$$1f32c>$$f300,$$2600-$$2604,$$2614,$$26c4,$$26c5,$$26c8,$$26f1' NotoEmoji-Bold-32.bdf -o u8g2_font_noto_bold_32_t_weather.c -n u8g2_font_noto_bold_32_t_weather -d ../bdf/helvB18.bdf + convert bdf.tga u8g2_font_noto_bold_32_t_weather.png + ./bdfconv -v -f 1 -m '32-127,$$1f600-$$1f637>$$f600,$$1f641-$$1f64f>$$f641, $$1f910-$$1f917>$$f910, $$1f920-$$1f92f>$$f920, $$1f970-$$1f97a>$$f970, $$1fae0-$$1fae5>$$fae0' NotoEmoji-Bold-32.bdf -o u8g2_font_noto_bold_32_t_emoji.c -n u8g2_font_noto_bold_32_t_emoji -d ../bdf/helvB18.bdf + convert bdf.tga u8g2_font_noto_bold_32_t_emoji.png + ./bdfconv -v -f 1 -m '32-127,$$1f300-$$1f32c>$$f300,$$2600-$$2604,$$2614,$$26c4,$$26c5,$$26c8,$$26f1,~127747,~127751' NotoEmoji-Bold-40.bdf -o u8g2_font_noto_bold_40_t_weather.c -n u8g2_font_noto_bold_40_t_weather -d ../bdf/helvB18.bdf + convert bdf.tga u8g2_font_noto_bold_40_t_weather.png + ./bdfconv -v -f 1 -m '32-127,$$1f600-$$1f637>$$f600,$$1f641-$$1f64f>$$f641, $$1f910-$$1f917>$$f910, $$1f920-$$1f92f>$$f920, $$1f970-$$1f97a>$$f970, $$1fae0-$$1fae5>$$fae0, ~128561, ~128576, ~128588' NotoEmoji-Bold-40.bdf -o u8g2_font_noto_bold_40_t_emoji.c -n u8g2_font_noto_bold_40_t_emoji -d ../bdf/helvB18.bdf + convert bdf.tga u8g2_font_noto_bold_40_t_emoji.png mystery_quest: bdfconv diff --git a/tools/release/print_release.sh b/tools/release/print_release.sh index 8a218a09..9e7f9587 100755 --- a/tools/release/print_release.sh +++ b/tools/release/print_release.sh @@ -1,2 +1,2 @@ # without 'v' prefix -echo -n "2.33.10" +echo -n "2.33.11"