diff --git a/Matrix/firmware/src/res/marker13/trail13.h b/Matrix/firmware/src/res/marker13/trail13.h index 5504d6d..840a77a 100644 --- a/Matrix/firmware/src/res/marker13/trail13.h +++ b/Matrix/firmware/src/res/marker13/trail13.h @@ -11,7 +11,7 @@ .marker_glow = { 4, 4, 13, 16, trail13_marker_glow_pal4, trail13_marker_glow_a4, .img8 = trail13_marker_glow_pix4 }, \ .arrow_tail = { 4, 4, 13, 16, trail13_arrow_tail_pal4, trail13_arrow_tail_a4, .img8 = trail13_arrow_tail_pix4 }, \ .arrow = { 4, 4, 13, 16, trail13_arrow_pal4, trail13_arrow_a4, .img8 = trail13_arrow_pix4 }, \ - .arrow_zoom = { 4, 4, 13, 8, trail13_arrow_zoom_pal4, trail13_arrow_zoom_a4, .img8 = trail13_arrow_zoom_pix4 } \ + .arrow_grow = { 4, 4, 13, 8, trail13_arrow_grow_pal4, trail13_arrow_grow_a4, .img8 = trail13_arrow_grow_pix4 } \ } /* STEM - Using 4-bit color depth with 4-bit alpha */ @@ -1322,13 +1322,13 @@ const uint8_t trail13_arrow_a4[] = { 0x00, 0x00, 0x02, 0xf2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00 }; -/* ARROW_ZOOM - Using 4-bit color depth with 4-bit alpha */ -const uint32_t trail13_arrow_zoom_pal4[] = { +/* arrow_grow - Using 4-bit color depth with 4-bit alpha */ +const uint32_t trail13_arrow_grow_pal4[] = { 0xffffff, 0xffff00, 0xbcddf8, 0xa6c0d2, 0x898a8b, 0x6a6a6b, 0x59595a, 0x525252, 0x3e3e3f, 0x363639, 0x323234, 0x302a2c, 0x272728, 0x121213, 0x010101, 0x000000 }; -const uint8_t trail13_arrow_zoom_pix4[] = { +const uint8_t trail13_arrow_grow_pix4[] = { 0xff, 0xf0, 0x45, 0x55, 0x40, 0xff, 0xff, 0xff, 0x07, 0x9c, 0x97, 0x0f, 0xff, 0xff, 0x7f, 0x59, 0xc9, 0x5f, 0x7f, 0xff, 0xff, 0xfe, 0x69, 0x6e, 0xff, 0xff, 0xff, 0xf7, 0xf4, 0x74, 0xf7, 0xff, 0xff, 0xff, 0x0f, 0x23, 0x2f, 0x0f, 0xff, @@ -1383,7 +1383,7 @@ const uint8_t trail13_arrow_zoom_pix4[] = { 0xff, 0xf0, 0xf2, 0x42, 0xf0, 0xff, 0xff, 0xff, 0x0f, 0x22, 0x2f, 0x0f, 0xff }; -const uint8_t trail13_arrow_zoom_a4[] = { +const uint8_t trail13_arrow_grow_a4[] = { 0x00, 0x00, 0x33, 0x33, 0x30, 0x00, 0x00, 0x00, 0x0b, 0xff, 0xfc, 0x00, 0x00, 0x00, 0x00, 0x3f, 0xff, 0x30, 0x00, 0x00, 0x00, 0x00, 0xbf, 0xb0, 0x00, 0x00, 0x00, 0x00, 0x06, 0xf6, 0x00, 0x00, 0x00, 0x00, 0x00, 0x4e, 0x40, 0x00, 0x00, diff --git a/Matrix/firmware/src/res/marker23/trail23.h b/Matrix/firmware/src/res/marker23/trail23.h index 9aedd31..4e419b5 100644 --- a/Matrix/firmware/src/res/marker23/trail23.h +++ b/Matrix/firmware/src/res/marker23/trail23.h @@ -11,7 +11,7 @@ .marker_glow = { 4, 4, 23, 16, trail23_marker_glow_pal4, trail23_marker_glow_a4, .img8 = trail23_marker_glow_pix4 }, \ .arrow_tail = { 4, 4, 23, 16, trail23_arrow_tail_pal4, trail23_arrow_tail_a4, .img8 = trail23_arrow_tail_pix4 }, \ .arrow = { 4, 4, 23, 16, trail23_arrow_pal4, trail23_arrow_a4, .img8 = trail23_arrow_pix4 }, \ - .arrow_zoom = { 4, 4, 23, 8, trail23_arrow_zoom_pal4, trail23_arrow_zoom_a4, .img8 = trail23_arrow_zoom_pix4 } \ + .arrow_grow = { 4, 4, 23, 8, trail23_arrow_grow_pal4, trail23_arrow_grow_a4, .img8 = trail23_arrow_grow_pix4 } \ } /* STEM - Using 4-bit color depth with 4-bit alpha */ @@ -3958,13 +3958,13 @@ const uint8_t trail23_arrow_a4[] = { 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00 }; -/* ARROW_ZOOM - Using 4-bit color depth with 4-bit alpha */ -const uint32_t trail23_arrow_zoom_pal4[] = { +/* arrow_grow - Using 4-bit color depth with 4-bit alpha */ +const uint32_t trail23_arrow_grow_pal4[] = { 0xffffff, 0xffff7f, 0xe1e8eb, 0xa6dbfc, 0xb1b2d2, 0x88cbfc, 0x888788, 0x565656, 0x3b3b3d, 0x353537, 0x313134, 0x2d2d2f, 0x252526, 0x181819, 0x000001, 0x000000 }; -const uint8_t trail23_arrow_zoom_pix4[] = { +const uint8_t trail23_arrow_grow_pix4[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0x67, 0x77, 0x77, 0x77, 0x60, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf8, 0xe6, 0x9a, 0xcc, 0xca, 0x96, 0xe7, 0xff, 0xff, 0xff, 0xff, 0xff, 0x0f, 0x07, @@ -4130,7 +4130,7 @@ const uint8_t trail23_arrow_zoom_pix4[] = { 0xff, 0xff, 0xf4, 0x53, 0x03, 0x54, 0xff, 0xff, 0xff, 0xff }; -const uint8_t trail23_arrow_zoom_a4[] = { +const uint8_t trail23_arrow_grow_a4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x89, 0x99, 0x99, 0x99, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0xff, 0xff, 0xff, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0e, diff --git a/Matrix/firmware/src/res/marker27/trail27.h b/Matrix/firmware/src/res/marker27/trail27.h index 5fbee5b..552e653 100644 --- a/Matrix/firmware/src/res/marker27/trail27.h +++ b/Matrix/firmware/src/res/marker27/trail27.h @@ -11,7 +11,7 @@ .marker_glow = { 4, 4, 27, 16, trail27_marker_glow_pal4, trail27_marker_glow_a4, .img8 = trail27_marker_glow_pix4 }, \ .arrow_tail = { 4, 4, 27, 16, trail27_arrow_tail_pal4, trail27_arrow_tail_a4, .img8 = trail27_arrow_tail_pix4 }, \ .arrow = { 4, 4, 27, 16, trail27_arrow_pal4, trail27_arrow_a4, .img8 = trail27_arrow_pix4 }, \ - .arrow_zoom = { 4, 4, 27, 8, trail27_arrow_zoom_pal4, trail27_arrow_zoom_a4, .img8 = trail27_arrow_zoom_pix4 } \ + .arrow_grow = { 4, 4, 27, 8, trail27_arrow_grow_pal4, trail27_arrow_grow_a4, .img8 = trail27_arrow_grow_pix4 } \ } /* STEM - Using 4-bit color depth with 4-bit alpha */ @@ -5418,13 +5418,13 @@ const uint8_t trail27_arrow_a4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; -/* ARROW_ZOOM - Using 4-bit color depth with 4-bit alpha */ -const uint32_t trail27_arrow_zoom_pal4[] = { +/* arrow_grow - Using 4-bit color depth with 4-bit alpha */ +const uint32_t trail27_arrow_grow_pal4[] = { 0xffffff, 0xffff72, 0xc4eafa, 0xb1c1cf, 0x8ed0fc, 0x959494, 0x676c72, 0x404042, 0x363639, 0x323235, 0x303032, 0x2a2a2b, 0x222222, 0x181018, 0x00018c, 0x000000 }; -const uint8_t trail27_arrow_zoom_pix4[] = { +const uint8_t trail27_arrow_grow_pix4[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xf0, 0xf3, 0x55, 0x55, 0x55, 0x55, 0x55, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x6f, 0x57, 0x78, 0xaa, 0xa8, 0x77, 0x5f, 0x6f, 0xff, @@ -5652,7 +5652,7 @@ const uint8_t trail27_arrow_zoom_pix4[] = { 0xff, 0xff, 0xff, 0xff }; -const uint8_t trail27_arrow_zoom_a4[] = { +const uint8_t trail27_arrow_grow_a4[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x55, 0x55, 0x55, 0x55, 0x54, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 0xff, 0xff, 0x80, 0x00, 0x00, diff --git a/Matrix/tools/trans_trail.py b/Matrix/tools/trans_trail.py index 3793185..0148bff 100644 --- a/Matrix/tools/trans_trail.py +++ b/Matrix/tools/trans_trail.py @@ -356,7 +356,7 @@ def save_as_c_header(output_dir, name, all_images, alpha_bits, color_depth=4, ta f.write(f"#define DEF_{name}{suffix} {{ \\\n") # Generate each animation field according to trail_res_t structure - trail_types = ['stem', 'marker_off', 'marker_on', 'marker_glow', 'arrow_tail', 'arrow', 'arrow_zoom'] + trail_types = ['stem', 'marker_off', 'marker_on', 'marker_glow', 'arrow_tail', 'arrow', 'arrow_grow'] for i, trail_type in enumerate(trail_types): if trail_type in all_images: @@ -488,7 +488,7 @@ def process_trail_directory(input_dir, output_dir, frame_size=13, color_depth=4, 'marker_glow': {'pattern': 'LN0001_M3', 'range': (0, 31)}, # M300-M331 'arrow_tail': {'pattern': 'LN0001_M4', 'range': (0, 31)}, # M400-M431 'arrow': {'pattern': 'LN0001_M5', 'range': (0, 31)}, # M500-M531 - 'arrow_zoom': {'pattern': 'LN0001_M6', 'range': (0, 31)} # M600-M631 + 'arrow_grow': {'pattern': 'LN0001_M6', 'range': (0, 31)} # M600-M631 } target_size = (frame_size, frame_size) @@ -572,7 +572,7 @@ if __name__ == "__main__": print(" LN0001_M300.png, LN0001_M301.png, ..., LN0001_M331.png (marker_glow)") print(" LN0001_M400.png, LN0001_M401.png, ..., LN0001_M431.png (arrow_tail)") print(" LN0001_M500.png, LN0001_M501.png, ..., LN0001_M531.png (arrow)") - print(" LN0001_M600.png, LN0001_M601.png, ..., LN0001_M631.png (arrow_zoom)") + print(" LN0001_M600.png, LN0001_M601.png, ..., LN0001_M631.png (arrow_grow)") sys.exit(1) input_dir = sys.argv[1]