From 00cdd41b5f048aee4f1363acfe477e9bc5ddd010 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 23 Jan 2019 20:08:43 -0600
Subject: [PATCH] Clean up for recent changes
---
Marlin/src/HAL/shared/HAL_spi_L6470.cpp | 6 +++---
Marlin/src/lcd/language/language_en.h | 11 ++++-------
Marlin/src/lcd/language/language_it.h | 9 ++++-----
3 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
index db79a846a3..d009ad5351 100644
--- a/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
+++ b/Marlin/src/HAL/shared/HAL_spi_L6470.cpp
@@ -95,11 +95,11 @@ uint8_t L6470_SpiTransfer_Mode_3(uint8_t b) { // using Mode 3
* defined by the client (Marlin) to provide an SPI interface.
*/
-uint8_t L6470_transfer(uint8_t data, int _SSPin, const uint8_t chain_position) {
+uint8_t L6470_transfer(uint8_t data, int16_t ss_pin, const uint8_t chain_position) {
uint8_t data_out = 0;
// first device in chain has data sent last
- digitalWrite(_SSPin, LOW);
+ digitalWrite(ss_pin, LOW);
for (uint8_t i = L6470::chain[0]; (i >= 1) && !spi_abort; i--) { // stop sending data if spi_abort is active
DISABLE_ISRS(); // disable interrupts during SPI transfer (can't allow partial command to chips)
@@ -108,7 +108,7 @@ uint8_t L6470_transfer(uint8_t data, int _SSPin, const uint8_t chain_position) {
if (i == chain_position) data_out = temp;
}
- digitalWrite(_SSPin, HIGH);
+ digitalWrite(ss_pin, HIGH);
return data_out;
}
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
index 00c0ff9c4d..7b903a8b5c 100644
--- a/Marlin/src/lcd/language/language_en.h
+++ b/Marlin/src/lcd/language/language_en.h
@@ -169,20 +169,17 @@
#ifndef MSG_COOLDOWN
#define MSG_COOLDOWN _UxGT("Cooldown")
#endif
-#ifndef MSG_LASER
- #define MSG_LASER _UxGT("Laser")
-#endif
#ifndef MSG_LASER_MENU
- #define MSG_LASER_MENU MSG_LASER _UxGT(" Control")
+ #define MSG_LASER_MENU _UxGT("Laser Control")
#endif
#ifndef MSG_LASER_OFF
- #define MSG_LASER_OFF MSG_LASER _UxGT(" Off")
+ #define MSG_LASER_OFF _UxGT("Laser Off")
#endif
#ifndef MSG_LASER_ON
- #define MSG_LASER_ON MSG_LASER _UxGT(" On")
+ #define MSG_LASER_ON _UxGT("Laser On")
#endif
#ifndef MSG_LASER_POWER
- #define MSG_LASER_POWER MSG_LASER _UxGT(" power")
+ #define MSG_LASER_POWER _UxGT("Laser power")
#endif
#ifndef MSG_SPINDLE_REVERSE
#define MSG_SPINDLE_REVERSE _UxGT("Spindle Reverse")
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
index da5105d799..fbfaf2019b 100644
--- a/Marlin/src/lcd/language/language_it.h
+++ b/Marlin/src/lcd/language/language_it.h
@@ -71,11 +71,10 @@
#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2_N _UxGT("conf")
#define MSG_PREHEAT_CUSTOM _UxGT("Prerisc.personal.")
#define MSG_COOLDOWN _UxGT("Raffredda")
-#define MSG_LASER _UxGT("Laser")
-#define MSG_LASER_MENU _UxGT("Controllo ") MSG_LASER
-#define MSG_LASER_OFF MSG_LASER _UxGT(" Off")
-#define MSG_LASER_ON MSG_LASER _UxGT(" On")
-#define MSG_LASER_POWER _UxGT("Potenza ") MSG_LASER
+#define MSG_LASER_MENU _UxGT("Controllo laser")
+#define MSG_LASER_OFF _UxGT("Laser Off")
+#define MSG_LASER_ON _UxGT("Laser On")
+#define MSG_LASER_POWER _UxGT("Potenza laser")
#define MSG_SPINDLE_REVERSE _UxGT("Inverti mandrino")
#define MSG_SWITCH_PS_ON _UxGT("Accendi aliment.")
#define MSG_SWITCH_PS_OFF _UxGT("Spegni aliment.")
--
GitLab