andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

🎨 Fix some formatting, F() versus PSTR()

vanilla_fb_2.0.x
Scott Lahteine 3 years ago
parent
0c401bddad
commit
30665737dc
15 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      Marlin/src/feature/leds/pca9533.cpp
  2. 2
      Marlin/src/feature/power.cpp
  3. 2
      Marlin/src/gcode/calibrate/G28.cpp
  4. 2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
  5. 2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
  6. 4
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
  7. 2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
  8. 2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
  9. 2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
  10. 2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
  11. 2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
  12. 6
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
  13. 2
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
  14. 8
      Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
  15. 2
      Marlin/src/libs/hex_print.cpp

4
Marlin/src/feature/leds/pca9533.cpp
View File

@ -36,7 +36,7 @@ void PCA9533_init() {
PCA9533_reset(); PCA9533_reset();
} }
static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1, uint8_t pwm1, uint8_t ls0){ static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1, uint8_t pwm1, uint8_t ls0) {
uint8_t data[6] = { PCA9533_REG_PSC0 | PCA9533_REGM_AI, psc0, pwm0, psc1, pwm1, ls0 }; uint8_t data[6] = { PCA9533_REG_PSC0 | PCA9533_REGM_AI, psc0, pwm0, psc1, pwm1, ls0 };
Wire.beginTransmission(PCA9533_Addr >> 1); Wire.beginTransmission(PCA9533_Addr >> 1);
Wire.write(data, 6); Wire.write(data, 6);
@ -44,7 +44,7 @@ static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1,
delayMicroseconds(1); delayMicroseconds(1);
} }
static void PCA9533_writeRegister(uint8_t reg, uint8_t val){ static void PCA9533_writeRegister(uint8_t reg, uint8_t val) {
uint8_t data[2] = { reg, val }; uint8_t data[2] = { reg, val };
Wire.beginTransmission(PCA9533_Addr >> 1); Wire.beginTransmission(PCA9533_Addr >> 1);
Wire.write(data, 2); Wire.write(data, 2);

2
Marlin/src/feature/power.cpp
View File

@ -57,7 +57,7 @@ bool Power::psu_on;
* Initialize pins & state for the power manager. * Initialize pins & state for the power manager.
* *
*/ */
void Power::init(){ void Power::init() {
psu_on = ENABLED(PSU_DEFAULT_OFF); // Set opposite state to get full power_off/on psu_on = ENABLED(PSU_DEFAULT_OFF); // Set opposite state to get full power_off/on
TERN(PSU_DEFAULT_OFF, power_off(), power_on()); TERN(PSU_DEFAULT_OFF, power_off(), power_on());
} }

2
Marlin/src/gcode/calibrate/G28.cpp
View File

@ -268,7 +268,7 @@ void GcodeSuite::G28() {
#endif #endif
#if HAS_HOMING_CURRENT #if HAS_HOMING_CURRENT
auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b){ auto debug_current = [](PGM_P const s, const int16_t a, const int16_t b) {
DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b); DEBUG_ECHOPGM_P(s); DEBUG_ECHOLNPAIR(" current: ", a, " -> ", b);
}; };
#if HAS_CURRENT_HOME(X) #if HAS_CURRENT_HOME(X)

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
View File

@ -36,7 +36,7 @@ bool BioConfirmHomeE::onTouchEnd(uint8_t tag) {
switch (tag) { switch (tag) {
case 1: case 1:
#if defined(AXIS_LEVELING_COMMANDS) && defined(PARK_AND_RELEASE_COMMANDS) #if defined(AXIS_LEVELING_COMMANDS) && defined(PARK_AND_RELEASE_COMMANDS)
SpinnerDialogBox::enqueueAndWait(F( SpinnerDialogBox::enqueueAndWait_P(PSTR(
"G28 E\n" "G28 E\n"
AXIS_LEVELING_COMMANDS "\n" AXIS_LEVELING_COMMANDS "\n"
PARK_AND_RELEASE_COMMANDS PARK_AND_RELEASE_COMMANDS

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
View File

@ -36,7 +36,7 @@ bool BioConfirmHomeXYZ::onTouchEnd(uint8_t tag) {
switch (tag) { switch (tag) {
case 1: case 1:
#ifdef PARK_AND_RELEASE_COMMANDS #ifdef PARK_AND_RELEASE_COMMANDS
SpinnerDialogBox::enqueueAndWait(F( SpinnerDialogBox::enqueueAndWait_P(PSTR(
"G28\n" "G28\n"
PARK_AND_RELEASE_COMMANDS PARK_AND_RELEASE_COMMANDS
)); ));

4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
View File

@ -69,10 +69,10 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
switch (tag) { switch (tag) {
case 1: SaveSettingsDialogBox::promptToSaveSettings(); break; case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
case 2: GOTO_SCREEN(BioConfirmHomeXYZ); break; case 2: GOTO_SCREEN(BioConfirmHomeXYZ); break;
case 3: SpinnerDialogBox::enqueueAndWait(e_homed ? F("G0 E0 F120") : F("G112")); break; case 3: SpinnerDialogBox::enqueueAndWait_P(e_homed ? PSTR("G0 E0 F120") : PSTR("G112")); break;
case 4: StatusScreen::unlockMotors(); break; case 4: StatusScreen::unlockMotors(); break;
#ifdef AXIS_LEVELING_COMMANDS #ifdef AXIS_LEVELING_COMMANDS
case 5: SpinnerDialogBox::enqueueAndWait(F(AXIS_LEVELING_COMMANDS)); break; case 5: SpinnerDialogBox::enqueueAndWait_P(PSTR(AXIS_LEVELING_COMMANDS)); break;
#endif #endif
case 6: GOTO_SCREEN(TemperatureScreen); break; case 6: GOTO_SCREEN(TemperatureScreen); break;
case 7: GOTO_SCREEN(InterfaceSettingsScreen); break; case 7: GOTO_SCREEN(InterfaceSettingsScreen); break;

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
View File

@ -316,7 +316,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
case 9: GOTO_SCREEN(FilesScreen); break; case 9: GOTO_SCREEN(FilesScreen); break;
case 10: GOTO_SCREEN(MainMenu); break; case 10: GOTO_SCREEN(MainMenu); break;
case 13: GOTO_SCREEN(BioConfirmHomeE); break; case 13: GOTO_SCREEN(BioConfirmHomeE); break;
case 14: SpinnerDialogBox::enqueueAndWait(F("G28Z")); break; case 14: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Z")); break;
case 15: GOTO_SCREEN(TemperatureScreen); break; case 15: GOTO_SCREEN(TemperatureScreen); break;
case 16: fine_motion = !fine_motion; break; case 16: fine_motion = !fine_motion; break;
default: return false; default: return false;

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
View File

@ -67,7 +67,7 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
case 3: GOTO_SCREEN(TemperatureScreen); break; case 3: GOTO_SCREEN(TemperatureScreen); break;
case 4: GOTO_SCREEN(NudgeNozzleScreen); break; case 4: GOTO_SCREEN(NudgeNozzleScreen); break;
case 5: GOTO_SCREEN(BioConfirmHomeXYZ); break; case 5: GOTO_SCREEN(BioConfirmHomeXYZ); break;
case 6: SpinnerDialogBox::enqueueAndWait(F("G0 E0 F120")); break; case 6: SpinnerDialogBox::enqueueAndWait_P(PSTR("G0 E0 F120")); break;
case 7: StatusScreen::unlockMotors(); break; case 7: StatusScreen::unlockMotors(); break;
default: default:
return false; return false;

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
View File

@ -82,7 +82,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
case 3: BedMeshViewScreen::show(); break; case 3: BedMeshViewScreen::show(); break;
case 4: BedMeshEditScreen::show(); break; case 4: BedMeshEditScreen::show(); break;
case 5: injectCommands_P(PSTR("M280 P0 S60")); break; case 5: injectCommands_P(PSTR("M280 P0 S60")); break;
case 6: SpinnerDialogBox::enqueueAndWait(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break; case 6: SpinnerDialogBox::enqueueAndWait_P(PSTR("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
default: return false; default: return false;
} }
return true; return true;

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
View File

@ -233,7 +233,7 @@ bool StatusScreen::onTouchStart(uint8_t) {
bool StatusScreen::onTouchEnd(uint8_t tag) { bool StatusScreen::onTouchEnd(uint8_t tag) {
switch (tag) { switch (tag) {
case 1: SpinnerDialogBox::enqueueAndWait(F("G28 O\nG27")); break; case 1: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28 O\nG27")); break;
case 2: GOTO_SCREEN(LoadChocolateScreen); break; case 2: GOTO_SCREEN(LoadChocolateScreen); break;
case 3: GOTO_SCREEN(PreheatMenu); break; case 3: GOTO_SCREEN(PreheatMenu); break;
case 4: GOTO_SCREEN(MainMenu); break; case 4: GOTO_SCREEN(MainMenu); break;

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
View File

@ -191,7 +191,7 @@ bool BedMeshEditScreen::onTouchEnd(uint8_t tag) {
void BedMeshEditScreen::show() { void BedMeshEditScreen::show() {
// On entry, always home (to account for possible Z offset changes) and save current mesh // On entry, always home (to account for possible Z offset changes) and save current mesh
SpinnerDialogBox::enqueueAndWait(F("G28\nG29 S1")); SpinnerDialogBox::enqueueAndWait_P(PSTR("G28\nG29 S1"));
// After the spinner, go to this screen. // After the spinner, go to this screen.
current_screen.forget(); current_screen.forget();
PUSH_SCREEN(BedMeshEditScreen); PUSH_SCREEN(BedMeshEditScreen);

6
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
View File

@ -104,7 +104,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
switch (tag) { switch (tag) {
case 1: GOTO_PREVIOUS(); break; case 1: GOTO_PREVIOUS(); break;
#if EITHER(Z_STEPPER_AUTO_ALIGN,MECHANICAL_GANTRY_CALIBRATION) #if EITHER(Z_STEPPER_AUTO_ALIGN,MECHANICAL_GANTRY_CALIBRATION)
case 2: SpinnerDialogBox::enqueueAndWait(F("G34")); break; case 2: SpinnerDialogBox::enqueueAndWait_P(PSTR("G34")); break;
#endif #endif
#if HAS_BED_PROBE #if HAS_BED_PROBE
case 3: case 3:
@ -114,7 +114,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
#if ENABLED(AUTO_BED_LEVELING_UBL) #if ENABLED(AUTO_BED_LEVELING_UBL)
BedMeshViewScreen::doProbe(); BedMeshViewScreen::doProbe();
#else #else
SpinnerDialogBox::enqueueAndWait(F(BED_LEVELING_COMMANDS)); SpinnerDialogBox::enqueueAndWait_P(PSTR(BED_LEVELING_COMMANDS));
#endif #endif
break; break;
#endif #endif
@ -127,7 +127,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
#endif #endif
#if ENABLED(BLTOUCH) #if ENABLED(BLTOUCH)
case 7: injectCommands_P(PSTR("M280 P0 S60")); break; case 7: injectCommands_P(PSTR("M280 P0 S60")); break;
case 8: SpinnerDialogBox::enqueueAndWait(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break; case 8: SpinnerDialogBox::enqueueAndWait_P(PSTR("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
#endif #endif
default: return false; default: return false;
} }

2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
View File

@ -104,7 +104,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
switch (tag) { switch (tag) {
case 1: SaveSettingsDialogBox::promptToSaveSettings(); break; case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
case 2: SpinnerDialogBox::enqueueAndWait(F("G28")); break; case 2: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28")); break;
#if ENABLED(NOZZLE_CLEAN_FEATURE) #if ENABLED(NOZZLE_CLEAN_FEATURE)
case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break; case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
#endif #endif

8
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
View File

@ -98,10 +98,10 @@ bool BaseMoveAxisScreen::onTouchHeld(uint8_t tag) {
case 14: UI_DECREMENT_AXIS(E3); mydata.e_rel[3] -= increment; break; case 14: UI_DECREMENT_AXIS(E3); mydata.e_rel[3] -= increment; break;
case 15: UI_INCREMENT_AXIS(E3); mydata.e_rel[3] += increment; break; case 15: UI_INCREMENT_AXIS(E3); mydata.e_rel[3] += increment; break;
#endif #endif
case 20: SpinnerDialogBox::enqueueAndWait(F("G28X")); break; case 20: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28X")); break;
case 21: SpinnerDialogBox::enqueueAndWait(F("G28Y")); break; case 21: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Y")); break;
case 22: SpinnerDialogBox::enqueueAndWait(F("G28Z")); break; case 22: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Z")); break;
case 23: SpinnerDialogBox::enqueueAndWait(F("G28")); break; case 23: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28")); break;
case 24: raiseZtoTop(); break; case 24: raiseZtoTop(); break;
default: default:
return false; return false;

2
Marlin/src/libs/hex_print.cpp
View File

@ -80,7 +80,7 @@ void print_hex_address(const void * const w) { SERIAL_ECHO(hex_address(w)); }
void print_hex_long(const uint32_t w, const char delimiter) { void print_hex_long(const uint32_t w, const char delimiter) {
SERIAL_ECHOPGM("0x"); SERIAL_ECHOPGM("0x");
for (int B = 24; B >= 8; B -= 8){ for (int B = 24; B >= 8; B -= 8) {
print_hex_byte(w >> B); print_hex_byte(w >> B);
SERIAL_CHAR(delimiter); SERIAL_CHAR(delimiter);
} }

Write Preview
Loading…
Cancel
Save