bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Reduce code size with plain inlines

Browse Source
This commit is contained in:
Scott Lahteine
2018-11-11 07:51:39 -06:00
parent 30a49f5ee2
commit 471f403a67
9 changed files with 74 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Marlin/src/feature/leds/leds.h
View File

@@ -146,7 +146,7 @@ public:
#endif
);
FORCE_INLINE void set_color(uint8_t r, uint8_t g, uint8_t b
inline void set_color(uint8_t r, uint8_t g, uint8_t b
#if HAS_WHITE_LED
, uint8_t w=0
#if ENABLED(NEOPIXEL_LED)
@@ -164,23 +164,23 @@ public:
);
}
FORCE_INLINE static void set_off() { set_color(LEDColorOff()); }
FORCE_INLINE static void set_green() { set_color(LEDColorGreen()); }
FORCE_INLINE static void set_white() { set_color(LEDColorWhite()); }
static inline void set_off() { set_color(LEDColorOff()); }
static inline void set_green() { set_color(LEDColorGreen()); }
static inline void set_white() { set_color(LEDColorWhite()); }
#if ENABLED(LED_COLOR_PRESETS)
static const LEDColor defaultLEDColor;
FORCE_INLINE static void set_default() { set_color(defaultLEDColor); }
FORCE_INLINE static void set_red() { set_color(LEDColorRed()); }
FORCE_INLINE static void set_orange() { set_color(LEDColorOrange()); }
FORCE_INLINE static void set_yellow() { set_color(LEDColorYellow()); }
FORCE_INLINE static void set_blue() { set_color(LEDColorBlue()); }
FORCE_INLINE static void set_indigo() { set_color(LEDColorIndigo()); }
FORCE_INLINE static void set_violet() { set_color(LEDColorViolet()); }
static inline void set_default() { set_color(defaultLEDColor); }
static inline void set_red() { set_color(LEDColorRed()); }
static inline void set_orange() { set_color(LEDColorOrange()); }
static inline void set_yellow() { set_color(LEDColorYellow()); }
static inline void set_blue() { set_color(LEDColorBlue()); }
static inline void set_indigo() { set_color(LEDColorIndigo()); }
static inline void set_violet() { set_color(LEDColorViolet()); }
#endif
#if ENABLED(PRINTER_EVENT_LEDS)
FORCE_INLINE static LEDColor get_color() { return lights_on ? color : LEDColorOff(); }
static inline LEDColor get_color() { return lights_on ? color : LEDColorOff(); }
#endif
#if ENABLED(LED_CONTROL_MENU) || ENABLED(PRINTER_EVENT_LEDS)
@@ -189,7 +189,7 @@ public:
#endif
#if ENABLED(LED_CONTROL_MENU)
static void toggle(); // swap "off" with color
FORCE_INLINE static void update() { set_color(color); }
static inline void update() { set_color(color); }
#endif
};

12
Marlin/src/feature/leds/printer_event_leds.h
View File

@@ -38,23 +38,23 @@ private:
public:
#if HAS_TEMP_HOTEND
FORCE_INLINE static LEDColor onHotendHeatingStart() { old_intensity = 0; return leds.get_color(); }
static inline LEDColor onHotendHeatingStart() { old_intensity = 0; return leds.get_color(); }
static void onHotendHeating(const float &start, const float &current, const float &target);
#endif
#if HAS_HEATED_BED
FORCE_INLINE static LEDColor onBedHeatingStart() { old_intensity = 127; return leds.get_color(); }
static inline LEDColor onBedHeatingStart() { old_intensity = 127; return leds.get_color(); }
static void onBedHeating(const float &start, const float &current, const float &target);
#endif
#if HAS_TEMP_HOTEND || HAS_HEATED_BED
FORCE_INLINE static void onHeatingDone() { leds.set_color(LEDColorWhite()); }
FORCE_INLINE static void onPidTuningDone(LEDColor c) { leds.set_color(c); }
static inline void onHeatingDone() { leds.set_color(LEDColorWhite()); }
static inline void onPidTuningDone(LEDColor c) { leds.set_color(c); }
#endif
#if ENABLED(SDSUPPORT)
FORCE_INLINE static void onPrintCompleted() {
static inline void onPrintCompleted() {
leds.set_green();
#if HAS_LEDS_OFF_FLAG
leds_off_after_print = true;
@@ -64,7 +64,7 @@ public:
#endif
}
FORCE_INLINE static void onResumeAfterWait() {
static inline void onResumeAfterWait() {
#if HAS_LEDS_OFF_FLAG
if (leds_off_after_print) {
leds.set_off();