From 645c536f0395979470279c0961165a231f638e4c Mon Sep 17 00:00:00 2001 From: DiSlord Date: Tue, 1 Jun 2021 22:14:38 +0300 Subject: [PATCH] Use black border for big markers --- plot.c | 252 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 130 insertions(+), 122 deletions(-) diff --git a/plot.c b/plot.c index 1eb69ce..e08a70a 100644 --- a/plot.c +++ b/plot.c @@ -735,153 +735,161 @@ static const uint8_t marker_bitmap[]={ #endif }; - #elif _MARKER_SIZE_ == 1 -#define MARKER_WIDTH 10 -#define MARKER_HEIGHT 13 -#define X_MARKER_OFFSET 4 -#define Y_MARKER_OFFSET 13 +#define MARKER_WIDTH 11 +#define MARKER_HEIGHT 14 +#define X_MARKER_OFFSET 5 +#define Y_MARKER_OFFSET 14 #define MARKER_BITMAP(i) (&marker_bitmap[(i)*2*MARKER_HEIGHT]) static const uint8_t marker_bitmap[]={ // Marker Back plate - _BMP16(0b1111111110000000), - _BMP16(0b1111111110000000), - _BMP16(0b1111111110000000), - _BMP16(0b1111111110000000), - _BMP16(0b1111111110000000), - _BMP16(0b1111111110000000), - _BMP16(0b1111111110000000), - _BMP16(0b1111111110000000), - _BMP16(0b1111111110000000), - _BMP16(0b0111111100000000), - _BMP16(0b0011111000000000), - _BMP16(0b0001110000000000), - _BMP16(0b0000100000000000), - // Marker 1 - _BMP16(0b0000000000000000), - _BMP16(0b0000110000000000), - _BMP16(0b0001110000000000), - _BMP16(0b0010110000000000), - _BMP16(0b0000110000000000), - _BMP16(0b0000110000000000), - _BMP16(0b0000110000000000), - _BMP16(0b0000110000000000), - _BMP16(0b0000110000000000), - _BMP16(0b0001111000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), _BMP16(0b0000000000000000), + _BMP16(0b0111111111000000), + _BMP16(0b0111111111000000), + _BMP16(0b0111111111000000), + _BMP16(0b0111111111000000), + _BMP16(0b0111111111000000), + _BMP16(0b0111111111000000), + _BMP16(0b0111111111000000), + _BMP16(0b0111111111000000), + _BMP16(0b0111111111000000), + _BMP16(0b0011111110000000), + _BMP16(0b0001111100000000), + _BMP16(0b0000111000000000), + _BMP16(0b0000010000000000), + // Marker 1 + _BMP16(0b1111111111100000), + _BMP16(0b1000000000100000), + _BMP16(0b1000011000100000), + _BMP16(0b1000111000100000), + _BMP16(0b1001011000100000), + _BMP16(0b1000011000100000), + _BMP16(0b1000011000100000), + _BMP16(0b1000011000100000), + _BMP16(0b1000011000100000), + _BMP16(0b1000011000100000), + _BMP16(0b0100111101000000), + _BMP16(0b0010000010000000), + _BMP16(0b0001000100000000), + _BMP16(0b0000101000000000), #if MARKERS_MAX >=2 // Marker 2 - _BMP16(0b0000000000000000), - _BMP16(0b0001111000000000), - _BMP16(0b0011001100000000), - _BMP16(0b0011001100000000), - _BMP16(0b0000001100000000), - _BMP16(0b0000011000000000), - _BMP16(0b0001110000000000), - _BMP16(0b0011000000000000), - _BMP16(0b0011000000000000), - _BMP16(0b0011111000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), + _BMP16(0b1111111111100000), + _BMP16(0b1000000000100000), + _BMP16(0b1000111100100000), + _BMP16(0b1001100110100000), + _BMP16(0b1001100110100000), + _BMP16(0b1000000110100000), + _BMP16(0b1000001100100000), + _BMP16(0b1000111000100000), + _BMP16(0b1001100000100000), + _BMP16(0b1001100000100000), + _BMP16(0b0101111101000000), + _BMP16(0b0010000010000000), + _BMP16(0b0001000100000000), + _BMP16(0b0000101000000000), #endif #if MARKERS_MAX >=3 // Marker 3 - _BMP16(0b0000000000000000), - _BMP16(0b0011111000000000), - _BMP16(0b0110001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0000001100000000), - _BMP16(0b0000111000000000), - _BMP16(0b0000001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0011111000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), + _BMP16(0b1111111111100000), + _BMP16(0b1000000000100000), + _BMP16(0b1001111100100000), + _BMP16(0b1011000110100000), + _BMP16(0b1011000110100000), + _BMP16(0b1000000110100000), + _BMP16(0b1000011100100000), + _BMP16(0b1000000110100000), + _BMP16(0b1011000110100000), + _BMP16(0b1011000110100000), + _BMP16(0b0101111101000000), + _BMP16(0b0010000010000000), + _BMP16(0b0001000100000000), + _BMP16(0b0000101000000000), #endif #if MARKERS_MAX >=4 // Marker 4 - _BMP16(0b0000000000000000), - _BMP16(0b0000011000000000), - _BMP16(0b0000111000000000), - _BMP16(0b0001111000000000), - _BMP16(0b0011011000000000), - _BMP16(0b0110011000000000), - _BMP16(0b0110011000000000), - _BMP16(0b0111111100000000), - _BMP16(0b0000011000000000), - _BMP16(0b0000011000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), + _BMP16(0b1111111111100000), + _BMP16(0b1000000000100000), + _BMP16(0b1000001100100000), + _BMP16(0b1000011100100000), + _BMP16(0b1000111100100000), + _BMP16(0b1001101100100000), + _BMP16(0b1011001100100000), + _BMP16(0b1011001100100000), + _BMP16(0b1011111110100000), + _BMP16(0b1000001100100000), + _BMP16(0b0100001101000000), + _BMP16(0b0010000010000000), + _BMP16(0b0001000100000000), + _BMP16(0b0000101000000000), #endif #if MARKERS_MAX >=5 // Marker 5 - _BMP16(0b0000000000000000), - _BMP16(0b0111111100000000), - _BMP16(0b0110000000000000), - _BMP16(0b0110000000000000), - _BMP16(0b0111111000000000), - _BMP16(0b0110001100000000), - _BMP16(0b0000001100000000), - _BMP16(0b0000001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0011111000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), + _BMP16(0b1111111111100000), + _BMP16(0b1000000000100000), + _BMP16(0b1011111110100000), + _BMP16(0b1011000000100000), + _BMP16(0b1011000000100000), + _BMP16(0b1011111100100000), + _BMP16(0b1011000110100000), + _BMP16(0b1000000110100000), + _BMP16(0b1000000110100000), + _BMP16(0b1011000110100000), + _BMP16(0b0101111101000000), + _BMP16(0b0010000010000000), + _BMP16(0b0001000100000000), + _BMP16(0b0000101000000000), #endif #if MARKERS_MAX >=6 // Marker 6 - _BMP16(0b0000000000000000), - _BMP16(0b0011111000000000), - _BMP16(0b0110001100000000), - _BMP16(0b0110000000000000), - _BMP16(0b0110111000000000), - _BMP16(0b0111001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0011111000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), + _BMP16(0b1111111111100000), + _BMP16(0b1000000000100000), + _BMP16(0b1001111100100000), + _BMP16(0b1011000110100000), + _BMP16(0b1011000000100000), + _BMP16(0b1011011100100000), + _BMP16(0b1011100110100000), + _BMP16(0b1011000110100000), + _BMP16(0b1011000110100000), + _BMP16(0b1011000110100000), + _BMP16(0b0101111101000000), + _BMP16(0b0010000010000000), + _BMP16(0b0001000100000000), + _BMP16(0b0000101000000000), #endif #if MARKERS_MAX >=7 // Marker 7 - _BMP16(0b0000000000000000), - _BMP16(0b0111111100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0000001100000000), - _BMP16(0b0000011000000000), - _BMP16(0b0000110000000000), - _BMP16(0b0001100000000000), - _BMP16(0b0001100000000000), - _BMP16(0b0001100000000000), - _BMP16(0b0001100000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), + _BMP16(0b1111111111100000), + _BMP16(0b1000000000100000), + _BMP16(0b1011111110100000), + _BMP16(0b1011000110100000), + _BMP16(0b1000000110100000), + _BMP16(0b1000001100100000), + _BMP16(0b1000011000100000), + _BMP16(0b1000110000100000), + _BMP16(0b1000110000100000), + _BMP16(0b1000110000100000), + _BMP16(0b0100110001000000), + _BMP16(0b0010000010000000), + _BMP16(0b0001000100000000), + _BMP16(0b0000101000000000), #endif #if MARKERS_MAX >=8 // Marker 8 - _BMP16(0b0000000000000000), - _BMP16(0b0011111000000000), - _BMP16(0b0110001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0011111000000000), - _BMP16(0b0110001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0110001100000000), - _BMP16(0b0011111000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), - _BMP16(0b0000000000000000), + _BMP16(0b1111111111100000), + _BMP16(0b1000000000100000), + _BMP16(0b1001111100100000), + _BMP16(0b1011000110100000), + _BMP16(0b1011000110100000), + _BMP16(0b1001111100100000), + _BMP16(0b1011000110100000), + _BMP16(0b1011000110100000), + _BMP16(0b1011000110100000), + _BMP16(0b1011000110100000), + _BMP16(0b0101111101000000), + _BMP16(0b0010000010000000), + _BMP16(0b0001000100000000), + _BMP16(0b0000101000000000), #endif }; #endif