浏览代码

Clean up spaces and words

Scott Lahteine 4 年前
父节点
当前提交
2c62886c71

+ 5
- 5
Marlin/src/MarlinCore.cpp 查看文件

990
   #endif
990
   #endif
991
   #define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0)
991
   #define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0)
992
 
992
 
993
-  MYSERIAL0.begin(BAUDRATE);
993
+  MYSERIAL1.begin(BAUDRATE);
994
   millis_t serial_connect_timeout = millis() + 1000UL;
994
   millis_t serial_connect_timeout = millis() + 1000UL;
995
-  while (!MYSERIAL0.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
995
+  while (!MYSERIAL1.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
996
 
996
 
997
   #if HAS_MULTI_SERIAL && !HAS_ETHERNET
997
   #if HAS_MULTI_SERIAL && !HAS_ETHERNET
998
-    MYSERIAL1.begin(BAUDRATE);
998
+    MYSERIAL2.begin(BAUDRATE);
999
     serial_connect_timeout = millis() + 1000UL;
999
     serial_connect_timeout = millis() + 1000UL;
1000
-    while (!MYSERIAL1.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
1000
+    while (!MYSERIAL2.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
1001
   #endif
1001
   #endif
1002
   SERIAL_ECHOLNPGM("start");
1002
   SERIAL_ECHOLNPGM("start");
1003
 
1003
 
1053
   #if HAS_FILAMENT_SENSOR
1053
   #if HAS_FILAMENT_SENSOR
1054
     SETUP_RUN(runout.setup());
1054
     SETUP_RUN(runout.setup());
1055
   #endif
1055
   #endif
1056
-  
1056
+
1057
   #if HAS_TMC220x
1057
   #if HAS_TMC220x
1058
     SETUP_RUN(tmc_serial_begin());
1058
     SETUP_RUN(tmc_serial_begin());
1059
   #endif
1059
   #endif

+ 1
- 1
Marlin/src/gcode/host/M115.cpp 查看文件

144
     // COOLER_TEMPERATURE (M143, M193)
144
     // COOLER_TEMPERATURE (M143, M193)
145
     cap_line(PSTR("COOLER_TEMPERATURE"), ENABLED(HAS_COOLER));
145
     cap_line(PSTR("COOLER_TEMPERATURE"), ENABLED(HAS_COOLER));
146
 
146
 
147
-    // MEATPACK Compresson
147
+    // MEATPACK Compression
148
     cap_line(PSTR("MEATPACK"), ENABLED(MEATPACK));
148
     cap_line(PSTR("MEATPACK"), ENABLED(MEATPACK));
149
 
149
 
150
     // Machine Geometry
150
     // Machine Geometry

+ 10
- 8
Marlin/src/gcode/queue.cpp 查看文件

272
   SERIAL_ECHOLN(serial_state[serial_ind.index].last_N + 1);
272
   SERIAL_ECHOLN(serial_state[serial_ind.index].last_N + 1);
273
 }
273
 }
274
 
274
 
275
-inline bool serial_data_available(serial_index_t index) {
275
+static bool serial_data_available(serial_index_t index) {
276
   const int a = SERIAL_IMPL.available(index);
276
   const int a = SERIAL_IMPL.available(index);
277
   #if BOTH(RX_BUFFER_MONITOR, RX_BUFFER_SIZE)
277
   #if BOTH(RX_BUFFER_MONITOR, RX_BUFFER_SIZE)
278
     if (a > RX_BUFFER_SIZE - 2) {
278
     if (a > RX_BUFFER_SIZE - 2) {
283
   return a > 0;
283
   return a > 0;
284
 }
284
 }
285
 
285
 
286
-// Multiserial already handles dispatch to/from multiple ports
287
-inline bool any_serial_data_available() {
288
-  LOOP_L_N(p, NUM_SERIAL)
289
-    if (serial_data_available(p))
290
-      return true;
291
-  return false;
292
-}
286
+#if NO_TIMEOUTS > 0
287
+  // Multiserial already handles dispatch to/from multiple ports
288
+  static bool any_serial_data_available() {
289
+    LOOP_L_N(p, NUM_SERIAL)
290
+      if (serial_data_available(p))
291
+        return true;
292
+    return false;
293
+  }
294
+#endif
293
 
295
 
294
 inline int read_serial(const serial_index_t index) { return SERIAL_IMPL.read(index); }
296
 inline int read_serial(const serial_index_t index) { return SERIAL_IMPL.read(index); }
295
 
297
 

+ 1
- 2
Marlin/src/inc/SanityCheck.h 查看文件

3337
   #endif
3337
   #endif
3338
 #endif
3338
 #endif
3339
 
3339
 
3340
-
3341
 /**
3340
 /**
3342
  * Sanity Check for MEATPACK and BINARY_FILE_TRANSFER Features
3341
  * Sanity Check for MEATPACK and BINARY_FILE_TRANSFER Features
3343
  */
3342
  */
3344
 #if BOTH(MEATPACK, BINARY_FILE_TRANSFER)
3343
 #if BOTH(MEATPACK, BINARY_FILE_TRANSFER)
3345
-  #error "Either enable MEATPACK or enable BINARY_FILE_TRANSFER."
3344
+  #error "Either enable MEATPACK or BINARY_FILE_TRANSFER, not both."
3346
 #endif
3345
 #endif
3347
 
3346
 
3348
 /**
3347
 /**

+ 9
- 9
Marlin/src/pins/stm32f1/pins_MKS_ROBIN.h 查看文件

237
    * This board does not have dedicated TMC UART pins. Custom wiring is needed.
237
    * This board does not have dedicated TMC UART pins. Custom wiring is needed.
238
    * You may uncomment one of the options below, or add it to your Configuration.h.
238
    * You may uncomment one of the options below, or add it to your Configuration.h.
239
    *
239
    *
240
-   * When using up to four TMC2209 drivers, hardware serial is recommented on
240
+   * When using up to four TMC2209 drivers, hardware serial is recommended on
241
    * MSerial0 or MSerial1.
241
    * MSerial0 or MSerial1.
242
    *
242
    *
243
    * When using TMC2208 or more than four drivers, SoftwareSerial will be needed,
243
    * When using TMC2208 or more than four drivers, SoftwareSerial will be needed,
246
 
246
 
247
   //#define TMC_HARDWARE_SERIAL
247
   //#define TMC_HARDWARE_SERIAL
248
   #if ENABLED(TMC_HARDWARE_SERIAL)
248
   #if ENABLED(TMC_HARDWARE_SERIAL)
249
-    #define X_HARDWARE_SERIAL            MSerial0
250
-    #define X2_HARDWARE_SERIAL           MSerial0
251
-    #define Y_HARDWARE_SERIAL            MSerial0
252
-    #define Y2_HARDWARE_SERIAL           MSerial0
253
-    #define Z_HARDWARE_SERIAL            MSerial0
254
-    #define Z2_HARDWARE_SERIAL           MSerial0
255
-    #define E0_HARDWARE_SERIAL           MSerial0
256
-    #define E1_HARDWARE_SERIAL           MSerial0
249
+    #define X_HARDWARE_SERIAL  MSerial0
250
+    #define X2_HARDWARE_SERIAL MSerial0
251
+    #define Y_HARDWARE_SERIAL  MSerial0
252
+    #define Y2_HARDWARE_SERIAL MSerial0
253
+    #define Z_HARDWARE_SERIAL  MSerial0
254
+    #define Z2_HARDWARE_SERIAL MSerial0
255
+    #define E0_HARDWARE_SERIAL MSerial0
256
+    #define E1_HARDWARE_SERIAL MSerial0
257
   #endif
257
   #endif
258
 
258
 
259
   //#define TMC_SOFTWARE_SERIAL
259
   //#define TMC_SOFTWARE_SERIAL

正在加载...
取消
保存