Преглед на файлове

Merge pull request #9393 from Bob-the-Kuhn/revert-parser-to-array-2.0.x

[2.0.x] Fix compile error when FASTER_GCODE_PARSER is disabled
Scott Lahteine преди 7 години
родител
ревизия
434a2dcbf2
No account linked to committer's email address

+ 3
- 3
Marlin/src/HAL/HAL_TEENSY35_36/HAL_spi_Teensy.cpp Целия файл

91
   SPI.beginTransaction(spiConfig);
91
   SPI.beginTransaction(spiConfig);
92
   SPDR = token;
92
   SPDR = token;
93
   for (uint16_t i = 0; i < 512; i += 2) {
93
   for (uint16_t i = 0; i < 512; i += 2) {
94
-    while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
94
+    while (!TEST(SPSR, SPIF)) { /* nada */ }; 
95
     SPDR = buf[i];
95
     SPDR = buf[i];
96
-    while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
96
+    while (!TEST(SPSR, SPIF)) { /* nada */ }; 
97
     SPDR = buf[i + 1];
97
     SPDR = buf[i + 1];
98
   }
98
   }
99
-  while (!TEST(SPSR, SPIF)) { /* Intentionally left empty */ }
99
+  while (!TEST(SPSR, SPIF)) { /* nada */ }; 
100
   SPI.endTransaction();
100
   SPI.endTransaction();
101
 }
101
 }
102
 
102
 

+ 10
- 7
Marlin/src/gcode/parser.h Целия файл

32
 #include "../inc/MarlinConfig.h"
32
 #include "../inc/MarlinConfig.h"
33
 
33
 
34
 //#define DEBUG_GCODE_PARSER
34
 //#define DEBUG_GCODE_PARSER
35
+#if ENABLED(DEBUG_GCODE_PARSER)
36
+  #include "../libs/hex_print_routines.h"
37
+#endif
35
 
38
 
36
 /**
39
 /**
37
  * GCode parser
40
  * GCode parser
90
 
93
 
91
   #define LETTER_BIT(N) ((N) - 'A')
94
   #define LETTER_BIT(N) ((N) - 'A')
92
 
95
 
93
-  #if ENABLED(FASTER_GCODE_PARSER)
96
+  FORCE_INLINE static bool valid_signless(const char * const p) {
97
+    return NUMERIC(p[0]) || (p[0] == '.' && NUMERIC(p[1])); // .?[0-9]
98
+  }
94
 
99
 
95
-    FORCE_INLINE static bool valid_signless(const char * const p) {
96
-      return NUMERIC(p[0]) || (p[0] == '.' && NUMERIC(p[1])); // .?[0-9]
97
-    }
100
+  FORCE_INLINE static bool valid_float(const char * const p) {
101
+    return valid_signless(p) || ((p[0] == '-' || p[0] == '+') && valid_signless(&p[1])); // [-+]?.?[0-9]
102
+  }
98
 
103
 
99
-    FORCE_INLINE static bool valid_float(const char * const p) {
100
-      return valid_signless(p) || ((p[0] == '-' || p[0] == '+') && valid_signless(&p[1])); // [-+]?.?[0-9]
101
-    }
104
+  #if ENABLED(FASTER_GCODE_PARSER)
102
 
105
 
103
     FORCE_INLINE static bool valid_int(const char * const p) {
106
     FORCE_INLINE static bool valid_int(const char * const p) {
104
       return NUMERIC(p[0]) || ((p[0] == '-' || p[0] == '+') && NUMERIC(p[1])); // [-+]?[0-9]
107
       return NUMERIC(p[0]) || ((p[0] == '-' || p[0] == '+') && NUMERIC(p[1])); // [-+]?[0-9]

+ 5
- 5
Marlin/src/lcd/dogm/HAL_LCD_class_defines.h Целия файл

28
 class U8GLIB_64128N_2X_HAL : public U8GLIB
28
 class U8GLIB_64128N_2X_HAL : public U8GLIB
29
 {
29
 {
30
   public:
30
   public:
31
-    U8GLIB_64128N_2X_HAL(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE)
31
+    U8GLIB_64128N_2X_HAL(pin_t sck, pin_t mosi, pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE)
32
       : U8GLIB(&u8g_dev_st7565_64128n_HAL_2x_sw_spi, sck, mosi, cs, a0, reset)
32
       : U8GLIB(&u8g_dev_st7565_64128n_HAL_2x_sw_spi, sck, mosi, cs, a0, reset)
33
       { }
33
       { }
34
-    U8GLIB_64128N_2X_HAL(uint8_t cs, uint8_t a0, uint8_t reset = U8G_PIN_NONE)
34
+    U8GLIB_64128N_2X_HAL(pin_t cs, pin_t a0, pin_t reset = U8G_PIN_NONE)
35
       : U8GLIB(&u8g_dev_st7565_64128n_HAL_2x_hw_spi, cs, a0, reset)
35
       : U8GLIB(&u8g_dev_st7565_64128n_HAL_2x_hw_spi, cs, a0, reset)
36
       { }
36
       { }
37
 };
37
 };
42
 class U8GLIB_ST7920_128X64_4X_HAL : public U8GLIB
42
 class U8GLIB_ST7920_128X64_4X_HAL : public U8GLIB
43
 {
43
 {
44
   public:
44
   public:
45
-    U8GLIB_ST7920_128X64_4X_HAL(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t reset = U8G_PIN_NONE)
45
+    U8GLIB_ST7920_128X64_4X_HAL(pin_t sck, pin_t mosi, pin_t cs, pin_t reset = U8G_PIN_NONE)
46
       : U8GLIB(&u8g_dev_st7920_128x64_HAL_4x_sw_spi, sck, mosi, cs, U8G_PIN_NONE, reset)    // a0 = U8G_PIN_NONE
46
       : U8GLIB(&u8g_dev_st7920_128x64_HAL_4x_sw_spi, sck, mosi, cs, U8G_PIN_NONE, reset)    // a0 = U8G_PIN_NONE
47
       { }
47
       { }
48
-    U8GLIB_ST7920_128X64_4X_HAL(uint8_t cs, uint8_t reset = U8G_PIN_NONE)
48
+    U8GLIB_ST7920_128X64_4X_HAL(pin_t cs, pin_t reset = U8G_PIN_NONE)
49
       : U8GLIB(&u8g_dev_st7920_128x64_HAL_4x_hw_spi, cs, U8G_PIN_NONE, reset)   // a0 = U8G_PIN_NONE
49
       : U8GLIB(&u8g_dev_st7920_128x64_HAL_4x_hw_spi, cs, U8G_PIN_NONE, reset)   // a0 = U8G_PIN_NONE
50
       { }
50
       { }
51
 };
51
 };
56
 class U8GLIB_ST7920_128X64_RRD : public U8GLIB
56
 class U8GLIB_ST7920_128X64_RRD : public U8GLIB
57
 {
57
 {
58
   public:
58
   public:
59
-    U8GLIB_ST7920_128X64_RRD(uint8_t sck, uint8_t mosi, uint8_t cs, uint8_t reset = U8G_PIN_NONE)
59
+    U8GLIB_ST7920_128X64_RRD(pin_t sck, pin_t mosi, pin_t cs, pin_t reset = U8G_PIN_NONE)
60
       : U8GLIB(&u8g_dev_st7920_128x64_rrd_sw_spi, sck, mosi, cs, U8G_PIN_NONE, reset)   // a0 = U8G_PIN_NONE
60
       : U8GLIB(&u8g_dev_st7920_128x64_rrd_sw_spi, sck, mosi, cs, U8G_PIN_NONE, reset)   // a0 = U8G_PIN_NONE
61
       { }
61
       { }
62
 };
62
 };

+ 4
- 2
Marlin/src/pins/pins_RAMPS_RE_ARM.h Целия файл

214
 //
214
 //
215
 // Průša i3 MK2 Multiplexer Support
215
 // Průša i3 MK2 Multiplexer Support
216
 //
216
 //
217
-#define E_MUX0_PIN         P0_03   // ( 0) Z_CS_PIN
218
-#define E_MUX1_PIN         P0_02   // ( 1) E0_CS_PIN
217
+#if SERIAL_PORT != 0 && SERIAL_PORT_2 != 0
218
+  #define E_MUX0_PIN         P0_03   // ( 0) Z_CS_PIN
219
+  #define E_MUX1_PIN         P0_02   // ( 1) E0_CS_PIN
220
+#endif
219
 #define E_MUX2_PIN         P0_26   // (63) E1_CS_PIN
221
 #define E_MUX2_PIN         P0_26   // (63) E1_CS_PIN
220
 
222
 
221
 /**
223
 /**

Loading…
Отказ
Запис