Przeglądaj źródła

Restore STM32F103RE environment

Scott Lahteine 5 lat temu
rodzic
commit
102c9595f2
2 zmienionych plików z 23 dodań i 289 usunięć
  1. 0
    274
      .circleci/config.yml
  2. 23
    15
      platformio.ini

+ 0
- 274
.circleci/config.yml Wyświetl plik

@@ -1,274 +0,0 @@
1
-# Python CircleCI 2.0 configuration file
2
-#
3
-# Check https://circleci.com/docs/2.0/language-python/ for more details
4
-#
5
-version: 2
6
-jobs:
7
-  build:
8
-    docker:
9
-      # specify the version you desire here
10
-      # use `-browsers` prefix for selenium tests, e.g. `3.6.1-browsers`
11
-      - image: circleci/python:2.7.13
12
-
13
-      # Specify service dependencies here if necessary
14
-      # CircleCI maintains a library of pre-built images
15
-      # documented at https://circleci.com/docs/2.0/circleci-images/
16
-      # - image: circleci/postgres:9.4
17
-    environment:
18
-      TEST_PLATFORM: "-e megaatmega2560"
19
-
20
-    working_directory: ~/Marlin
21
-
22
-    steps:
23
-      - checkout
24
-
25
-      - restore_cache:
26
-          paths:
27
-          - ~/.platformio
28
-          - ~/Marlin/.piolibdeps
29
-          keys:
30
-          - v1-dependencies-{{ checksum "~/Marlin/platformio.ini" }}
31
-          # fallback to using the latest cache if no exact match is found
32
-          - v1-dependencies-
33
-
34
-      - run:
35
-          name: install dependencies
36
-          command: |
37
-            sudo pip install -U platformio
38
-
39
-      # run tests!
40
-      - run:
41
-          name: run tests
42
-          command: |
43
-            #
44
-            #
45
-            # Fetch the tag information for the current branch
46
-            ls -la
47
-            git fetch origin --tags
48
-            #
49
-            # Publish the buildroot script folder
50
-            chmod +x buildroot/bin/*
51
-            export PATH=`pwd`/buildroot/bin/:${PATH}
52
-
53
-            # Generate custom version include
54
-            generate_version ./Marlin/
55
-            cat ./Marlin/Version.h
56
-            #
57
-            # Back up pins_RAMPS.h
58
-            #
59
-            backup_ramps
60
-
61
-            env_backup
62
-
63
-            #################################
64
-            # Build all sample configurations
65
-            #################################
66
-
67
-            echo testing megaatmega2560 targets...
68
-            export TEST_PLATFORM="-e megaatmega2560"
69
-            echo use_example_configs adafruit/ST7565
70
-            use_example_configs adafruit/ST7565
71
-            build_marlin_pio ./ ${TEST_PLATFORM}
72
-            restore_configs
73
-            echo use_example_configs BQ/Hephestos
74
-            use_example_configs BQ/Hephestos
75
-            build_marlin_pio ./ ${TEST_PLATFORM}
76
-            restore_configs
77
-            echo use_example_configs BQ/Hephestos_2
78
-            use_example_configs BQ/Hephestos_2
79
-            build_marlin_pio ./ ${TEST_PLATFORM}
80
-            restore_configs
81
-            echo use_example_configs BQ/WITBOX
82
-            use_example_configs BQ/WITBOX
83
-            build_marlin_pio ./ ${TEST_PLATFORM}
84
-            restore_configs
85
-            echo use_example_configs AliExpress/CL-260
86
-            use_example_configs AliExpress/CL-260
87
-            build_marlin_pio ./ ${TEST_PLATFORM}
88
-            restore_configs
89
-            #echo use_example_configs Cartesio
90
-            #use_example_configs Cartesio
91
-            #build_marlin_pio ./ ${TEST_PLATFORM}
92
-            #restore_configs
93
-            echo use_example_configs delta/FLSUN/auto_calibrate
94
-            use_example_configs delta/FLSUN/auto_calibrate
95
-            build_marlin_pio ./ ${TEST_PLATFORM}
96
-            restore_configs
97
-            echo use_example_configs delta/FLSUN/kossel_mini
98
-            use_example_configs delta/FLSUN/kossel_mini
99
-            build_marlin_pio ./ ${TEST_PLATFORM}
100
-            restore_configs
101
-            echo use_example_configs delta/generic
102
-            use_example_configs delta/generic
103
-            build_marlin_pio ./ ${TEST_PLATFORM}
104
-            restore_configs
105
-            echo use_example_configs delta/kossel_mini
106
-            use_example_configs delta/kossel_mini
107
-            build_marlin_pio ./ ${TEST_PLATFORM}
108
-            restore_configs
109
-            echo use_example_configs delta/kossel_xl
110
-            use_example_configs delta/kossel_xl
111
-            build_marlin_pio ./ ${TEST_PLATFORM}
112
-            restore_configs
113
-            echo use_example_configs Felix
114
-            use_example_configs Felix
115
-            build_marlin_pio ./ ${TEST_PLATFORM}
116
-            restore_configs
117
-            echo use_example_configs Felix/DUAL
118
-            use_example_configs Felix/DUAL
119
-            build_marlin_pio ./ ${TEST_PLATFORM}
120
-            restore_configs
121
-            echo use_example_configs FolgerTech/i3-2020
122
-            use_example_configs FolgerTech/i3-2020
123
-            build_marlin_pio ./ ${TEST_PLATFORM}
124
-            restore_configs
125
-            echo use_example_configs gCreate/gMax1.5+
126
-            use_example_configs gCreate/gMax1.5+
127
-            build_marlin_pio ./ ${TEST_PLATFORM}
128
-            restore_configs
129
-            echo use_example_configs Geeetech/GT2560
130
-            use_example_configs Geeetech/GT2560
131
-            build_marlin_pio ./ ${TEST_PLATFORM}
132
-            restore_configs
133
-            #echo use_example_configs Geeetech/I3_Pro_X-GT2560
134
-            #use_example_configs Geeetech/I3_Pro_X-GT2560
135
-            #build_marlin_pio ./ ${TEST_PLATFORM}
136
-            #restore_configs
137
-            echo use_example_configs Infitary/i3-M508
138
-            use_example_configs Infitary/i3-M508
139
-            build_marlin_pio ./ ${TEST_PLATFORM}
140
-            restore_configs
141
-            use_example_configs Malyan/M200
142
-            build_marlin_pio ./ ${TEST_PLATFORM}
143
-            restore_configs
144
-            echo use_example_configs Micromake/C1/basic
145
-            use_example_configs Micromake/C1/basic
146
-            build_marlin_pio ./ ${TEST_PLATFORM}
147
-            restore_configs
148
-            echo use_example_configs Micromake/C1/enhanced
149
-            use_example_configs Micromake/C1/enhanced
150
-            build_marlin_pio ./ ${TEST_PLATFORM}
151
-            restore_configs
152
-            echo use_example_configs RepRapWorld/Megatronics
153
-            use_example_configs RepRapWorld/Megatronics
154
-            build_marlin_pio ./ ${TEST_PLATFORM}
155
-            restore_configs
156
-            echo use_example_configs RigidBot
157
-            use_example_configs RigidBot
158
-            build_marlin_pio ./ ${TEST_PLATFORM}
159
-            restore_configs
160
-            echo use_example_configs SCARA
161
-            use_example_configs SCARA
162
-            build_marlin_pio ./ ${TEST_PLATFORM}
163
-            restore_configs
164
-            echo use_example_configs Velleman/K8200
165
-            use_example_configs Velleman/K8200
166
-            build_marlin_pio ./ ${TEST_PLATFORM}
167
-            restore_configs
168
-            echo use_example_configs Velleman/K8400/Dual-head
169
-            use_example_configs Velleman/K8400/Dual-head
170
-            build_marlin_pio ./ ${TEST_PLATFORM}
171
-            restore_configs
172
-            echo use_example_configs Velleman/K8400
173
-            use_example_configs Velleman/K8400
174
-            build_marlin_pio ./ ${TEST_PLATFORM}
175
-            restore_configs
176
-            echo use_example_configs Wanhao/Duplicator6
177
-            use_example_configs Wanhao/Duplicator6
178
-            build_marlin_pio ./ ${TEST_PLATFORM}
179
-            restore_configs
180
-            # Requires manual load of https://github.com/stawel/SlowSoftI2CMaster
181
-            #use_example_configs wt150
182
-            #build_marlin_pio ./ ${TEST_PLATFORM}
183
-            #restore_configs
184
-            echo testing melzi targets...
185
-            export TEST_PLATFORM="-e melzi"
186
-            echo use_example_configs Anet/A6
187
-            use_example_configs Anet/A6
188
-            build_marlin_pio ./ ${TEST_PLATFORM}
189
-            restore_configs
190
-            echo use_example_configs Anet/A8
191
-            use_example_configs Anet/A8
192
-            build_marlin_pio ./ ${TEST_PLATFORM}
193
-            restore_configs
194
-            echo use_example_configs Creality/CR-10
195
-            use_example_configs Creality/CR-10
196
-            build_marlin_pio ./ ${TEST_PLATFORM}
197
-            restore_configs
198
-            echo use_example_configs Malyan/M150
199
-            use_example_configs Malyan/M150
200
-            build_marlin_pio ./ ${TEST_PLATFORM}
201
-            restore_configs
202
-            echo use_example_configs Sanguinololu
203
-            use_example_configs Sanguinololu
204
-            build_marlin_pio ./ ${TEST_PLATFORM}
205
-            restore_configs
206
-            echo use_example_configs TinyBoy2
207
-            use_example_configs TinyBoy2
208
-            build_marlin_pio ./ ${TEST_PLATFORM}
209
-            restore_configs
210
-
211
-            echo testing rambo targets...
212
-            export TEST_PLATFORM="-e rambo"
213
-            echo use_example_configs AlephObjects/TAZ4
214
-            use_example_configs AlephObjects/TAZ4
215
-            build_marlin_pio ./ ${TEST_PLATFORM}
216
-            restore_configs
217
-
218
-            echo testing at90usb1286_* targets...
219
-            export TEST_PLATFORM="-e at90usb1286_dfu"
220
-            #echo se_example_configs delta/kossel_pro
221
-            #use_example_configs delta/kossel_pro
222
-            #build_marlin_pio ./ ${TEST_PLATFORM}
223
-            #restore_configs
224
-            echo use_example_configs makibox
225
-            use_example_configs makibox
226
-            build_marlin_pio ./ ${TEST_PLATFORM}
227
-            restore_configs
228
-
229
-            echo testing sanguino_atmega644p targets...
230
-            export TEST_PLATFORM="-e sanguino_atmega644p"
231
-            echo use_example_configs tvrrug/Round2
232
-            use_example_configs tvrrug/Round2
233
-            build_marlin_pio ./ ${TEST_PLATFORM}
234
-            restore_configs
235
-
236
-            echo testing LPC1768 targets...
237
-            export TEST_PLATFORM="-e LPC1768"
238
-            echo use_example_configs Mks/Sbase
239
-            use_example_configs Mks/Sbase
240
-            build_marlin_pio ./ ${TEST_PLATFORM}
241
-            restore_configs
242
-            echo testing STM32F1 targets...
243
-            export TEST_PLATFORM="-e STM32F103RE"
244
-            restore_configs
245
-            echo use_example_configs STM32/STM32F103RE
246
-            use_example_configs STM32/STM32F103RE
247
-            build_marlin_pio ./ ${TEST_PLATFORM}
248
-            restore_configs
249
-            echo use_example_configs STM32/stm32f103ret6
250
-            use_example_configs STM32/stm32f103ret6
251
-            build_marlin_pio ./ ${TEST_PLATFORM}
252
-            restore_configs
253
-
254
-            echo testing DUE targets...
255
-            export TEST_PLATFORM="-e DUE"
256
-            #echo use_example_configs UltiMachine/Archim2
257
-            #use_example_configs UltiMachine/Archim2
258
-            #build_marlin_pio ./ ${TEST_PLATFORM}
259
-            #restore_configs
260
-
261
-            #
262
-            # Remove temp files from dependencies tree prior to caching
263
-            rm -rf ~/Marlin/.piolibdeps/_tmp_*
264
-
265
-            #
266
-            # Restore the environment
267
-            #
268
-            env_restore
269
-
270
-      - save_cache:
271
-          paths:
272
-          - ~/.platformio
273
-          - ~/Marlin/.piolibdeps
274
-          key: v1-dependencies-{{ checksum "~/Marlin/platformio.ini" }}

+ 23
- 15
platformio.ini Wyświetl plik

@@ -217,19 +217,6 @@ lib_deps          = ${common.lib_deps}
217 217
 monitor_speed     = 115200
218 218
 
219 219
 #
220
-# STM32F103RE_base
221
-#
222
-[env:STM32F103RE_base]
223
-extends           = env:STM32F1_base
224
-board             = genericSTM32F103RE
225
-platform_packages = tool-stm32duino
226
-lib_deps          = ${common.lib_deps}
227
-  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
228
-debug_tool        = stlink
229
-upload_protocol   = stlink
230
-monitor_speed     = 115200
231
-
232
-#
233 220
 # STM32F103RC_fysetc
234 221
 #
235 222
 [env:STM32F103RC_fysetc]
@@ -250,8 +237,6 @@ monitor_speed     = 250000
250 237
 #   STM32F103RC_bigtree_USB ......... RCT6 with 256K (USB)
251 238
 #   STM32F103RC_bigtree_512K ........ RCT6 with 512K
252 239
 #   STM32F103RC_bigtree_512K_USB .... RCT6 with 512K (USB)
253
-#   STM32F103RE_bigtree ............. RET6
254
-#   STM32F103RE_bigtree_USB ......... RET6 (USB)
255 240
 #
256 241
 
257 242
 [env:STM32F103RC_bigtree]
@@ -277,11 +262,34 @@ board_upload.maximum_size=524288
277 262
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
278 263
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4 -DSTM32_FLASH_SIZE=512 -DUSE_USB_COMPOSITE
279 264
 
265
+#
266
+# STM32F103RE_base
267
+#
268
+[env:STM32F103RE_base]
269
+extends           = env:STM32F1_base
270
+board             = genericSTM32F103RE
271
+platform_packages = tool-stm32duino
272
+lib_deps          = ${common.lib_deps}
273
+  SoftwareSerialM=https://github.com/FYSETC/SoftwareSerialM/archive/master.zip
274
+monitor_speed     = 115200
275
+
276
+#
277
+# STM32F103RE
278
+#
279
+[env:STM32F103RE]
280
+extends           = env:STM32F103RE_base
281
+
282
+#
283
+#   STM32F103RE_bigtree ............. RET6
284
+#   STM32F103RE_bigtree_USB ......... RET6 (USB)
285
+#
280 286
 [env:STM32F103RE_bigtree]
281 287
 extends           = env:STM32F103RE_base
282 288
 extra_scripts     = buildroot/share/PlatformIO/scripts/STM32F103RE_SKR_E3_DIP.py
283 289
 build_flags       = !python Marlin/src/HAL/HAL_STM32F1/build_flags.py
284 290
   ${common.build_flags} -DDEBUG_LEVEL=0 -std=gnu++14 -DHAVE_SW_SERIAL -DSS_TIMER=4
291
+debug_tool        = stlink
292
+upload_protocol   = stlink
285 293
 
286 294
 [env:STM32F103RE_bigtree_USB]
287 295
 extends           = env:STM32F103RE_bigtree

Ładowanie…
Anuluj
Zapisz