Sfoglia il codice sorgente

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

Scott Lahteine 3 anni fa
parent
commit
e1907a99e2

+ 1
- 1
Marlin/src/HAL/LINUX/hardware/Gpio.h Vedi File

@@ -40,7 +40,7 @@ struct GpioEvent {
40 40
   pin_type pin_id;
41 41
   GpioEvent::Type event;
42 42
 
43
-  GpioEvent(uint64_t timestamp, pin_type pin_id, GpioEvent::Type event){
43
+  GpioEvent(uint64_t timestamp, pin_type pin_id, GpioEvent::Type event) {
44 44
     this->timestamp = timestamp;
45 45
     this->pin_id = pin_id;
46 46
     this->event = event;

+ 1
- 1
Marlin/src/HAL/LINUX/hardware/LinearAxis.cpp Vedi File

@@ -51,7 +51,7 @@ void LinearAxis::update() {
51 51
 }
52 52
 
53 53
 void LinearAxis::interrupt(GpioEvent ev) {
54
-  if (ev.pin_id == step_pin && !Gpio::pin_map[enable_pin].value){
54
+  if (ev.pin_id == step_pin && !Gpio::pin_map[enable_pin].value) {
55 55
     if (ev.event == GpioEvent::RISE) {
56 56
       last_update = ev.timestamp;
57 57
       position += -1 + 2 * Gpio::pin_map[dir_pin].value;

+ 1
- 1
Marlin/src/HAL/LINUX/hardware/Timer.h Vedi File

@@ -52,7 +52,7 @@ public:
52 52
     return (*(intptr_t*)timerid);
53 53
   }
54 54
 
55
-  static void handler(int sig, siginfo_t *si, void *uc){
55
+  static void handler(int sig, siginfo_t *si, void *uc) {
56 56
     Timer* _this = (Timer*)si->si_value.sival_ptr;
57 57
     _this->avg_error += (Clock::nanos() - _this->start_time) - _this->period; //high_resolution_clock is also limited in precision, but best we have
58 58
     _this->avg_error /= 2; //very crude precision analysis (actually within +-500ns usually)

+ 2
- 2
Marlin/src/feature/leds/pca9533.cpp Vedi File

@@ -36,7 +36,7 @@ void PCA9533_init() {
36 36
   PCA9533_reset();
37 37
 }
38 38
 
39
-static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1, uint8_t pwm1, uint8_t ls0){
39
+static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1, uint8_t pwm1, uint8_t ls0) {
40 40
   uint8_t data[6] = { PCA9533_REG_PSC0 | PCA9533_REGM_AI, psc0, pwm0, psc1, pwm1, ls0 };
41 41
   Wire.beginTransmission(PCA9533_Addr >> 1);
42 42
   Wire.write(data, 6);
@@ -44,7 +44,7 @@ static void PCA9533_writeAllRegisters(uint8_t psc0, uint8_t pwm0, uint8_t psc1,
44 44
   delayMicroseconds(1);
45 45
 }
46 46
 
47
-static void PCA9533_writeRegister(uint8_t reg, uint8_t val){
47
+static void PCA9533_writeRegister(uint8_t reg, uint8_t val) {
48 48
   uint8_t data[2] = { reg, val };
49 49
   Wire.beginTransmission(PCA9533_Addr >> 1);
50 50
   Wire.write(data, 2);

+ 1
- 1
Marlin/src/feature/power.cpp Vedi File

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

+ 1
- 1
Marlin/src/gcode/calibrate/G28.cpp Vedi File

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

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp Vedi File

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

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp Vedi File

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

+ 2
- 2
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp Vedi File

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

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp Vedi File

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

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp Vedi File

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

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp Vedi File

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

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp Vedi File

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

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp Vedi File

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

+ 3
- 3
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp Vedi File

@@ -104,7 +104,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
104 104
   switch (tag) {
105 105
     case 1: GOTO_PREVIOUS(); break;
106 106
     #if EITHER(Z_STEPPER_AUTO_ALIGN,MECHANICAL_GANTRY_CALIBRATION)
107
-      case 2: SpinnerDialogBox::enqueueAndWait_P(F("G34")); break;
107
+      case 2: SpinnerDialogBox::enqueueAndWait_P(PSTR("G34")); break;
108 108
     #endif
109 109
     #if HAS_BED_PROBE
110 110
       case 3:
@@ -114,7 +114,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
114 114
         #if ENABLED(AUTO_BED_LEVELING_UBL)
115 115
           BedMeshViewScreen::doProbe();
116 116
         #else
117
-          SpinnerDialogBox::enqueueAndWait_P(F(BED_LEVELING_COMMANDS));
117
+          SpinnerDialogBox::enqueueAndWait_P(PSTR(BED_LEVELING_COMMANDS));
118 118
         #endif
119 119
         break;
120 120
     #endif
@@ -127,7 +127,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
127 127
     #endif
128 128
     #if ENABLED(BLTOUCH)
129 129
       case 7: injectCommands_P(PSTR("M280 P0 S60")); break;
130
-      case 8: SpinnerDialogBox::enqueueAndWait_P(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
130
+      case 8: SpinnerDialogBox::enqueueAndWait_P(PSTR("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
131 131
     #endif
132 132
     default: return false;
133 133
   }

+ 1
- 1
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp Vedi File

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

+ 4
- 4
Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp Vedi File

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

+ 1
- 1
Marlin/src/libs/hex_print.cpp Vedi File

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

Loading…
Annulla
Salva