ソースを参照

Serial out cleanup

Scott Lahteine 6年前
コミット
f9a50f451d
2個のファイルの変更1行の追加10行の削除
  1. 1
    1
      Marlin/src/HAL/HAL_LINUX/main.cpp
  2. 0
    9
      Marlin/src/HAL/HAL_STM32F7/TMC2660.cpp

+ 1
- 1
Marlin/src/HAL/HAL_LINUX/main.cpp ファイルの表示

110
 
110
 
111
   #if NUM_SERIAL > 0
111
   #if NUM_SERIAL > 0
112
     MYSERIAL0.begin(BAUDRATE);
112
     MYSERIAL0.begin(BAUDRATE);
113
-    SERIAL_PRINTF("x86_64 Initialised\n");
113
+    SERIAL_ECHOLNPGM("x86_64 Initialized");
114
     SERIAL_FLUSHTX();
114
     SERIAL_FLUSHTX();
115
   #endif
115
   #endif
116
 
116
 

+ 0
- 9
Marlin/src/HAL/HAL_STM32F7/TMC2660.cpp ファイルの表示

222
   this->speed = whatSpeed;
222
   this->speed = whatSpeed;
223
   this->step_delay = 60UL * sq(1000UL) / ((uint32_t)this->number_of_steps * (uint32_t)whatSpeed * (uint32_t)this->microsteps);
223
   this->step_delay = 60UL * sq(1000UL) / ((uint32_t)this->number_of_steps * (uint32_t)whatSpeed * (uint32_t)this->microsteps);
224
   #ifdef TMC_DEBUG0 // crashes
224
   #ifdef TMC_DEBUG0 // crashes
225
-    //SERIAL_PRINTF("Step delay in micros: ");
226
     SERIAL_ECHOPAIR("\nStep delay in micros: ", this->step_delay);
225
     SERIAL_ECHOPAIR("\nStep delay in micros: ", this->step_delay);
227
   #endif
226
   #endif
228
   // Update the next step time
227
   // Update the next step time
315
     // and recalculate the current setting
314
     // and recalculate the current setting
316
     current_scaling = (byte)((resistor_value * mASetting * 32.0 / (0.165 * sq(1000.0))) - 0.5); //theoretically - 1.0 for better rounding it is 0.5
315
     current_scaling = (byte)((resistor_value * mASetting * 32.0 / (0.165 * sq(1000.0))) - 0.5); //theoretically - 1.0 for better rounding it is 0.5
317
     #ifdef TMC_DEBUG0 // crashes
316
     #ifdef TMC_DEBUG0 // crashes
318
-        //SERIAL_PRINTF("CS (Vsense=1): ");
319
         SERIAL_ECHOPAIR("\nCS (Vsense=1): ",current_scaling);
317
         SERIAL_ECHOPAIR("\nCS (Vsense=1): ",current_scaling);
320
       } else {
318
       } else {
321
-        //SERIAL_PRINTF("CS: ");
322
         SERIAL_ECHOPAIR("\nCS: ", current_scaling);
319
         SERIAL_ECHOPAIR("\nCS: ", current_scaling);
323
     #endif
320
     #endif
324
   }
321
   }
405
   microsteps = _BV(8 - setting_pattern);
402
   microsteps = _BV(8 - setting_pattern);
406
 
403
 
407
   #ifdef TMC_DEBUG0 // crashes
404
   #ifdef TMC_DEBUG0 // crashes
408
-    //SERIAL_PRINTF("Microstepping: ");
409
     SERIAL_ECHOPAIR("\n Microstepping: ", microsteps);
405
     SERIAL_ECHOPAIR("\n Microstepping: ", microsteps);
410
   #endif
406
   #endif
411
 
407
 
612
                           | (((uint32_t)lower_current_limit) << 15)
608
                           | (((uint32_t)lower_current_limit) << 15)
613
                           | COOL_STEP_REGISTER; // Register signature
609
                           | COOL_STEP_REGISTER; // Register signature
614
 
610
 
615
-  //SERIAL_PRINTFln(cool_step_register_value,HEX);
616
   if (started) send262(cool_step_register_value);
611
   if (started) send262(cool_step_register_value);
617
 }
612
 }
618
 
613
 
830
       uint32_t readout_config = driver_configuration_register_value & READ_SELECTION_PATTERN;
825
       uint32_t readout_config = driver_configuration_register_value & READ_SELECTION_PATTERN;
831
       const int16_t value = getReadoutValue();
826
       const int16_t value = getReadoutValue();
832
       if (readout_config == READ_MICROSTEP_POSTION) {
827
       if (readout_config == READ_MICROSTEP_POSTION) {
833
-        //SERIAL_PRINTF("Microstep position phase A: ");
834
         SERIAL_ECHOPAIR("\n  Microstep position phase A: ", value);
828
         SERIAL_ECHOPAIR("\n  Microstep position phase A: ", value);
835
       }
829
       }
836
       else if (readout_config == READ_STALL_GUARD_READING) {
830
       else if (readout_config == READ_STALL_GUARD_READING) {
837
-        //SERIAL_PRINTF("Stall Guard value:");
838
         SERIAL_ECHOPAIR("\n  Stall Guard value:", value);
831
         SERIAL_ECHOPAIR("\n  Stall Guard value:", value);
839
       }
832
       }
840
       else if (readout_config == READ_STALL_GUARD_AND_COOL_STEP) {
833
       else if (readout_config == READ_STALL_GUARD_AND_COOL_STEP) {
841
         int16_t stallGuard = value & 0xF, current = value & 0x1F0;
834
         int16_t stallGuard = value & 0xF, current = value & 0x1F0;
842
-        //SERIAL_PRINTF("Approx Stall Guard: ");
843
         SERIAL_ECHOPAIR("\n  Approx Stall Guard: ", stallGuard);
835
         SERIAL_ECHOPAIR("\n  Approx Stall Guard: ", stallGuard);
844
-        //SERIAL_PRINTF("Current level");
845
         SERIAL_ECHOPAIR("\n  Current level", current);
836
         SERIAL_ECHOPAIR("\n  Current level", current);
846
       }
837
       }
847
     }
838
     }

読み込み中…
キャンセル
保存