Browse Source

Followup to "optimize common strings"

Scott Lahteine 5 years ago
parent
commit
1ee648ecd2

+ 1
- 1
Marlin/src/gcode/motion/M290.cpp View File

130
           , SP_Y_STR, babystep.axis_total[Y_AXIS]
130
           , SP_Y_STR, babystep.axis_total[Y_AXIS]
131
           , SP_Z_STR
131
           , SP_Z_STR
132
         #else
132
         #else
133
-          , PSTR("Babystep Z")
133
+          PSTR("Babystep Z")
134
         #endif
134
         #endif
135
         , babystep.axis_total[BS_TODO_AXIS(Z_AXIS)]
135
         , babystep.axis_total[BS_TODO_AXIS(Z_AXIS)]
136
       );
136
       );

+ 2
- 0
Marlin/src/libs/vector_3.cpp View File

76
             matrix.vectors[0][2] * _x + matrix.vectors[1][2] * _y + matrix.vectors[2][2] * _z };
76
             matrix.vectors[0][2] * _x + matrix.vectors[1][2] * _y + matrix.vectors[2][2] * _z };
77
 }
77
 }
78
 
78
 
79
+extern const char SP_X_STR[], SP_Y_STR[], SP_Z_STR[];
80
+
79
 void vector_3::debug(PGM_P const title) {
81
 void vector_3::debug(PGM_P const title) {
80
   serialprintPGM(title);
82
   serialprintPGM(title);
81
   SERIAL_ECHOPAIR_F_P(SP_X_STR, x, 6);
83
   SERIAL_ECHOPAIR_F_P(SP_X_STR, x, 6);

+ 4
- 1
Marlin/src/pins/stm32/pins_JGAURORA_A5S_A1.h View File

35
 #endif
35
 #endif
36
 #define BOARD_INFO_NAME "JGAurora A5S A1 board"
36
 #define BOARD_INFO_NAME "JGAurora A5S A1 board"
37
 
37
 
38
-#define STM32_XL_DENSITY
38
+#ifndef STM32_XL_DENSITY
39
+  #define STM32_XL_DENSITY
40
+#endif
41
+
39
 // #define MCU_STM32F103ZE // not yet required
42
 // #define MCU_STM32F103ZE // not yet required
40
 // Enable EEPROM Emulation for this board, so that we don't overwrite factory data
43
 // Enable EEPROM Emulation for this board, so that we don't overwrite factory data
41
 
44
 

Loading…
Cancel
Save