Browse Source

Fix some debug out lines

Scott Lahteine 5 years ago
parent
commit
79635f8e94

+ 9
- 9
Marlin/src/feature/bltouch.cpp View File

@@ -110,19 +110,19 @@ bool BLTouch::triggered() {
110 110
 
111 111
 bool BLTouch::deploy_proc() {
112 112
   // Do a DEPLOY
113
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLN("BLTouch DEPLOY requested");
113
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch DEPLOY requested");
114 114
 
115 115
   // Attempt to DEPLOY, wait for DEPLOY_DELAY or ALARM
116 116
   if (_deploy_query_alarm()) {
117 117
     // The deploy might have failed or the probe is already triggered (nozzle too low?)
118
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLN("BLTouch ALARM or TRIGGER after DEPLOY, recovering");
118
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch ALARM or TRIGGER after DEPLOY, recovering");
119 119
 
120 120
     clear();                               // Get the probe into start condition
121 121
 
122 122
     // Last attempt to DEPLOY
123 123
     if (_deploy_query_alarm()) {
124 124
       // The deploy might have failed or the probe is actually triggered (nozzle too low?) again
125
-      if (DEBUGGING(LEVELING)) DEBUG_ECHOLN("BLTouch Recovery Failed");
125
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Recovery Failed");
126 126
 
127 127
       SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
128 128
       stop();                              // but it's not too bad, no need to kill, allow restart
@@ -140,14 +140,14 @@ bool BLTouch::deploy_proc() {
140 140
   // The trigger STOW (see motion.cpp for example) will pull up the probes pin as soon as the pulse
141 141
   // is registered.
142 142
 
143
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLN("bltouch.deploy_proc() end");
143
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("bltouch.deploy_proc() end");
144 144
 
145 145
   return false; // report success to caller
146 146
 }
147 147
 
148 148
 bool BLTouch::stow_proc() {
149 149
   // Do a STOW
150
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLN("BLTouch STOW requested");
150
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch STOW requested");
151 151
 
152 152
   // A STOW will clear a triggered condition in the probe (10ms pulse).
153 153
   // At the moment that we come in here, we might (pulse) or will (SW mode) see the trigger on the pin.
@@ -158,7 +158,7 @@ bool BLTouch::stow_proc() {
158 158
   // Attempt to STOW, wait for STOW_DELAY or ALARM
159 159
   if (_stow_query_alarm()) {
160 160
     // The stow might have failed
161
-    if (DEBUGGING(LEVELING)) DEBUG_ECHOLN("BLTouch ALARM or TRIGGER after STOW, recovering");
161
+    if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch ALARM or TRIGGER after STOW, recovering");
162 162
 
163 163
     _reset();                              // This RESET will then also pull up the pin. If it doesn't
164 164
                                            // work and the pin is still down, there will no longer be
@@ -167,7 +167,7 @@ bool BLTouch::stow_proc() {
167 167
     // Last attempt to STOW
168 168
     if (_stow_query_alarm()) {             // so if there is now STILL an ALARM condition:
169 169
 
170
-      if (DEBUGGING(LEVELING)) DEBUG_ECHOLN("BLTouch Recovery Failed");
170
+      if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch Recovery Failed");
171 171
 
172 172
       SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
173 173
       stop();                              // but it's not too bad, no need to kill, allow restart
@@ -176,7 +176,7 @@ bool BLTouch::stow_proc() {
176 176
     }
177 177
   }
178 178
 
179
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLN("bltouch.stow_proc() end");
179
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("bltouch.stow_proc() end");
180 180
 
181 181
   return false; // report success to caller
182 182
 }
@@ -187,7 +187,7 @@ bool BLTouch::status_proc() {
187 187
    * This function will ensure switch state is reset after execution
188 188
    */
189 189
 
190
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLN("BLTouch STATUS requested");
190
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("BLTouch STATUS requested");
191 191
 
192 192
   _set_SW_mode();              // Incidentally, _set_SW_mode() will also RESET any active alarm
193 193
   const bool tr = triggered(); // If triggered in SW mode, the pin is up, it is STOWED

+ 7
- 7
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp View File

@@ -313,7 +313,7 @@ void DGUSScreenVariableHandler::DGUSLCD_SendStringToDisplayPGM(DGUS_VP_Variable
313 313
       DEBUG_ECHOPAIR("new topfile calculated:", top_file);
314 314
       if (top_file < 0) {
315 315
         top_file = 0;
316
-        DEBUG_ECHOLN("Top of filelist reached");
316
+        DEBUG_ECHOLNPGM("Top of filelist reached");
317 317
       }
318 318
       else {
319 319
         int16_t max_top = filelist.count() -  DGUS_SD_FILESPERSCREEN;
@@ -579,7 +579,7 @@ void DGUSScreenVariableHandler::HandleManualMove(DGUS_VP_Variable &var, void *va
579 579
     buf[4] = axiscode;
580 580
     //DEBUG_ECHOPAIR(" ", buf);
581 581
     while (!enqueue_and_echo_command(buf)) idle();
582
-    //DEBUG_ECHOLN(" ✓");
582
+    //DEBUG_ECHOLNPGM(" ✓");
583 583
     ScreenHandler.ForceCompleteUpdate();
584 584
     return;
585 585
   }
@@ -588,7 +588,7 @@ void DGUSScreenVariableHandler::HandleManualMove(DGUS_VP_Variable &var, void *va
588 588
     DEBUG_ECHOPAIR(" move ", axiscode);
589 589
     bool old_relative_mode = relative_mode;
590 590
     if (!relative_mode) {
591
-      //DEBUG_ECHO(" G91");
591
+      //DEBUG_ECHOPGM(" G91");
592 592
       while (!enqueue_and_echo_command("G91")) idle();
593 593
       //DEBUG_ECHOPGM(" ✓ ");
594 594
     }
@@ -601,18 +601,18 @@ void DGUSScreenVariableHandler::HandleManualMove(DGUS_VP_Variable &var, void *va
601 601
     snprintf_P(buf, 32, PSTR("G0 %c%s%d.%02d F%d"), axiscode, sign, value, fraction, speed);
602 602
     //DEBUG_ECHOPAIR(" ", buf);
603 603
     while (!enqueue_and_echo_command(buf)) idle();
604
-    //DEBUG_ECHOLN(" ✓ ");
604
+    //DEBUG_ECHOLNPGM(" ✓ ");
605 605
     if (backup_speed != speed) {
606 606
       snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
607 607
       while (!enqueue_and_echo_command(buf)) idle();
608 608
       //DEBUG_ECHOPAIR(" ", buf);
609 609
     }
610 610
     //while (!enqueue_and_echo_command(buf)) idle();
611
-    //DEBUG_ECHOLN(" ✓ ");
611
+    //DEBUG_ECHOLNPGM(" ✓ ");
612 612
     if (!old_relative_mode) {
613
-      //DEBUG_ECHO("G90");
613
+      //DEBUG_ECHOPGM("G90");
614 614
       while (!enqueue_and_echo_command("G90")) idle();
615
-      //DEBUG_ECHO(" ✓ ");
615
+      //DEBUG_ECHOPGM(" ✓ ");
616 616
     }
617 617
   }
618 618
 

Loading…
Cancel
Save