Browse Source

Fix some debug out lines

Scott Lahteine 6 years ago
parent
commit
79635f8e94

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

110
 
110
 
111
 bool BLTouch::deploy_proc() {
111
 bool BLTouch::deploy_proc() {
112
   // Do a DEPLOY
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
   // Attempt to DEPLOY, wait for DEPLOY_DELAY or ALARM
115
   // Attempt to DEPLOY, wait for DEPLOY_DELAY or ALARM
116
   if (_deploy_query_alarm()) {
116
   if (_deploy_query_alarm()) {
117
     // The deploy might have failed or the probe is already triggered (nozzle too low?)
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
     clear();                               // Get the probe into start condition
120
     clear();                               // Get the probe into start condition
121
 
121
 
122
     // Last attempt to DEPLOY
122
     // Last attempt to DEPLOY
123
     if (_deploy_query_alarm()) {
123
     if (_deploy_query_alarm()) {
124
       // The deploy might have failed or the probe is actually triggered (nozzle too low?) again
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
       SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
127
       SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
128
       stop();                              // but it's not too bad, no need to kill, allow restart
128
       stop();                              // but it's not too bad, no need to kill, allow restart
140
   // The trigger STOW (see motion.cpp for example) will pull up the probes pin as soon as the pulse
140
   // The trigger STOW (see motion.cpp for example) will pull up the probes pin as soon as the pulse
141
   // is registered.
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
   return false; // report success to caller
145
   return false; // report success to caller
146
 }
146
 }
147
 
147
 
148
 bool BLTouch::stow_proc() {
148
 bool BLTouch::stow_proc() {
149
   // Do a STOW
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
   // A STOW will clear a triggered condition in the probe (10ms pulse).
152
   // A STOW will clear a triggered condition in the probe (10ms pulse).
153
   // At the moment that we come in here, we might (pulse) or will (SW mode) see the trigger on the pin.
153
   // At the moment that we come in here, we might (pulse) or will (SW mode) see the trigger on the pin.
158
   // Attempt to STOW, wait for STOW_DELAY or ALARM
158
   // Attempt to STOW, wait for STOW_DELAY or ALARM
159
   if (_stow_query_alarm()) {
159
   if (_stow_query_alarm()) {
160
     // The stow might have failed
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
     _reset();                              // This RESET will then also pull up the pin. If it doesn't
163
     _reset();                              // This RESET will then also pull up the pin. If it doesn't
164
                                            // work and the pin is still down, there will no longer be
164
                                            // work and the pin is still down, there will no longer be
167
     // Last attempt to STOW
167
     // Last attempt to STOW
168
     if (_stow_query_alarm()) {             // so if there is now STILL an ALARM condition:
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
       SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
172
       SERIAL_ERROR_MSG(MSG_STOP_BLTOUCH);  // Tell the user something is wrong, needs action
173
       stop();                              // but it's not too bad, no need to kill, allow restart
173
       stop();                              // but it's not too bad, no need to kill, allow restart
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
   return false; // report success to caller
181
   return false; // report success to caller
182
 }
182
 }
187
    * This function will ensure switch state is reset after execution
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
   _set_SW_mode();              // Incidentally, _set_SW_mode() will also RESET any active alarm
192
   _set_SW_mode();              // Incidentally, _set_SW_mode() will also RESET any active alarm
193
   const bool tr = triggered(); // If triggered in SW mode, the pin is up, it is STOWED
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
       DEBUG_ECHOPAIR("new topfile calculated:", top_file);
313
       DEBUG_ECHOPAIR("new topfile calculated:", top_file);
314
       if (top_file < 0) {
314
       if (top_file < 0) {
315
         top_file = 0;
315
         top_file = 0;
316
-        DEBUG_ECHOLN("Top of filelist reached");
316
+        DEBUG_ECHOLNPGM("Top of filelist reached");
317
       }
317
       }
318
       else {
318
       else {
319
         int16_t max_top = filelist.count() -  DGUS_SD_FILESPERSCREEN;
319
         int16_t max_top = filelist.count() -  DGUS_SD_FILESPERSCREEN;
579
     buf[4] = axiscode;
579
     buf[4] = axiscode;
580
     //DEBUG_ECHOPAIR(" ", buf);
580
     //DEBUG_ECHOPAIR(" ", buf);
581
     while (!enqueue_and_echo_command(buf)) idle();
581
     while (!enqueue_and_echo_command(buf)) idle();
582
-    //DEBUG_ECHOLN(" ✓");
582
+    //DEBUG_ECHOLNPGM(" ✓");
583
     ScreenHandler.ForceCompleteUpdate();
583
     ScreenHandler.ForceCompleteUpdate();
584
     return;
584
     return;
585
   }
585
   }
588
     DEBUG_ECHOPAIR(" move ", axiscode);
588
     DEBUG_ECHOPAIR(" move ", axiscode);
589
     bool old_relative_mode = relative_mode;
589
     bool old_relative_mode = relative_mode;
590
     if (!relative_mode) {
590
     if (!relative_mode) {
591
-      //DEBUG_ECHO(" G91");
591
+      //DEBUG_ECHOPGM(" G91");
592
       while (!enqueue_and_echo_command("G91")) idle();
592
       while (!enqueue_and_echo_command("G91")) idle();
593
       //DEBUG_ECHOPGM(" ✓ ");
593
       //DEBUG_ECHOPGM(" ✓ ");
594
     }
594
     }
601
     snprintf_P(buf, 32, PSTR("G0 %c%s%d.%02d F%d"), axiscode, sign, value, fraction, speed);
601
     snprintf_P(buf, 32, PSTR("G0 %c%s%d.%02d F%d"), axiscode, sign, value, fraction, speed);
602
     //DEBUG_ECHOPAIR(" ", buf);
602
     //DEBUG_ECHOPAIR(" ", buf);
603
     while (!enqueue_and_echo_command(buf)) idle();
603
     while (!enqueue_and_echo_command(buf)) idle();
604
-    //DEBUG_ECHOLN(" ✓ ");
604
+    //DEBUG_ECHOLNPGM(" ✓ ");
605
     if (backup_speed != speed) {
605
     if (backup_speed != speed) {
606
       snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
606
       snprintf_P(buf, 32, PSTR("G0 F%d"), backup_speed);
607
       while (!enqueue_and_echo_command(buf)) idle();
607
       while (!enqueue_and_echo_command(buf)) idle();
608
       //DEBUG_ECHOPAIR(" ", buf);
608
       //DEBUG_ECHOPAIR(" ", buf);
609
     }
609
     }
610
     //while (!enqueue_and_echo_command(buf)) idle();
610
     //while (!enqueue_and_echo_command(buf)) idle();
611
-    //DEBUG_ECHOLN(" ✓ ");
611
+    //DEBUG_ECHOLNPGM(" ✓ ");
612
     if (!old_relative_mode) {
612
     if (!old_relative_mode) {
613
-      //DEBUG_ECHO("G90");
613
+      //DEBUG_ECHOPGM("G90");
614
       while (!enqueue_and_echo_command("G90")) idle();
614
       while (!enqueue_and_echo_command("G90")) idle();
615
-      //DEBUG_ECHO(" ✓ ");
615
+      //DEBUG_ECHOPGM(" ✓ ");
616
     }
616
     }
617
   }
617
   }
618
 
618
 

Loading…
Cancel
Save