Kaynağa Gözat

Tweak serial output code

Scott Lahteine 6 yıl önce
ebeveyn
işleme
4fa1c52688

+ 1
- 1
Marlin/src/HAL/HAL_STM32F7/TMC2660.cpp Dosyayı Görüntüle

176
 void TMC26XStepper::start() {
176
 void TMC26XStepper::start() {
177
 
177
 
178
   #ifdef TMC_DEBUG1
178
   #ifdef TMC_DEBUG1
179
-    SERIAL_ECHOPGM("\n  TMC26X stepper library  \n");
179
+    SERIAL_ECHOLNPGM("\n  TMC26X stepper library");
180
     SERIAL_ECHOPAIR("\n  CS pin: ", cs_pin);
180
     SERIAL_ECHOPAIR("\n  CS pin: ", cs_pin);
181
     SERIAL_ECHOPAIR("\n  DIR pin: ", dir_pin);
181
     SERIAL_ECHOPAIR("\n  DIR pin: ", dir_pin);
182
     SERIAL_ECHOPAIR("\n  STEP pin: ", step_pin);
182
     SERIAL_ECHOPAIR("\n  STEP pin: ", step_pin);

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl.cpp Dosyayı Görüntüle

203
 
203
 
204
     SERIAL_ECHOPGM("\nBed Topography Report");
204
     SERIAL_ECHOPGM("\nBed Topography Report");
205
     if (human) {
205
     if (human) {
206
-      SERIAL_ECHOPGM(":\n\n");
206
+      SERIAL_ECHOLNPGM(":\n");
207
       serial_echo_xy(4, MESH_MIN_X, MESH_MAX_Y);
207
       serial_echo_xy(4, MESH_MIN_X, MESH_MAX_Y);
208
       serial_echo_xy(twixt, MESH_MAX_X, MESH_MAX_Y);
208
       serial_echo_xy(twixt, MESH_MAX_X, MESH_MAX_Y);
209
       SERIAL_EOL();
209
       SERIAL_EOL();

+ 1
- 1
Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp Dosyayı Görüntüle

1407
         #endif
1407
         #endif
1408
 
1408
 
1409
         if (abort_flag) {
1409
         if (abort_flag) {
1410
-          SERIAL_ECHOPGM("?Error probing point.  Aborting operation.\n");
1410
+          SERIAL_ECHOLNPGM("?Error probing point.  Aborting operation.");
1411
           return;
1411
           return;
1412
         }
1412
         }
1413
       }
1413
       }

+ 1
- 1
Marlin/src/feature/mixing.cpp Dosyayı Görüntüle

62
       SERIAL_ECHO_F(collector[i] / csum, 3);
62
       SERIAL_ECHO_F(collector[i] / csum, 3);
63
       SERIAL_CHAR(' ');
63
       SERIAL_CHAR(' ');
64
     }
64
     }
65
-    SERIAL_ECHOPGM("]\n");
65
+    SERIAL_ECHOLNPGM("]");
66
   #endif
66
   #endif
67
 
67
 
68
   // Scale all values so their maximum is COLOR_A_MASK
68
   // Scale all values so their maximum is COLOR_A_MASK

+ 2
- 2
Marlin/src/feature/pause.cpp Dosyayı Görüntüle

517
  */
517
  */
518
 void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_length/*=0*/, const float &purge_length/*=ADVANCED_PAUSE_PURGE_LENGTH*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) {
518
 void resume_print(const float &slow_load_length/*=0*/, const float &fast_load_length/*=0*/, const float &purge_length/*=ADVANCED_PAUSE_PURGE_LENGTH*/, const int8_t max_beep_count/*=0*/ DXC_ARGS) {
519
   /*
519
   /*
520
-  SERIAL_ECHOPGM("start of resume_print()\n");
520
+  SERIAL_ECHOLNPGM("start of resume_print()");
521
   SERIAL_ECHOPAIR("\ndual_x_carriage_mode:", dual_x_carriage_mode);
521
   SERIAL_ECHOPAIR("\ndual_x_carriage_mode:", dual_x_carriage_mode);
522
   SERIAL_ECHOPAIR("\nextruder_duplication_enabled:", extruder_duplication_enabled);
522
   SERIAL_ECHOPAIR("\nextruder_duplication_enabled:", extruder_duplication_enabled);
523
   SERIAL_ECHOPAIR("\nactive_extruder:", active_extruder);
523
   SERIAL_ECHOPAIR("\nactive_extruder:", active_extruder);
524
-  SERIAL_ECHOPGM("\n\n");
524
+  SERIAL_ECHOLNPGM("\n");
525
   //*/
525
   //*/
526
 
526
 
527
   if (!did_pause_print) return;
527
   if (!did_pause_print) return;

+ 2
- 2
Marlin/src/gcode/control/M605.cpp Dosyayı Görüntüle

63
 
63
 
64
       if (dual_x_carriage_mode == DXC_SCALED_DUPLICATION_MODE) {
64
       if (dual_x_carriage_mode == DXC_SCALED_DUPLICATION_MODE) {
65
         if (previous_mode != DXC_DUPLICATION_MODE) {
65
         if (previous_mode != DXC_DUPLICATION_MODE) {
66
-          SERIAL_ECHOPGM("Printer must be in DXC_DUPLICATION_MODE prior to \n");
67
-          SERIAL_ECHOPGM("specifying DXC_SCALED_DUPLICATION_MODE.\n");
66
+          SERIAL_ECHOLNPGM("Printer must be in DXC_DUPLICATION_MODE prior to ");
67
+          SERIAL_ECHOLNPGM("specifying DXC_SCALED_DUPLICATION_MODE.");
68
           dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
68
           dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
69
           return;
69
           return;
70
         }
70
         }

+ 2
- 2
Marlin/src/gcode/parser.cpp Dosyayı Görüntüle

357
       SERIAL_ECHO(string_arg);
357
       SERIAL_ECHO(string_arg);
358
       SERIAL_CHAR('"');
358
       SERIAL_CHAR('"');
359
     }
359
     }
360
-    SERIAL_ECHOPGM("\n\n");
360
+    SERIAL_ECHOLNPGM("\n");
361
     for (char c = 'A'; c <= 'Z'; ++c) {
361
     for (char c = 'A'; c <= 'Z'; ++c) {
362
       if (seen(c)) {
362
       if (seen(c)) {
363
         SERIAL_ECHOPAIR("Code '", c); SERIAL_ECHOPGM("':");
363
         SERIAL_ECHOPAIR("Code '", c); SERIAL_ECHOPGM("':");
376
         }
376
         }
377
         else
377
         else
378
           SERIAL_ECHOPGM(" (no value)");
378
           SERIAL_ECHOPGM(" (no value)");
379
-        SERIAL_ECHOPGM("\n\n");
379
+        SERIAL_ECHOLNPGM("\n");
380
       }
380
       }
381
     }
381
     }
382
   }
382
   }

+ 1
- 1
Marlin/src/gcode/queue.cpp Dosyayı Görüntüle

144
   //SERIAL_ECHOPGM("\") \n");
144
   //SERIAL_ECHOPGM("\") \n");
145
 
145
 
146
   if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') {
146
   if (*cmd == 0 || *cmd == '\n' || *cmd == '\r') {
147
-    //SERIAL_ECHOPGM("Null command found...   Did not queue!\n");
147
+    //SERIAL_ECHOLNPGM("Null command found...   Did not queue!");
148
     return true;
148
     return true;
149
   }
149
   }
150
 
150
 

+ 2
- 2
Marlin/src/module/configuration_store.cpp Dosyayı Görüntüle

1961
         const bool status = persistentStore.write_data(pos, (uint8_t *)&ubl.z_values, sizeof(ubl.z_values), &crc);
1961
         const bool status = persistentStore.write_data(pos, (uint8_t *)&ubl.z_values, sizeof(ubl.z_values), &crc);
1962
         persistentStore.access_finish();
1962
         persistentStore.access_finish();
1963
 
1963
 
1964
-        if (status) SERIAL_ECHOPGM("?Unable to save mesh data.\n");
1964
+        if (status) SERIAL_ECHOLNPGM("?Unable to save mesh data.");
1965
         else        CHITCHAT_ECHOLNPAIR("Mesh saved in slot ", slot);
1965
         else        CHITCHAT_ECHOLNPAIR("Mesh saved in slot ", slot);
1966
 
1966
 
1967
       #else
1967
       #else
1990
         const uint16_t status = persistentStore.read_data(pos, dest, sizeof(ubl.z_values), &crc);
1990
         const uint16_t status = persistentStore.read_data(pos, dest, sizeof(ubl.z_values), &crc);
1991
         persistentStore.access_finish();
1991
         persistentStore.access_finish();
1992
 
1992
 
1993
-        if (status) SERIAL_ECHOPGM("?Unable to load mesh data.\n");
1993
+        if (status) SERIAL_ECHOLNPGM("?Unable to load mesh data.");
1994
         else        CHITCHAT_ECHOLNPAIR("Mesh loaded from slot ", slot);
1994
         else        CHITCHAT_ECHOLNPAIR("Mesh loaded from slot ", slot);
1995
 
1995
 
1996
         EEPROM_FINISH();
1996
         EEPROM_FINISH();

+ 1
- 1
Marlin/src/module/endstops.cpp Dosyayı Görüntüle

872
       #if HAS_Z3_MAX
872
       #if HAS_Z3_MAX
873
         ES_REPORT_CHANGE(Z3_MAX);
873
         ES_REPORT_CHANGE(Z3_MAX);
874
       #endif
874
       #endif
875
-      SERIAL_ECHOPGM("\n\n");
875
+      SERIAL_ECHOLNPGM("\n");
876
       analogWrite(LED_PIN, local_LED_status);
876
       analogWrite(LED_PIN, local_LED_status);
877
       local_LED_status ^= 255;
877
       local_LED_status ^= 255;
878
       old_live_state_local = live_state_local;
878
       old_live_state_local = live_state_local;

Loading…
İptal
Kaydet