Bläddra i källkod

Optimize BLTouch code for size (#21477)

Ramiro Polla 3 år sedan
förälder
incheckning
d30b5481f5
Inget konto är kopplat till bidragsgivarens mejladress
1 ändrade filer med 16 tillägg och 16 borttagningar
  1. 16
    16
      Marlin/src/feature/bltouch.h

+ 16
- 16
Marlin/src/feature/bltouch.h Visa fil

@@ -74,33 +74,33 @@ public:
74 74
   static bool last_written_mode; // Initialized by settings.load, 0 = Open Drain; 1 = 5V Drain
75 75
 
76 76
   // DEPLOY and STOW are wrapped for error handling - these are used by homing and by probing
77
-  FORCE_INLINE static bool deploy()              { return deploy_proc(); }
78
-  FORCE_INLINE static bool stow()                { return stow_proc(); }
79
-  FORCE_INLINE static bool status()              { return status_proc(); }
77
+  static bool deploy()              { return deploy_proc(); }
78
+  static bool stow()                { return stow_proc(); }
79
+  static bool status()              { return status_proc(); }
80 80
 
81 81
   // Native BLTouch commands ("Underscore"...), used in lcd menus and internally
82
-  FORCE_INLINE static void _reset()              { command(BLTOUCH_RESET, BLTOUCH_RESET_DELAY); }
82
+  static void _reset()              { command(BLTOUCH_RESET, BLTOUCH_RESET_DELAY); }
83 83
 
84
-  FORCE_INLINE static void _selftest()           { command(BLTOUCH_SELFTEST, BLTOUCH_DELAY); }
84
+  static void _selftest()           { command(BLTOUCH_SELFTEST, BLTOUCH_DELAY); }
85 85
 
86
-  FORCE_INLINE static void _set_SW_mode()        { command(BLTOUCH_SW_MODE, BLTOUCH_DELAY); }
87
-  FORCE_INLINE static void _reset_SW_mode()      { if (triggered()) _stow(); else _deploy(); }
86
+  static void _set_SW_mode()        { command(BLTOUCH_SW_MODE, BLTOUCH_DELAY); }
87
+  static void _reset_SW_mode()      { if (triggered()) _stow(); else _deploy(); }
88 88
 
89
-  FORCE_INLINE static void _set_5V_mode()        { command(BLTOUCH_5V_MODE, BLTOUCH_SET5V_DELAY); }
90
-  FORCE_INLINE static void _set_OD_mode()        { command(BLTOUCH_OD_MODE, BLTOUCH_SETOD_DELAY); }
91
-  FORCE_INLINE static void _mode_store()         { command(BLTOUCH_MODE_STORE, BLTOUCH_MODE_STORE_DELAY); }
89
+  static void _set_5V_mode()        { command(BLTOUCH_5V_MODE, BLTOUCH_SET5V_DELAY); }
90
+  static void _set_OD_mode()        { command(BLTOUCH_OD_MODE, BLTOUCH_SETOD_DELAY); }
91
+  static void _mode_store()         { command(BLTOUCH_MODE_STORE, BLTOUCH_MODE_STORE_DELAY); }
92 92
 
93
-  FORCE_INLINE static void _deploy()             { command(BLTOUCH_DEPLOY, BLTOUCH_DEPLOY_DELAY); }
94
-  FORCE_INLINE static void _stow()               { command(BLTOUCH_STOW, BLTOUCH_STOW_DELAY); }
93
+  static void _deploy()             { command(BLTOUCH_DEPLOY, BLTOUCH_DEPLOY_DELAY); }
94
+  static void _stow()               { command(BLTOUCH_STOW, BLTOUCH_STOW_DELAY); }
95 95
 
96
-  FORCE_INLINE static void mode_conv_5V()        { mode_conv_proc(true); }
97
-  FORCE_INLINE static void mode_conv_OD()        { mode_conv_proc(false); }
96
+  static void mode_conv_5V()        { mode_conv_proc(true); }
97
+  static void mode_conv_OD()        { mode_conv_proc(false); }
98 98
 
99 99
   static bool triggered();
100 100
 
101 101
 private:
102
-  FORCE_INLINE static bool _deploy_query_alarm() { return command(BLTOUCH_DEPLOY, BLTOUCH_DEPLOY_DELAY); }
103
-  FORCE_INLINE static bool _stow_query_alarm()   { return command(BLTOUCH_STOW, BLTOUCH_STOW_DELAY) == STOW_ALARM; }
102
+  static bool _deploy_query_alarm() { return command(BLTOUCH_DEPLOY, BLTOUCH_DEPLOY_DELAY); }
103
+  static bool _stow_query_alarm()   { return command(BLTOUCH_STOW, BLTOUCH_STOW_DELAY) == STOW_ALARM; }
104 104
 
105 105
   static void clear();
106 106
   static bool command(const BLTCommand cmd, const millis_t &ms);

Laddar…
Avbryt
Spara