zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Clean up for recent changes

Browse source
This commit is contained in:
Scott Lahteine 2019-01-23 20:08:43 -06:00
parent 7d53b79596
commit 00cdd41b5f
3 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marlin/src/HAL/shared/HAL_spi_L6470.cpp
View file

@ -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. * 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; uint8_t data_out = 0;
// first device in chain has data sent last // 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 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) 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; if (i == chain_position) data_out = temp;
} }
digitalWrite(_SSPin, HIGH); digitalWrite(ss_pin, HIGH);
return data_out; return data_out;
} }

11
Marlin/src/lcd/language/language_en.h
View file

@ -169,20 +169,17 @@
#ifndef MSG_COOLDOWN #ifndef MSG_COOLDOWN
#define MSG_COOLDOWN _UxGT("Cooldown") #define MSG_COOLDOWN _UxGT("Cooldown")
#endif #endif
#ifndef MSG_LASER
#define MSG_LASER _UxGT("Laser")
#endif
#ifndef MSG_LASER_MENU #ifndef MSG_LASER_MENU
#define MSG_LASER_MENU MSG_LASER _UxGT(" Control") #define MSG_LASER_MENU _UxGT("Laser Control")
#endif #endif
#ifndef MSG_LASER_OFF #ifndef MSG_LASER_OFF
#define MSG_LASER_OFF MSG_LASER _UxGT(" Off") #define MSG_LASER_OFF _UxGT("Laser Off")
#endif #endif
#ifndef MSG_LASER_ON #ifndef MSG_LASER_ON
#define MSG_LASER_ON MSG_LASER _UxGT(" On") #define MSG_LASER_ON _UxGT("Laser On")
#endif #endif
#ifndef MSG_LASER_POWER #ifndef MSG_LASER_POWER
#define MSG_LASER_POWER MSG_LASER _UxGT(" power") #define MSG_LASER_POWER _UxGT("Laser power")
#endif #endif
#ifndef MSG_SPINDLE_REVERSE #ifndef MSG_SPINDLE_REVERSE
#define MSG_SPINDLE_REVERSE _UxGT("Spindle Reverse") #define MSG_SPINDLE_REVERSE _UxGT("Spindle Reverse")

9
Marlin/src/lcd/language/language_it.h
View file

@ -71,11 +71,10 @@
#define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2_N _UxGT("conf") #define MSG_PREHEAT_2_SETTINGS MSG_PREHEAT_2_N _UxGT("conf")
#define MSG_PREHEAT_CUSTOM _UxGT("Prerisc.personal.") #define MSG_PREHEAT_CUSTOM _UxGT("Prerisc.personal.")
#define MSG_COOLDOWN _UxGT("Raffredda") #define MSG_COOLDOWN _UxGT("Raffredda")
#define MSG_LASER _UxGT("Laser") #define MSG_LASER_MENU _UxGT("Controllo laser")
#define MSG_LASER_MENU _UxGT("Controllo ") MSG_LASER #define MSG_LASER_OFF _UxGT("Laser Off")
#define MSG_LASER_OFF MSG_LASER _UxGT(" Off") #define MSG_LASER_ON _UxGT("Laser On")
#define MSG_LASER_ON MSG_LASER _UxGT(" On") #define MSG_LASER_POWER _UxGT("Potenza laser")
#define MSG_LASER_POWER _UxGT("Potenza ") MSG_LASER
#define MSG_SPINDLE_REVERSE _UxGT("Inverti mandrino") #define MSG_SPINDLE_REVERSE _UxGT("Inverti mandrino")
#define MSG_SWITCH_PS_ON _UxGT("Accendi aliment.") #define MSG_SWITCH_PS_ON _UxGT("Accendi aliment.")
#define MSG_SWITCH_PS_OFF _UxGT("Spegni aliment.") #define MSG_SWITCH_PS_OFF _UxGT("Spegni aliment.")