Просмотр исходного кода

Build and CI fixes and optimizations (#12584)

-Disable LDF "deep+" mode on AT90USB platforms. Appears not needed any longer (likely due to fix 7322df26ad/). Results in identical binary output and cuts compile time in half
-Disable Cartesio config from CircleCI (compile failure)
-Disable Geetech I3 Pro X GT2560 from CircleCI (compile failure)
-Enable EEPROM on Micromake example config (fix compile failure)
-Move FolgerTech/i3-2020 to AVR platform in CircleCI (fix CirculeCI build failure)
-Disable various examples failing to build in CircleCI
-Enable various examples no longer failing to build in CircleCI
Dave Johnson 5 лет назад
Родитель
Сommit
0947b92734
3 измененных файлов: 49 добавлений и 69 удалений
  1. 48
    66
      .circleci/config.yml
  2. 1
    1
      Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
  3. 0
    2
      platformio.ini

+ 48
- 66
.circleci/config.yml Просмотреть файл

67
 
67
 
68
             echo testing megaatmega2560 targets...
68
             echo testing megaatmega2560 targets...
69
             export TEST_PLATFORM="-e megaatmega2560"
69
             export TEST_PLATFORM="-e megaatmega2560"
70
-            restore_configs
71
             echo use_example_configs adafruit/ST7565
70
             echo use_example_configs adafruit/ST7565
72
             use_example_configs adafruit/ST7565
71
             use_example_configs adafruit/ST7565
73
             build_marlin_pio ./ ${TEST_PLATFORM}
72
             build_marlin_pio ./ ${TEST_PLATFORM}
88
             use_example_configs AliExpress/CL-260
87
             use_example_configs AliExpress/CL-260
89
             build_marlin_pio ./ ${TEST_PLATFORM}
88
             build_marlin_pio ./ ${TEST_PLATFORM}
90
             restore_configs
89
             restore_configs
91
-            echo use_example_configs Cartesio
92
-            use_example_configs Cartesio
93
-            build_marlin_pio ./ ${TEST_PLATFORM}
94
-            restore_configs
90
+            #echo use_example_configs Cartesio
91
+            #use_example_configs Cartesio
92
+            #build_marlin_pio ./ ${TEST_PLATFORM}
93
+            #restore_configs
95
             echo use_example_configs delta/FLSUN/auto_calibrate
94
             echo use_example_configs delta/FLSUN/auto_calibrate
96
             use_example_configs delta/FLSUN/auto_calibrate
95
             use_example_configs delta/FLSUN/auto_calibrate
97
             build_marlin_pio ./ ${TEST_PLATFORM}
96
             build_marlin_pio ./ ${TEST_PLATFORM}
120
             use_example_configs Felix/DUAL
119
             use_example_configs Felix/DUAL
121
             build_marlin_pio ./ ${TEST_PLATFORM}
120
             build_marlin_pio ./ ${TEST_PLATFORM}
122
             restore_configs
121
             restore_configs
122
+            echo use_example_configs FolgerTech/i3-2020
123
+            use_example_configs FolgerTech/i3-2020
124
+            build_marlin_pio ./ ${TEST_PLATFORM}
125
+            restore_configs
123
             echo use_example_configs gCreate/gMax1.5+
126
             echo use_example_configs gCreate/gMax1.5+
124
             use_example_configs gCreate/gMax1.5+
127
             use_example_configs gCreate/gMax1.5+
125
             build_marlin_pio ./ ${TEST_PLATFORM}
128
             build_marlin_pio ./ ${TEST_PLATFORM}
128
             use_example_configs Geeetech/GT2560
131
             use_example_configs Geeetech/GT2560
129
             build_marlin_pio ./ ${TEST_PLATFORM}
132
             build_marlin_pio ./ ${TEST_PLATFORM}
130
             restore_configs
133
             restore_configs
131
-            echo use_example_configs Geeetech/I3_Pro_X-GT2560
132
-            use_example_configs Geeetech/I3_Pro_X-GT2560
133
-            build_marlin_pio ./ ${TEST_PLATFORM}
134
-            restore_configs
134
+            #echo use_example_configs Geeetech/I3_Pro_X-GT2560
135
+            #use_example_configs Geeetech/I3_Pro_X-GT2560
136
+            #build_marlin_pio ./ ${TEST_PLATFORM}
137
+            #restore_configs
135
             echo use_example_configs Infitary/i3-M508
138
             echo use_example_configs Infitary/i3-M508
136
             use_example_configs Infitary/i3-M508
139
             use_example_configs Infitary/i3-M508
137
             build_marlin_pio ./ ${TEST_PLATFORM}
140
             build_marlin_pio ./ ${TEST_PLATFORM}
138
             restore_configs
141
             restore_configs
139
-            #
140
-            # Disabled due to compile failure on E0_AUTO_FAN_PIN PB8
141
-            #
142
-            #  use_example_configs Malyan/M200
143
-            #  build_marlin_pio ./ ${TEST_PLATFORM}
144
-            #  restore_configs
142
+            use_example_configs Malyan/M200
143
+            build_marlin_pio ./ ${TEST_PLATFORM}
144
+            restore_configs
145
             echo use_example_configs Micromake/C1/basic
145
             echo use_example_configs Micromake/C1/basic
146
             use_example_configs Micromake/C1/basic
146
             use_example_configs Micromake/C1/basic
147
             build_marlin_pio ./ ${TEST_PLATFORM}
147
             build_marlin_pio ./ ${TEST_PLATFORM}
177
             echo use_example_configs Wanhao/Duplicator6
177
             echo use_example_configs Wanhao/Duplicator6
178
             use_example_configs Wanhao/Duplicator6
178
             use_example_configs Wanhao/Duplicator6
179
             build_marlin_pio ./ ${TEST_PLATFORM}
179
             build_marlin_pio ./ ${TEST_PLATFORM}
180
-            #
181
-            # Disabled due to compile failure on https://github.com/stawel/SlowSoftI2CMaster
182
-            #
183
-            #  - Requires https://github.com/stawel/SlowSoftI2CMaster
184
-            #  restore_configs
185
-            #  use_example_configs wt150
186
-            #  build_marlin_pio ./ ${TEST_PLATFORM}
187
-
188
-
189
-            echo testing anet10 targets...
190
-            export TEST_PLATFORM="-e anet10"
191
             restore_configs
180
             restore_configs
181
+            # Requires manual load of https://github.com/stawel/SlowSoftI2CMaster
182
+            #use_example_configs wt150
183
+            #build_marlin_pio ./ ${TEST_PLATFORM}
184
+            #restore_configs
185
+            echo testing melzi targets...
186
+            export TEST_PLATFORM="-e melzi"
192
             echo use_example_configs Anet/A6
187
             echo use_example_configs Anet/A6
193
             use_example_configs Anet/A6
188
             use_example_configs Anet/A6
194
             build_marlin_pio ./ ${TEST_PLATFORM}
189
             build_marlin_pio ./ ${TEST_PLATFORM}
212
             echo use_example_configs TinyBoy2
207
             echo use_example_configs TinyBoy2
213
             use_example_configs TinyBoy2
208
             use_example_configs TinyBoy2
214
             build_marlin_pio ./ ${TEST_PLATFORM}
209
             build_marlin_pio ./ ${TEST_PLATFORM}
215
-
210
+            restore_configs
216
 
211
 
217
             echo testing rambo targets...
212
             echo testing rambo targets...
218
             export TEST_PLATFORM="-e rambo"
213
             export TEST_PLATFORM="-e rambo"
219
-            restore_configs
220
             echo use_example_configs AlephObjects/TAZ4
214
             echo use_example_configs AlephObjects/TAZ4
221
             use_example_configs AlephObjects/TAZ4
215
             use_example_configs AlephObjects/TAZ4
222
             build_marlin_pio ./ ${TEST_PLATFORM}
216
             build_marlin_pio ./ ${TEST_PLATFORM}
223
-
224
-
225
-            echo testing teensy20 targets...
226
-            export TEST_PLATFORM="-e teensy20"
227
-            #
228
-            # Disabled due to Z_MIN_PIN related compile failure
229
-            #
230
-            #  restore_configs
231
-            #  use_example_configs delta/kossel_pro
232
-            #  build_marlin_pio ./ ${TEST_PLATFORM}
233
             restore_configs
217
             restore_configs
218
+
219
+            echo testing at90usb1286_* targets...
220
+            export TEST_PLATFORM="-e at90usb1286_dfu"
221
+            #echo se_example_configs delta/kossel_pro
222
+            #use_example_configs delta/kossel_pro
223
+            #build_marlin_pio ./ ${TEST_PLATFORM}
224
+            #restore_configs
234
             echo use_example_configs makibox
225
             echo use_example_configs makibox
235
             use_example_configs makibox
226
             use_example_configs makibox
236
             build_marlin_pio ./ ${TEST_PLATFORM}
227
             build_marlin_pio ./ ${TEST_PLATFORM}
237
-
228
+            restore_configs
238
 
229
 
239
             echo testing sanguino_atmega644p targets...
230
             echo testing sanguino_atmega644p targets...
240
             export TEST_PLATFORM="-e sanguino_atmega644p"
231
             export TEST_PLATFORM="-e sanguino_atmega644p"
241
-            restore_configs
242
             echo use_example_configs tvrrug/Round2
232
             echo use_example_configs tvrrug/Round2
243
             use_example_configs tvrrug/Round2
233
             use_example_configs tvrrug/Round2
244
             build_marlin_pio ./ ${TEST_PLATFORM}
234
             build_marlin_pio ./ ${TEST_PLATFORM}
245
-
235
+            restore_configs
246
 
236
 
247
             echo testing LPC1768 targets...
237
             echo testing LPC1768 targets...
248
             export TEST_PLATFORM="-e LPC1768"
238
             export TEST_PLATFORM="-e LPC1768"
239
+            echo use_example_configs Mks/Sbase
240
+            use_example_configs Mks/Sbase
241
+            build_marlin_pio ./ ${TEST_PLATFORM}
249
             restore_configs
242
             restore_configs
250
-            echo use_example_configs FolgerTech/i3-2020
251
-            use_example_configs FolgerTech/i3-2020
243
+            echo testing STM32F1 targets...
244
+            export TEST_PLATFORM="-e STM32F1"
245
+            restore_configs
246
+            echo use_example_configs STM32F10
247
+            use_example_configs STM32F10
252
             build_marlin_pio ./ ${TEST_PLATFORM}
248
             build_marlin_pio ./ ${TEST_PLATFORM}
253
             restore_configs
249
             restore_configs
254
-            echo use_example_configs Mks/Sbase
255
-            use_example_configs Mks/Sbase
250
+            echo use_example_configs stm32f103ret6
251
+            use_example_configs stm32f103ret6
256
             build_marlin_pio ./ ${TEST_PLATFORM}
252
             build_marlin_pio ./ ${TEST_PLATFORM}
253
+            restore_configs
257
 
254
 
258
-            #
259
-            # Disabled due to numerous compile failures
260
-            #
261
-            #  echo testing STM32F1 targets...
262
-            #  export TEST_PLATFORM="-e STM32F1"
263
-            #  restore_configs
264
-            #  use_example_configs STM32F10
265
-            #  build_marlin_pio ./ ${TEST_PLATFORM}
266
-            #  restore_configs
267
-            #  use_example_configs stm32f103ret6
268
-            #  build_marlin_pio ./ ${TEST_PLATFORM}
269
-
270
-
271
-            #
272
-            # Disabled due do pin related compile failures
273
-            #
274
-            #  echo testing DUE targets...
275
-            #  export TEST_PLATFORM="-e DUE"
276
-            #  restore_configs
277
-            #  use_example_configs UltiMachine/Archim2
278
-            #  build_marlin_pio ./ ${TEST_PLATFORM}
255
+            echo testing DUE targets...
256
+            export TEST_PLATFORM="-e DUE"
257
+            #echo use_example_configs UltiMachine/Archim2
258
+            #use_example_configs UltiMachine/Archim2
259
+            #build_marlin_pio ./ ${TEST_PLATFORM}
260
+            #restore_configs
279
 
261
 
280
             #
262
             #
281
             # Remove temp files from dependencies tree prior to caching
263
             # Remove temp files from dependencies tree prior to caching

+ 1
- 1
Marlin/src/config/examples/Micromake/C1/basic/Configuration.h Просмотреть файл

1288
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
1288
 // M501 - reads parameters from EEPROM (if you need reset them after you changed them temporarily).
1289
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
1289
 // M502 - reverts to the default "factory settings".  You still need to store them in EEPROM afterwards if you want to.
1290
 //
1290
 //
1291
-//#define EEPROM_SETTINGS // Enable for M500 and M501 commands
1291
+#define EEPROM_SETTINGS // Enable for M500 and M501 commands
1292
 //#define DISABLE_M503    // Saves ~2700 bytes of PROGMEM. Disable for release!
1292
 //#define DISABLE_M503    // Saves ~2700 bytes of PROGMEM. Disable for release!
1293
 #define EEPROM_CHITCHAT   // Give feedback on EEPROM commands. Disable to save PROGMEM.
1293
 #define EEPROM_CHITCHAT   // Give feedback on EEPROM commands. Disable to save PROGMEM.
1294
 
1294
 

+ 0
- 2
platformio.ini Просмотреть файл

86
 board         = at90usb1286
86
 board         = at90usb1286
87
 build_flags   = ${common.build_flags}
87
 build_flags   = ${common.build_flags}
88
 lib_deps      = ${common.lib_deps}
88
 lib_deps      = ${common.lib_deps}
89
-lib_ldf_mode  = deep+
90
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
89
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
91
 extra_scripts = pre:buildroot/share/atom/create_custom_upload_command_CDC.py
90
 extra_scripts = pre:buildroot/share/atom/create_custom_upload_command_CDC.py
92
 monitor_speed = 250000
91
 monitor_speed = 250000
103
 board         = at90usb1286
102
 board         = at90usb1286
104
 build_flags   = ${common.build_flags}
103
 build_flags   = ${common.build_flags}
105
 lib_deps      = ${common.lib_deps}
104
 lib_deps      = ${common.lib_deps}
106
-lib_ldf_mode  = deep+
107
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
105
 src_filter    = ${common.default_src_filter} +<src/HAL/HAL_AVR>
108
 extra_scripts = pre:buildroot/share/atom/create_custom_upload_command_DFU.py
106
 extra_scripts = pre:buildroot/share/atom/create_custom_upload_command_DFU.py
109
 monitor_speed = 250000
107
 monitor_speed = 250000

Загрузка…
Отмена
Сохранить