|
110 | 110 | //
|
111 | 111 | // Laser Ammeter
|
112 | 112 | //
|
113 |
| -#if !STATUS_AMMETER_WIDTH && ENABLED(I2C_AMMETER) |
114 |
| - #include "status/ammeter.h" |
115 |
| -#endif |
116 |
| -#ifndef STATUS_AMMETER_WIDTH |
117 |
| - #define STATUS_AMMETER_WIDTH 0 |
118 |
| -#endif |
119 |
| -#ifndef STATUS_AMMETER_BYTEWIDTH |
120 |
| - #define STATUS_AMMETER_BYTEWIDTH BW(STATUS_AMMETER_WIDTH) |
| 113 | +#if ENABLED(I2C_AMMETER) |
| 114 | + #if !STATUS_AMMETER_WIDTH |
| 115 | + #include "status/ammeter.h" |
| 116 | + #endif |
| 117 | + #ifndef STATUS_AMMETER_WIDTH |
| 118 | + #define STATUS_AMMETER_WIDTH 0 |
| 119 | + #endif |
121 | 120 | #endif
|
122 | 121 |
|
123 | 122 | //
|
|
614 | 613 | #endif
|
615 | 614 | #endif
|
616 | 615 |
|
617 |
| -#if ENABLED(I2C_AMMETER) |
618 |
| - #if STATUS_AMMETER_WIDTH |
619 |
| - |
620 |
| - #ifndef STATUS_AMMETER_X |
621 |
| - #define STATUS_AMMETER_X (LCD_PIXEL_WIDTH - (STATUS_AMMETER_BYTEWIDTH + STATUS_FLOWMETER_BYTEWIDTH + STATUS_FAN_BYTEWIDTH + STATUS_CUTTER_BYTEWIDTH + STATUS_COOLER_BYTEWIDTH) * 8) |
622 |
| - #endif |
623 |
| - |
624 |
| - #ifndef STATUS_AMMETER_HEIGHT |
625 |
| - #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp1) / (STATUS_AMMETER_BYTEWIDTH)) |
626 |
| - #endif |
627 |
| - |
628 |
| - #ifndef STATUS_AMMETER_Y |
629 |
| - #define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S)) |
630 |
| - #endif |
631 |
| - |
632 |
| - #ifndef STATUS_AMMETER_TEXT_X |
633 |
| - #define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7) |
634 |
| - #endif |
635 |
| - |
636 |
| - static_assert( |
637 |
| - sizeof(status_ammeter_bmp1) == (STATUS_AMMETER_BYTEWIDTH) * STATUS_AMMETER_HEIGHT(0), |
638 |
| - "Status ammeter bitmap (status_ammeter_bmp1) dimensions don't match data." |
639 |
| - ); |
| 616 | +// |
| 617 | +// I2C Laser Ammeter |
| 618 | +// |
| 619 | +#if ENABLED(I2C_AMMETER) && STATUS_AMMETER_WIDTH |
| 620 | + #ifndef STATUS_AMMETER_BYTEWIDTH |
| 621 | + #define STATUS_AMMETER_BYTEWIDTH BW(STATUS_AMMETER_WIDTH) |
640 | 622 | #endif
|
| 623 | + #ifndef STATUS_AMMETER_X |
| 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 | + #endif |
| 626 | + #ifndef STATUS_AMMETER_HEIGHT |
| 627 | + #define STATUS_AMMETER_HEIGHT(S) (sizeof(status_ammeter_bmp1) / (STATUS_AMMETER_BYTEWIDTH)) |
| 628 | + #endif |
| 629 | + #ifndef STATUS_AMMETER_Y |
| 630 | + #define STATUS_AMMETER_Y(S) (18 - STATUS_AMMETER_HEIGHT(S)) |
| 631 | + #endif |
| 632 | + #ifndef STATUS_AMMETER_TEXT_X |
| 633 | + #define STATUS_AMMETER_TEXT_X (STATUS_AMMETER_X + 7) |
| 634 | + #endif |
| 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." |
| 638 | + ); |
641 | 639 | #endif
|
642 | 640 |
|
643 | 641 | //
|
|
0 commit comments