ソースを参照

Clean up for recent changes

Scott Lahteine 6年前
コミット
00cdd41b5f

+ 3
- 3
Marlin/src/HAL/shared/HAL_spi_L6470.cpp ファイルの表示

95
  * defined by the client (Marlin) to provide an SPI interface.
95
  * defined by the client (Marlin) to provide an SPI interface.
96
  */
96
  */
97
 
97
 
98
-uint8_t L6470_transfer(uint8_t data, int _SSPin, const uint8_t chain_position) {
98
+uint8_t L6470_transfer(uint8_t data, int16_t ss_pin, const uint8_t chain_position) {
99
   uint8_t data_out = 0;
99
   uint8_t data_out = 0;
100
 
100
 
101
   // first device in chain has data sent last
101
   // first device in chain has data sent last
102
-  digitalWrite(_SSPin, LOW);
102
+  digitalWrite(ss_pin, LOW);
103
 
103
 
104
   for (uint8_t i = L6470::chain[0]; (i >= 1) && !spi_abort; i--) {    // stop sending data if spi_abort is active
104
   for (uint8_t i = L6470::chain[0]; (i >= 1) && !spi_abort; i--) {    // stop sending data if spi_abort is active
105
     DISABLE_ISRS();  // disable interrupts during SPI transfer (can't allow partial command to chips)
105
     DISABLE_ISRS();  // disable interrupts during SPI transfer (can't allow partial command to chips)
108
     if (i == chain_position) data_out = temp;
108
     if (i == chain_position) data_out = temp;
109
   }
109
   }
110
 
110
 
111
-  digitalWrite(_SSPin, HIGH);
111
+  digitalWrite(ss_pin, HIGH);
112
   return data_out;
112
   return data_out;
113
 }
113
 }
114
 
114
 

+ 4
- 7
Marlin/src/lcd/language/language_en.h ファイルの表示

169
 #ifndef MSG_COOLDOWN
169
 #ifndef MSG_COOLDOWN
170
   #define MSG_COOLDOWN                        _UxGT("Cooldown")
170
   #define MSG_COOLDOWN                        _UxGT("Cooldown")
171
 #endif
171
 #endif
172
-#ifndef MSG_LASER
173
-  #define MSG_LASER                           _UxGT("Laser")
174
-#endif
175
 #ifndef MSG_LASER_MENU
172
 #ifndef MSG_LASER_MENU
176
-  #define MSG_LASER_MENU                      MSG_LASER _UxGT(" Control")
173
+  #define MSG_LASER_MENU                      _UxGT("Laser Control")
177
 #endif
174
 #endif
178
 #ifndef MSG_LASER_OFF
175
 #ifndef MSG_LASER_OFF
179
-  #define MSG_LASER_OFF                       MSG_LASER _UxGT(" Off")
176
+  #define MSG_LASER_OFF                       _UxGT("Laser Off")
180
 #endif
177
 #endif
181
 #ifndef MSG_LASER_ON
178
 #ifndef MSG_LASER_ON
182
-  #define MSG_LASER_ON                        MSG_LASER _UxGT(" On")
179
+  #define MSG_LASER_ON                        _UxGT("Laser On")
183
 #endif
180
 #endif
184
 #ifndef MSG_LASER_POWER
181
 #ifndef MSG_LASER_POWER
185
-  #define MSG_LASER_POWER                     MSG_LASER _UxGT(" power")
182
+  #define MSG_LASER_POWER                     _UxGT("Laser power")
186
 #endif
183
 #endif
187
 #ifndef MSG_SPINDLE_REVERSE
184
 #ifndef MSG_SPINDLE_REVERSE
188
   #define MSG_SPINDLE_REVERSE                 _UxGT("Spindle Reverse")
185
   #define MSG_SPINDLE_REVERSE                 _UxGT("Spindle Reverse")

+ 4
- 5
Marlin/src/lcd/language/language_it.h ファイルの表示

71
 #define MSG_PREHEAT_2_SETTINGS              MSG_PREHEAT_2_N _UxGT("conf")
71
 #define MSG_PREHEAT_2_SETTINGS              MSG_PREHEAT_2_N _UxGT("conf")
72
 #define MSG_PREHEAT_CUSTOM                  _UxGT("Prerisc.personal.")
72
 #define MSG_PREHEAT_CUSTOM                  _UxGT("Prerisc.personal.")
73
 #define MSG_COOLDOWN                        _UxGT("Raffredda")
73
 #define MSG_COOLDOWN                        _UxGT("Raffredda")
74
-#define MSG_LASER                           _UxGT("Laser")
75
-#define MSG_LASER_MENU                      _UxGT("Controllo ") MSG_LASER
76
-#define MSG_LASER_OFF                       MSG_LASER _UxGT(" Off")
77
-#define MSG_LASER_ON                        MSG_LASER _UxGT(" On")
78
-#define MSG_LASER_POWER                     _UxGT("Potenza ") MSG_LASER
74
+#define MSG_LASER_MENU                      _UxGT("Controllo laser")
75
+#define MSG_LASER_OFF                       _UxGT("Laser Off")
76
+#define MSG_LASER_ON                        _UxGT("Laser On")
77
+#define MSG_LASER_POWER                     _UxGT("Potenza laser")
79
 #define MSG_SPINDLE_REVERSE                 _UxGT("Inverti mandrino")
78
 #define MSG_SPINDLE_REVERSE                 _UxGT("Inverti mandrino")
80
 #define MSG_SWITCH_PS_ON                    _UxGT("Accendi aliment.")
79
 #define MSG_SWITCH_PS_ON                    _UxGT("Accendi aliment.")
81
 #define MSG_SWITCH_PS_OFF                   _UxGT("Spegni aliment.")
80
 #define MSG_SWITCH_PS_OFF                   _UxGT("Spegni aliment.")

読み込み中…
キャンセル
保存