瀏覽代碼

Cleanup, hex formatting, includes

Scott Lahteine 3 年之前
父節點
當前提交
fccfcfbe5f

+ 5
- 3
Marlin/src/HAL/AVR/MarlinSerial.cpp 查看文件

@@ -582,7 +582,8 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
582 582
 
583 583
   template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT_2> >;
584 584
   MSerialT2 customizedSerial2(MSerialT2::HasEmergencyParser);
585
-#endif
585
+
586
+#endif // SERIAL_PORT_2
586 587
 
587 588
 #ifdef MMU2_SERIAL_PORT
588 589
 
@@ -596,7 +597,8 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
596 597
 
597 598
   template class MarlinSerial< MMU2SerialCfg<MMU2_SERIAL_PORT> >;
598 599
   MSerialT3 mmuSerial(MSerialT3::HasEmergencyParser);
599
-#endif
600
+
601
+#endif // MMU2_SERIAL_PORT
600 602
 
601 603
 #ifdef LCD_SERIAL_PORT
602 604
 
@@ -622,7 +624,7 @@ MSerialT customizedSerial1(MSerialT::HasEmergencyParser);
622 624
     }
623 625
   #endif
624 626
 
625
-#endif
627
+#endif // LCD_SERIAL_PORT
626 628
 
627 629
 #endif // !USBCON && (UBRRH || UBRR0H || UBRR1H || UBRR2H || UBRR3H)
628 630
 

+ 1
- 1
Marlin/src/HAL/DUE/fastio.h 查看文件

@@ -33,7 +33,7 @@
33 33
  * For ARDUINO_ARCH_SAM
34 34
  * Note the code here was specifically crafted by disassembling what GCC produces
35 35
  * out of it, so GCC is able to optimize it out as much as possible to the least
36
- * amount of instructions. Be very carefull if you modify them, as "clean code"
36
+ * amount of instructions. Be very careful if you modify them, as "clean code"
37 37
  * leads to less efficient compiled code!!
38 38
  */
39 39
 

+ 1
- 0
Marlin/src/HAL/LPC1768/HAL_MinSerial.cpp 查看文件

@@ -21,6 +21,7 @@
21 21
  */
22 22
 #ifdef TARGET_LPC1768
23 23
 
24
+#include "../../inc/MarlinConfig.h"
24 25
 #include "HAL.h"
25 26
 
26 27
 #if ENABLED(POSTMORTEM_DEBUGGING)

+ 2
- 2
Marlin/src/HAL/LPC1768/MarlinSerial.h 查看文件

@@ -60,8 +60,8 @@ extern MSerialT MSerial1;
60 60
 extern MSerialT MSerial2;
61 61
 extern MSerialT MSerial3;
62 62
 
63
-// Consequently, we can't use a RuntimeSerial either. The workaround would be to use a RuntimeSerial<ForwardSerial<MarlinSerial>> type here
64
-// Right now, let's ignore this until it's actually required.
63
+// Consequently, we can't use a RuntimeSerial either. The workaround would be to use
64
+// a RuntimeSerial<ForwardSerial<MarlinSerial>> type here. Ignore for now until it's actually required.
65 65
 #if ENABLED(SERIAL_RUNTIME_HOOK)
66 66
   #error "SERIAL_RUNTIME_HOOK is not yet supported for LPC176x."
67 67
 #endif

+ 0
- 3
Marlin/src/HAL/STM32/timers.h 查看文件

@@ -21,15 +21,12 @@
21 21
  */
22 22
 #pragma once
23 23
 
24
-#include <stdint.h>
25 24
 #include "../../inc/MarlinConfig.h"
26 25
 
27 26
 // ------------------------
28 27
 // Defines
29 28
 // ------------------------
30 29
 
31
-#define FORCE_INLINE __attribute__((always_inline)) inline
32
-
33 30
 // STM32 timers may be 16 or 32 bit. Limiting HAL_TIMER_TYPE_MAX to 16 bits
34 31
 // avoids issues with STM32F0 MCUs, which seem to pause timers if UINT32_MAX
35 32
 // is written to the register. STM32F4 timers do not manifest this issue,

+ 3
- 3
Marlin/src/HAL/STM32F1/timers.h 查看文件

@@ -25,9 +25,10 @@
25 25
  * HAL for stm32duino.com based on Libmaple and compatible (STM32F1)
26 26
  */
27 27
 
28
-#include <stdint.h>
28
+#include "../../inc/MarlinConfig.h"
29
+#include "HAL.h"
30
+
29 31
 #include <libmaple/timer.h>
30
-#include "../../core/boards.h"
31 32
 
32 33
 // ------------------------
33 34
 // Defines
@@ -37,7 +38,6 @@
37 38
  * TODO: Check and confirm what timer we will use for each Temps and stepper driving.
38 39
  * We should probable drive temps with PWM.
39 40
  */
40
-#define FORCE_INLINE __attribute__((always_inline)) inline
41 41
 
42 42
 typedef uint16_t hal_timer_t;
43 43
 #define HAL_TIMER_TYPE_MAX 0xFFFF

+ 2
- 1
Marlin/src/HAL/TEENSY31_32/HAL_SPI.cpp 查看文件

@@ -21,11 +21,12 @@
21 21
  */
22 22
 #ifdef __MK20DX256__
23 23
 
24
+#include "../../inc/MarlinConfig.h"
24 25
 #include "HAL.h"
26
+
25 27
 #include <SPI.h>
26 28
 #include <pins_arduino.h>
27 29
 #include "spi_pins.h"
28
-#include "../../core/macros.h"
29 30
 
30 31
 static SPISettings spiConfig;
31 32
 

+ 2
- 1
Marlin/src/HAL/TEENSY35_36/HAL_SPI.cpp 查看文件

@@ -26,11 +26,12 @@
26 26
 
27 27
 #if defined(__MK64FX512__) || defined(__MK66FX1M0__)
28 28
 
29
+#include "../../inc/MarlinConfig.h"
29 30
 #include "HAL.h"
31
+
30 32
 #include <SPI.h>
31 33
 #include <pins_arduino.h>
32 34
 #include "spi_pins.h"
33
-#include "../../core/macros.h"
34 35
 
35 36
 static SPISettings spiConfig;
36 37
 

+ 2
- 1
Marlin/src/HAL/TEENSY40_41/HAL.cpp 查看文件

@@ -26,10 +26,11 @@
26 26
 
27 27
 #ifdef __IMXRT1062__
28 28
 
29
+#include "../../inc/MarlinConfig.h"
29 30
 #include "HAL.h"
31
+
30 32
 #include "../shared/Delay.h"
31 33
 #include "timers.h"
32
-
33 34
 #include <Wire.h>
34 35
 
35 36
 #define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)

+ 2
- 1
Marlin/src/HAL/TEENSY40_41/HAL_SPI.cpp 查看文件

@@ -26,11 +26,12 @@
26 26
 
27 27
 #ifdef __IMXRT1062__
28 28
 
29
+#include "../../inc/MarlinConfig.h"
29 30
 #include "HAL.h"
31
+
30 32
 #include <SPI.h>
31 33
 #include <pins_arduino.h>
32 34
 #include "spi_pins.h"
33
-#include "../../core/macros.h"
34 35
 
35 36
 static SPISettings spiConfig;
36 37
 

+ 4
- 0
Marlin/src/HAL/shared/Marduino.h 查看文件

@@ -82,4 +82,8 @@
82 82
   #define UNUSED(x) ((void)(x))
83 83
 #endif
84 84
 
85
+#ifndef FORCE_INLINE
86
+  #define FORCE_INLINE inline __attribute__((always_inline))
87
+#endif
88
+
85 89
 #include "progmem.h"

+ 5
- 4
Marlin/src/core/serial.h 查看文件

@@ -62,11 +62,11 @@ extern uint8_t marlin_debug_flags;
62 62
 //
63 63
 // Serial redirection
64 64
 //
65
-// Step 1: Find what's the first serial leaf
65
+// Step 1: Find out what the first serial leaf is
66 66
 #if BOTH(HAS_MULTI_SERIAL, SERIAL_CATCHALL)
67
-  #define _SERIAL_LEAF_1  MYSERIAL
67
+  #define _SERIAL_LEAF_1 MYSERIAL
68 68
 #else
69
-  #define _SERIAL_LEAF_1  MYSERIAL1
69
+  #define _SERIAL_LEAF_1 MYSERIAL1
70 70
 #endif
71 71
 
72 72
 // Hook Meatpack if it's enabled on the first leaf
@@ -78,7 +78,8 @@ extern uint8_t marlin_debug_flags;
78 78
   #define SERIAL_LEAF_1 _SERIAL_LEAF_1
79 79
 #endif
80 80
 
81
-// Step 2: For multiserial, handle the second serial port as well
81
+// Step 2: For multiserial wrap all serial ports in a single
82
+//         interface with the ability to output to multiple serial ports.
82 83
 #if HAS_MULTI_SERIAL
83 84
   #define _PORT_REDIRECT(n,p) REMEMBER(n,multiSerial.portMask,p)
84 85
   #define _PORT_RESTORE(n,p)  RESTORE(n)

+ 2
- 2
Marlin/src/core/serial_hook.h 查看文件

@@ -67,7 +67,7 @@ struct BaseSerial : public SerialBase< BaseSerial<SerialT> >, public SerialT {
67 67
 
68 68
   SerialFeature features(serial_index_t index) const { return CALL_IF_EXISTS(SerialFeature, static_cast<const SerialT*>(this), features, index);  }
69 69
 
70
-  // We have 2 implementation of the same method in both base class, let's say which one we want
70
+  // Two implementations of the same method exist in both base classes so indicate the right one
71 71
   using SerialT::available;
72 72
   using SerialT::read;
73 73
   using SerialT::begin;
@@ -134,7 +134,7 @@ struct ForwardSerial : public SerialBase< ForwardSerial<SerialT> > {
134 134
   ForwardSerial(const bool e, SerialT & out) : BaseClassT(e), out(out) {}
135 135
 };
136 136
 
137
-// A class that's can be hooked and unhooked at runtime, useful to capturing the output of the serial interface
137
+// A class that can be hooked and unhooked at runtime, useful to capture the output of the serial interface
138 138
 template <class SerialT>
139 139
 struct RuntimeSerial : public SerialBase< RuntimeSerial<SerialT> >, public SerialT {
140 140
   typedef SerialBase< RuntimeSerial<SerialT> > BaseClassT;

+ 2
- 2
Marlin/src/gcode/control/M7-M9.cpp 查看文件

@@ -72,7 +72,7 @@ void GcodeSuite::M9() {
72 72
  * M8: Air Assist On
73 73
  */
74 74
 void GcodeSuite::M8() {
75
-  planner.synchronize(); 
75
+  planner.synchronize();
76 76
   cutter.air_assist_enable();   // Turn on Air Assist pin
77 77
 }
78 78
 
@@ -80,7 +80,7 @@ void GcodeSuite::M8() {
80 80
  * M9: Air Assist Off
81 81
  */
82 82
 void GcodeSuite::M9() {
83
-  planner.synchronize(); 
83
+  planner.synchronize();
84 84
   cutter.air_assist_disable();  // Turn off Air Assist pin
85 85
 }
86 86
 

+ 2
- 2
Marlin/src/gcode/gcode.cpp 查看文件

@@ -1064,7 +1064,7 @@ void GcodeSuite::process_subcommands_now_P(PGM_P pgcode) {
1064 1064
     strncpy_P(cmd, pgcode, len);                      // Copy the command to the stack
1065 1065
     cmd[len] = '\0';                                  // End with a nul
1066 1066
     parser.parse(cmd);                                // Parse the command
1067
-    process_parsed_command(true);                     // Process it
1067
+    process_parsed_command(true);                     // Process it (no "ok")
1068 1068
     if (!delim) break;                                // Last command?
1069 1069
     pgcode = delim + 1;                               // Get the next command
1070 1070
   }
@@ -1077,7 +1077,7 @@ void GcodeSuite::process_subcommands_now(char * gcode) {
1077 1077
     char * const delim = strchr(gcode, '\n');         // Get address of next newline
1078 1078
     if (delim) *delim = '\0';                         // Replace with nul
1079 1079
     parser.parse(gcode);                              // Parse the current command
1080
-    process_parsed_command(true);                     // Process it
1080
+    process_parsed_command(true);                     // Process it (no "ok")
1081 1081
     if (!delim) break;                                // Last command?
1082 1082
     *delim = '\n';                                    // Put back the newline
1083 1083
     gcode = delim + 1;                                // Get the next command

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

@@ -34,8 +34,8 @@
34 34
   #include "../HAL/platforms.h"
35 35
 #endif
36 36
 
37
-#include "../core/boards.h"
38 37
 #include "../core/macros.h"
38
+#include "../core/boards.h"
39 39
 #include "../../Configuration.h"
40 40
 
41 41
 #ifdef CUSTOM_VERSION_FILE

+ 2
- 5
Marlin/src/lcd/extui/lib/dgus/mks/DGUSScreenHandler.cpp 查看文件

@@ -26,19 +26,16 @@
26 26
 
27 27
 #include "../DGUSScreenHandler.h"
28 28
 
29
+#include "../../../../../inc/MarlinConfig.h"
30
+
29 31
 #include "../../../../../MarlinCore.h"
30
-#include "../../../../../gcode/queue.h"
31
-#include "../../../../../libs/duration_t.h"
32 32
 #include "../../../../../module/settings.h"
33 33
 #include "../../../../../module/temperature.h"
34 34
 #include "../../../../../module/motion.h"
35 35
 #include "../../../../../module/planner.h"
36 36
 #include "../../../../../module/printcounter.h"
37
-#include "../../../../../sd/cardreader.h"
38 37
 
39 38
 #include "../../../../../gcode/gcode.h"
40
-#include "../../../../../pins/pins.h"
41
-#include "../../../../../libs/nozzle.h"
42 39
 
43 40
 #if ENABLED(HAS_STEALTHCHOP)
44 41
   #include "../../../../../module/stepper/trinamic.h"

+ 2276
- 2276
Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/ftdi_eve_lib/extended/unicode/cyrillic_char_set_bitmap_31.h
文件差異過大導致無法顯示
查看文件


+ 38
- 38
Marlin/src/lcd/tft/images/btn_rounded_42x39x4.cpp 查看文件

@@ -25,44 +25,44 @@
25 25
 #if HAS_GRAPHICAL_TFT
26 26
 
27 27
 extern const uint8_t btn_rounded_42x39x4[819] = {
28
-  0x87, 0x87, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x78, 0x78, 
29
-  0x87, 0x77, 0xab, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xb9, 0x77, 0x78, 
30
-  0x87, 0x8e, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xd7, 0x68, 
31
-  0x87, 0xff, 0x84, 0x32, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x37, 0xff, 0x57, 
32
-  0x7b, 0xf6, 0x34, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x43, 0x6f, 0x95, 
33
-  0x7d, 0xc3, 0x45, 0x56, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x4d, 0xc4, 
34
-  0x7e, 0xc3, 0x56, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x6d, 0xd3, 
35
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
36
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
37
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
38
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
39
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
40
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
41
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
42
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
43
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
44
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
45
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
46
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
47
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
48
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
49
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
50
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
51
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
52
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
53
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
54
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
55
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
56
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
57
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
58
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
59
-  0x7e, 0xc3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7d, 0xd3, 
60
-  0x7d, 0xd3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x77, 0x7e, 0xc3, 
61
-  0x88, 0xfa, 0x56, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0xcf, 0x64, 
62
-  0x86, 0xbf, 0xdb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xbb, 0xce, 0xfb, 0x34, 
63
-  0x87, 0x57, 0xef, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe, 0x74, 0x45, 
64
-  0x87, 0x75, 0x33, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x33, 0x34, 0x56, 
65
-  0x87, 0x77, 0x65, 0x54, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x55, 0x67, 
28
+  0x87, 0x87, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x78, 0x78,
29
+  0x87, 0x77, 0xAB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xB9, 0x77, 0x78,
30
+  0x87, 0x8E, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xD7, 0x68,
31
+  0x87, 0xFF, 0x84, 0x32, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x37, 0xFF, 0x57,
32
+  0x7B, 0xF6, 0x34, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x43, 0x6F, 0x95,
33
+  0x7D, 0xC3, 0x45, 0x56, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x4D, 0xC4,
34
+  0x7E, 0xC3, 0x56, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x6D, 0xD3,
35
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
36
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
37
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
38
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
39
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
40
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
41
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
42
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
43
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
44
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
45
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
46
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
47
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
48
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
49
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
50
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
51
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
52
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
53
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
54
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
55
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
56
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
57
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
58
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
59
+  0x7E, 0xC3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x7D, 0xD3,
60
+  0x7D, 0xD3, 0x57, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x77, 0x7E, 0xC3,
61
+  0x88, 0xFA, 0x56, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0x77, 0xCF, 0x64,
62
+  0x86, 0xBF, 0xDB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xBB, 0xCE, 0xFB, 0x34,
63
+  0x87, 0x57, 0xEF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x74, 0x45,
64
+  0x87, 0x75, 0x33, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x33, 0x34, 0x56,
65
+  0x87, 0x77, 0x65, 0x54, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x44, 0x55, 0x67,
66 66
   0x87, 0x87, 0x77, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x67, 0x78
67 67
 };
68 68
 

+ 1
- 5
Marlin/src/libs/softspi.h 查看文件

@@ -25,11 +25,7 @@
25 25
 // Based on https://github.com/niteris/ArduinoSoftSpi
26 26
 //
27 27
 
28
-#include "../HAL/shared/Marduino.h"
29
-
30
-#ifndef FORCE_INLINE
31
-  #define FORCE_INLINE inline __attribute__((always_inline))
32
-#endif
28
+#include "../HAL/shared/Marduino.h" // CORE_TEENSY
33 29
 
34 30
 #define nop __asm__ volatile ("nop") // NOP for timing
35 31
 

+ 1
- 1
docs/Serial.md 查看文件

@@ -1,6 +1,6 @@
1 1
 # Serial port architecture in Marlin
2 2
 
3
-Marlin is targeting a plethora of different CPU architecture and platforms. Each of these platforms has its own serial interface.
3
+Marlin is targeting a plethora of different CPU architectures and platforms. Each of these platforms has its own serial interface.
4 4
 While many provide a Arduino-like Serial class, it's not all of them, and the differences in the existing API create a very complex brain teaser for writing code that works more or less on each platform.
5 5
 
6 6
 Moreover, many platform have intrinsic needs about serial port (like forwarding the output on multiple serial port, providing a *serial-like* telnet server, mixing USB-based serial port with SD card emulation) that are difficult to handle cleanly in the other platform serial logic.

Loading…
取消
儲存