Bladeren bron

Add STM32F103RE_bigtree to Auto Build

Scott Lahteine 5 jaren geleden
bovenliggende
commit
8f09d2e790
3 gewijzigde bestanden met toevoegingen van 13 en 12 verwijderingen
  1. 1
    1
      Marlin/src/core/boards.h
  2. 1
    1
      Marlin/src/pins/pins.h
  3. 11
    10
      buildroot/share/atom/auto_build.py

+ 1
- 1
Marlin/src/core/boards.h Bestand weergeven

@@ -272,7 +272,7 @@
272 272
 #define BOARD_BIGTREE_SKR_MINI_V1_1   4010  // BigTreeTech SKR Mini v1.1 (STM32F103RC)
273 273
 #define BOARD_BTT_SKR_MINI_E3_V1_0    4011  // BigTreeTech SKR Mini E3 (STM32F103RC)
274 274
 #define BOARD_BTT_SKR_MINI_E3_V1_2    4012  // BigTreeTech SKR Mini E3 V1.2 (STM32F103RC)
275
-#define BOARD_BIGTREE_SKR_E3_DIP      4013  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC)
275
+#define BOARD_BIGTREE_SKR_E3_DIP      4013  // BigTreeTech SKR E3 DIP V1.0 (STM32F103RC / STM32F103RE)
276 276
 #define BOARD_JGAURORA_A5S_A1         4014  // JGAurora A5S A1 (STM32F103ZET6)
277 277
 #define BOARD_FYSETC_AIO_II           4015  // FYSETC AIO_II
278 278
 #define BOARD_FYSETC_CHEETAH          4016  // FYSETC Cheetah

+ 1
- 1
Marlin/src/pins/pins.h Bestand weergeven

@@ -476,7 +476,7 @@
476 476
 #elif MB(BTT_SKR_MINI_E3_V1_2)
477 477
   #include "stm32/pins_BTT_SKR_MINI_E3_V1_2.h"  // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
478 478
 #elif MB(BIGTREE_SKR_E3_DIP)
479
-  #include "stm32/pins_BTT_SKR_E3_DIP.h"        // STM32F1                                env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB env:STM32F103RE_bigtree
479
+  #include "stm32/pins_BTT_SKR_E3_DIP.h"        // STM32F1                                env:STM32F103RE_bigtree env:STM32F103RE_bigtree_NOUSB env:STM32F103RC_bigtree env:STM32F103RC_bigtree_512K env:STM32F103RC_bigtree_NOUSB env:STM32F103RC_bigtree_512K_NOUSB
480 480
 #elif MB(JGAURORA_A5S_A1)
481 481
   #include "stm32/pins_JGAURORA_A5S_A1.h"       // STM32F1                                env:jgaurora_a5s_a1
482 482
 #elif MB(FYSETC_AIO_II)

+ 11
- 10
buildroot/share/atom/auto_build.py Bestand weergeven

@@ -24,7 +24,7 @@
24 24
 
25 25
 #######################################
26 26
 #
27
-# Revision: 2.0.1
27
+# Revision: 2.1.0
28 28
 #
29 29
 # Description: script to automate PlatformIO builds
30 30
 # CLI:  python auto_build.py build_option
@@ -599,12 +599,16 @@ def get_env(board_name, ver_Marlin):
599 599
           target_env = 'DUE_USB'
600 600
         else:
601 601
           target_env = 'DUE'
602
-    elif env_A == 'STM32F103RC_bigtree':
603
-      get_answer(board_name, 'RCT6 Flash Size?', '512K', '256K')
604
-      if 1 == get_answer_val:
605
-        target_env = 'STM32F103RC_bigtree_512K'
606
-      else:
607
-        target_env = 'STM32F103RC_bigtree'
602
+    elif env_A == 'STM32F103RC_bigtree' or env_A == 'STM32F103RE_bigtree':
603
+      if env_A == 'STM32F103RE_bigtree':
604
+        get_answer(board_name, 'MCU Type?', 'STM32F103RC', 'STM32F103RE')
605
+        if 1 == get_answer_val:
606
+          env_A = 'STM32F103RC_bigtree'
607
+      target_env = env_A
608
+      if env_A == 'STM32F103RC_bigtree':
609
+        get_answer(board_name, 'RCT6 Flash Size?', '512K', '256K')
610
+        if 1 == get_answer_val:
611
+          target_env += '_512K'
608 612
       get_answer(board_name, 'USB Support?', 'No USB', 'USB')
609 613
       if 1 == get_answer_val:
610 614
         target_env += '_NOUSB'
@@ -1203,7 +1207,6 @@ class output_window(Text):
1203 1207
       pass
1204 1208
 
1205 1209
   def cut(self, event):
1206
-
1207 1210
     try:
1208 1211
       selection = self.get(*self.tag_ranges('sel'))
1209 1212
       self.clipboard_clear()
@@ -1224,7 +1227,6 @@ class output_window(Text):
1224 1227
       self.popup.grab_release()
1225 1228
 
1226 1229
   def _cut(self):
1227
-
1228 1230
     try:
1229 1231
       selection = self.get(*self.tag_ranges('sel'))
1230 1232
       self.clipboard_clear()
@@ -1249,7 +1251,6 @@ class output_window(Text):
1249 1251
     self._copy()
1250 1252
 
1251 1253
   def _paste(self):
1252
-
1253 1254
     self.insert('insert', self.selection_get(selection='CLIPBOARD'))
1254 1255
 
1255 1256
   def _select_all(self):

Laden…
Annuleren
Opslaan