|
@@ -624,7 +624,7 @@
|
624
|
624
|
#define STATUS_AMMETER_X (LCD_PIXEL_WIDTH - (STATUS_AMMETER_BYTEWIDTH + STATUS_FLOWMETER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_CUTTER_BYTEWIDTH + STATUS_COOLER_BYTEWIDTH) * 8)
|
625
|
625
|
#endif
|
626
|
626
|
#ifndef STATUS_AMMETER_HEIGHT
|
627
|
|
- #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp1) / (STATUS_AMMETER_BYTEWIDTH))
|
|
627
|
+ #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp_mA) / (STATUS_AMMETER_BYTEWIDTH))
|
628
|
628
|
#endif
|
629
|
629
|
#ifndef STATUS_AMMETER_Y
|
630
|
630
|
#define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S))
|
|
@@ -633,8 +633,8 @@
|
633
|
633
|
#define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7)
|
634
|
634
|
#endif
|
635
|
635
|
static_assert(
|
636
|
|
- sizeof(status_ammeter_bmp1) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
|
637
|
|
- "Status ammeter bitmap (status_ammeter_bmp1) dimensions don't match data."
|
|
636
|
+ sizeof(status_ammeter_bmp_mA) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0),
|
|
637
|
+ "Status ammeter bitmap (status_ammeter_bmp_mA) dimensions don't match data."
|
638
|
638
|
);
|
639
|
639
|
#endif
|
640
|
640
|
|