Update marker plate

plot.c

@@ -631,8 +631,7 @@ static const uint8_t reference_bitmap[]={
 #define X_MARKER_OFFSET    3
 #define Y_MARKER_OFFSET   10
 #define MARKER_BITMAP(i)  (&marker_bitmap[(i)*MARKER_HEIGHT])
-static const uint8_t marker_bitmap[]=
+static const uint8_t marker_bitmap[]={
-{
 // Marker Back plate
   _BMP8(0b11111110),
   _BMP8(0b11111110),
@@ -655,6 +654,7 @@ static const uint8_t marker_bitmap[]=
   _BMP8(0b00000000),
   _BMP8(0b00000000),
   _BMP8(0b00000000),
+#if MARKERS_MAX >=2
   // Marker 2
   _BMP8(0b00000000),
   _BMP8(0b00111000),
@@ -666,6 +666,8 @@ static const uint8_t marker_bitmap[]=
   _BMP8(0b00000000),
   _BMP8(0b00000000),
   _BMP8(0b00000000),
+#endif
+#if MARKERS_MAX >=3
   // Marker 3
   _BMP8(0b00000000),
   _BMP8(0b00111000),
@@ -677,6 +679,8 @@ static const uint8_t marker_bitmap[]=
   _BMP8(0b00000000),
   _BMP8(0b00000000),
   _BMP8(0b00000000),
+#endif
+#if MARKERS_MAX >=4
   // Marker 4
   _BMP8(0b00000000),
   _BMP8(0b00001000),
@@ -688,63 +692,69 @@ static const uint8_t marker_bitmap[]=
   _BMP8(0b00001000),
   _BMP8(0b00000000),
   _BMP8(0b00000000),
-#if MARKER_COUNT > 4
+#endif
+#if MARKERS_MAX >=5
   // Marker 5
   _BMP8(0b00000000),
-  _BMP8(0b11110000),
+  _BMP8(0b01111100),
-  _BMP8(0b10000000),
+  _BMP8(0b01000000),
-  _BMP8(0b11100000),
+  _BMP8(0b01111000),
-  _BMP8(0b00010000),
+  _BMP8(0b00000100),
-  _BMP8(0b00010000),
+  _BMP8(0b01000100),
-  _BMP8(0b10010000),
+  _BMP8(0b00111000),
-  _BMP8(0b01100000),
+  _BMP8(0b00000000),
   _BMP8(0b00000000),
   _BMP8(0b00000000),
+#endif
+#if MARKERS_MAX >=6
   // Marker 6
   _BMP8(0b00000000),
-  _BMP8(0b01100000),
+  _BMP8(0b00111100),
-  _BMP8(0b10010000),
+  _BMP8(0b01000000),
-  _BMP8(0b10000000),
+  _BMP8(0b01111000),
-  _BMP8(0b11100000),
+  _BMP8(0b01000100),
-  _BMP8(0b10010000),
+  _BMP8(0b01000100),
-  _BMP8(0b10010000),
+  _BMP8(0b00111000),
-  _BMP8(0b01100000),
+  _BMP8(0b00000000),
   _BMP8(0b00000000),
   _BMP8(0b00000000),
+#endif
+#if MARKERS_MAX >=7
   // Marker 7
   _BMP8(0b00000000),
-  _BMP8(0b11110000),
+  _BMP8(0b01111100),
+  _BMP8(0b01000100),
+  _BMP8(0b00000100),
+  _BMP8(0b00001000),
+  _BMP8(0b00010000),
+  _BMP8(0b00010000),
   _BMP8(0b00010000),
-  _BMP8(0b00100000),
-  _BMP8(0b00100000),
-  _BMP8(0b01000000),
-  _BMP8(0b01000000),
-  _BMP8(0b01000000),
   _BMP8(0b00000000),
   _BMP8(0b00000000),
+#endif
+#if MARKERS_MAX >=8
   // Marker 8
   _BMP8(0b00000000),
-  _BMP8(0b01100000),
+  _BMP8(0b00111000),
-  _BMP8(0b10010000),
+  _BMP8(0b01000100),
-  _BMP8(0b10010000),
+  _BMP8(0b00111000),
-  _BMP8(0b01100000),
+  _BMP8(0b01000100),
-  _BMP8(0b10010000),
+  _BMP8(0b01000100),
-  _BMP8(0b10010000),
+  _BMP8(0b00111000),
-  _BMP8(0b01100000),
+  _BMP8(0b00000000),
   _BMP8(0b00000000),
   _BMP8(0b00000000),
-
 #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_BITMAP(i)   (&marker_bitmap[(i)*2*MARKER_HEIGHT])
-static const uint8_t marker_bitmap[]=
+static const uint8_t marker_bitmap[]={
-{
   // Marker Back plate
   _BMP16(0b1111111110000000),
   _BMP16(0b1111111110000000),
@@ -773,20 +783,23 @@ static const uint8_t marker_bitmap[]=
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
+#if MARKERS_MAX >=2
   // Marker 2
   _BMP16(0b0000000000000000),
   _BMP16(0b0001111000000000),
   _BMP16(0b0011001100000000),
   _BMP16(0b0011001100000000),
+  _BMP16(0b0000001100000000),
   _BMP16(0b0000011000000000),
-  _BMP16(0b0000110000000000),
+  _BMP16(0b0001110000000000),
-  _BMP16(0b0001100000000000),
   _BMP16(0b0011000000000000),
-  _BMP16(0b0011111100000000),
+  _BMP16(0b0011000000000000),
-  _BMP16(0b0000000000000000),
+  _BMP16(0b0011111000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
+#endif
+#if MARKERS_MAX >=3
   // Marker 3
   _BMP16(0b0000000000000000),
   _BMP16(0b0011111000000000),
@@ -801,6 +814,8 @@ static const uint8_t marker_bitmap[]=
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
+#endif
+#if MARKERS_MAX >=4
   // Marker 4
   _BMP16(0b0000000000000000),
   _BMP16(0b0000011000000000),
@@ -815,60 +830,67 @@ static const uint8_t marker_bitmap[]=
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
-#if MARKER_COUNT>4
+#endif
+#if MARKERS_MAX >=5
   // Marker 5
   _BMP16(0b0000000000000000),
-  _BMP16(0b11111100<<6),
+  _BMP16(0b0111111100000000),
-  _BMP16(0b11000000<<6),
+  _BMP16(0b0110000000000000),
-  _BMP16(0b11000000<<6),
+  _BMP16(0b0110000000000000),
-  _BMP16(0b11111000<<6),
+  _BMP16(0b0111111000000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b00001100<<6),
+  _BMP16(0b0000001100000000),
-  _BMP16(0b00001100<<6),
+  _BMP16(0b0000001100000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b01111000<<6),
+  _BMP16(0b0011111000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
+#endif
+#if MARKERS_MAX >=6
   // Marker 6
   _BMP16(0b0000000000000000),
-  _BMP16(0b01111000<<6),
+  _BMP16(0b0011111000000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b11000000<<6),
+  _BMP16(0b0110000000000000),
-  _BMP16(0b11000000<<6),
+  _BMP16(0b0110111000000000),
-  _BMP16(0b11111000<<6),
+  _BMP16(0b0111001100000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b01111000<<6),
+  _BMP16(0b0011111000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
+#endif
+#if MARKERS_MAX >=7
   // Marker 7
   _BMP16(0b0000000000000000),
-  _BMP16(0b11111100<<6),
+  _BMP16(0b0111111100000000),
-  _BMP16(0b00001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b00001100<<6),
+  _BMP16(0b0000001100000000),
-  _BMP16(0b00011000<<6),
+  _BMP16(0b0000011000000000),
-  _BMP16(0b00011000<<6),
+  _BMP16(0b0000110000000000),
-  _BMP16(0b00110000<<6),
+  _BMP16(0b0001100000000000),
-  _BMP16(0b00110000<<6),
+  _BMP16(0b0001100000000000),
-  _BMP16(0b01100000<<6),
+  _BMP16(0b0001100000000000),
-  _BMP16(0b01100000<<6),
+  _BMP16(0b0001100000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
+#endif
+#if MARKERS_MAX >=8
   // Marker 8
   _BMP16(0b0000000000000000),
-  _BMP16(0b01111000<<6),
+  _BMP16(0b0011111000000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0011111000000000),
-  _BMP16(0b01111000<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b11001100<<6),
+  _BMP16(0b0110001100000000),
-  _BMP16(0b01111000<<6),
+  _BMP16(0b0011111000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),
   _BMP16(0b0000000000000000),