Browse Source

Fysetc AIO II / Cheetah STM32F1 (#14407)

Eric Ptak 5 years ago
parent
commit
8934b32f1b

+ 1
- 0
Marlin/src/HAL/HAL_AVR/HAL.h View File

@@ -68,6 +68,7 @@ typedef uint16_t hal_timer_t;
68 68
 
69 69
 typedef int8_t pin_t;
70 70
 
71
+#define SHARED_SERVOS HAS_SERVOS
71 72
 #define HAL_SERVO_LIB Servo
72 73
 
73 74
 // --------------------------------------------------------------------------

+ 1
- 0
Marlin/src/HAL/HAL_DUE/HAL.h View File

@@ -80,6 +80,7 @@
80 80
 
81 81
 typedef int8_t pin_t;
82 82
 
83
+#define SHARED_SERVOS HAS_SERVOS
83 84
 #define HAL_SERVO_LIB Servo
84 85
 
85 86
 //

+ 2
- 0
Marlin/src/HAL/HAL_LINUX/HAL.h View File

@@ -63,6 +63,8 @@ uint8_t _getc();
63 63
 #include "HAL_timers.h"
64 64
 #include "serial.h"
65 65
 
66
+#define SHARED_SERVOS HAS_SERVOS
67
+
66 68
 extern HalSerial usb_serial;
67 69
 #define MYSERIAL0 usb_serial
68 70
 #define NUM_SERIAL 1

+ 0
- 1
Marlin/src/HAL/HAL_STM32/HAL_Servo_STM32.cpp View File

@@ -22,7 +22,6 @@
22 22
  */
23 23
 #if defined(ARDUINO_ARCH_STM32) && !defined(STM32GENERIC)
24 24
 
25
-
26 25
 #include "../../inc/MarlinConfig.h"
27 26
 
28 27
 #if HAS_SERVOS

+ 2
- 14
Marlin/src/HAL/HAL_STM32/HAL_timers_STM32.h View File

@@ -49,7 +49,7 @@
49 49
     #define TEMP_TIMER 17
50 50
   #endif
51 51
 
52
-#elif defined STM32F1xx
52
+#elif defined(STM32F1xx)
53 53
 
54 54
   #define HAL_TIMER_RATE (F_CPU) // frequency of timer peripherals
55 55
 
@@ -61,19 +61,7 @@
61 61
     #define TEMP_TIMER 2
62 62
   #endif
63 63
 
64
-#elif defined STM32F4xx
65
-
66
-  #define HAL_TIMER_RATE (F_CPU/2) // frequency of timer peripherals
67
-
68
-  #ifndef STEP_TIMER
69
-    #define STEP_TIMER 5
70
-  #endif
71
-
72
-  #ifndef TEMP_TIMER
73
-    #define TEMP_TIMER 7
74
-  #endif
75
-
76
-#elif defined STM32F7xx
64
+#elif defined(STM32F4xx) || defined(STM32F7xx)
77 65
 
78 66
   #define HAL_TIMER_RATE (F_CPU/2) // frequency of timer peripherals
79 67
 

+ 3
- 1
Marlin/src/HAL/HAL_STM32F1/HAL_timers_STM32F1.h View File

@@ -55,8 +55,10 @@ typedef uint16_t hal_timer_t;
55 55
 #else
56 56
   #define STEP_TIMER_NUM 5 // for other boards, five is fine.
57 57
 #endif
58
-#define TEMP_TIMER_NUM 2  // index of timer to use for temperature
58
+#define TEMP_TIMER_NUM 2    // index of timer to use for temperature
59
+//#define TEMP_TIMER_NUM 4  // 2->4, Timer 2 for Stepper Current PWM
59 60
 #define PULSE_TIMER_NUM STEP_TIMER_NUM
61
+#define SERVO0_TIMER_NUM 1  // SERVO0 or BLTOUCH
60 62
 
61 63
 #define TEMP_TIMER_PRESCALE     1000 // prescaler for setting Temp timer, 72Khz
62 64
 #define TEMP_TIMER_FREQUENCY    1000 // temperature interrupt frequency

+ 2
- 2
Marlin/src/HAL/shared/servo.cpp View File

@@ -53,7 +53,7 @@
53 53
 
54 54
 #include "../../inc/MarlinConfig.h"
55 55
 
56
-#if HAS_SERVOS && !(IS_32BIT_TEENSY || defined(TARGET_LPC1768) || defined(STM32F1) || defined(STM32F1xx) || defined(STM32F4) || defined(STM32F4xx) || defined(STM32F7xx) || defined(ARDUINO_ARCH_ESP32))
56
+#if SHARED_SERVOS
57 57
 
58 58
 #include "servo.h"
59 59
 #include "servo_private.h"
@@ -157,4 +157,4 @@ void Servo::move(const int value) {
157 157
   }
158 158
 }
159 159
 
160
-#endif // HAS_SERVOS
160
+#endif // SHARED_SERVOS

+ 2
- 0
Marlin/src/core/boards.h View File

@@ -250,6 +250,8 @@
250 250
 #define BOARD_MKS_ROBIN_MINI          1813  // MKS Robin Mini / STM32F103VET6
251 251
 #define BOARD_BIGTREE_SKR_MINI_V1_1   1814  // STM32F103RC
252 252
 #define BOARD_JGAURORA_A5S_A1         1820  // JGAurora A5S A1 / STM32F103ZET6
253
+#define BOARD_FYSETC_AIO_II           1890  // FYSETC AIO_II
254
+#define BOARD_FYSETC_CHEETAH          1891  // FYSETC CHEETAH
253 255
 
254 256
 //
255 257
 // STM32 ARM Cortex-M4F

+ 2
- 2
Marlin/src/lcd/extensible_ui/lib/dgus/DGUSDisplay.cpp View File

@@ -787,7 +787,7 @@ void DGUSDisplay::ProcessRx() {
787 787
   while (dgusserial.available()) {
788 788
     switch (rx_datagram_state) {
789 789
 
790
-      case DGUS_IDLE:	// Waiting for the first header byte
790
+      case DGUS_IDLE: // Waiting for the first header byte
791 791
         receivedbyte = dgusserial.read();
792 792
         //DEBUG_ECHOPAIR("< ",x);
793 793
         if (DGUS_HEADER1 == receivedbyte) rx_datagram_state = DGUS_HEADER1_SEEN;
@@ -842,7 +842,7 @@ void DGUSDisplay::ProcessRx() {
842 842
         if (command == DGUS_CMD_READVAR) {
843 843
           const uint16_t vp = tmp[0] << 8 | tmp[1];
844 844
           const uint8_t dlen = tmp[2] << 1;  // Convert to Bytes. (Display works with words)
845
-          //DEBUG_ECHOPAIR(" vp=", vp);	DEBUG_ECHOPAIR(" dlen=", dlen);
845
+          //DEBUG_ECHOPAIR(" vp=", vp, " dlen=", dlen);
846 846
           DGUS_VP_Variable ramcopy;
847 847
           if (populate_VPVar(vp, &ramcopy)) {
848 848
             if (!(dlen == ramcopy.size || (dlen == 2 && ramcopy.size == 1)))

+ 1
- 0
Marlin/src/module/stepper_indirection.cpp View File

@@ -591,6 +591,7 @@
591 591
     #endif
592 592
 
593 593
     st.GSTAT(0b111); // Clear
594
+    delay(200);
594 595
   }
595 596
 #endif // TMC2209
596 597
 

+ 1
- 1
Marlin/src/module/temperature.cpp View File

@@ -351,7 +351,7 @@ temp_range_t Temperature::temp_range[HOTENDS] = ARRAY_BY_HOTENDS(sensor_heater_0
351 351
     float max = 0, min = 10000;
352 352
 
353 353
     const bool isbed = (heater < 0);
354
-    
354
+
355 355
     #if HAS_PID_FOR_BOTH
356 356
       #define GHV(B,H) (isbed ? (B) : (H))
357 357
       #define SHV(B,H) do{ if (isbed) temp_bed.soft_pwm_amount = B; else temp_hotend[heater].soft_pwm_amount = H; }while(0)

+ 4
- 2
Marlin/src/pins/pins.h View File

@@ -434,6 +434,10 @@
434 434
   #include "pins_MKS_ROBIN_MINI.h"    // STM32F1                                    env:mks_robin_mini
435 435
 #elif MB(JGAURORA_A5S_A1)
436 436
   #include "pins_JGAURORA_A5S_A1.h"   // STM32F1                                    env:JGAURORA_A5S_A1
437
+#elif MB(FYSETC_AIO_II)
438
+  #include "pins_FYSETC_AIO_II.h"     // STM32F1                                    env:fysetc_STM32F1
439
+#elif MB(FYSETC_CHEETAH)
440
+  #include "pins_FYSETC_CHEETAH.h"    // STM32F1                                    env:fysetc_STM32F1
437 441
 
438 442
 //
439 443
 // STM32 ARM Cortex-M4F
@@ -456,8 +460,6 @@
456 460
 #elif MB(STEVAL)
457 461
   #include "pins_STEVAL.h"            // STM32F4                                    env:STM32F4
458 462
 
459
-
460
-
461 463
 //
462 464
 // ARM Cortex M7
463 465
 //

+ 178
- 0
Marlin/src/pins/pins_FYSETC_AIO_II.h View File

@@ -0,0 +1,178 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+#ifndef __STM32F1__
24
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
25
+#endif
26
+
27
+#define BOARD_NAME        "FYSETC AIO II"
28
+#define BOARD_WEBSITE_URL "https://fysetc.com"
29
+
30
+#define pins_v2_20190128   // geo-f:add for new pins define
31
+
32
+// Ignore temp readings during develpment.
33
+#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
34
+
35
+//
36
+// Limit Switches
37
+//
38
+#define X_STOP_PIN         PA1
39
+#define Y_STOP_PIN         PA0
40
+#define Z_STOP_PIN         PB14
41
+
42
+//
43
+// Filament runout
44
+//
45
+#ifdef pins_v2_20190128
46
+  #define FIL_RUNOUT_PIN   PB15
47
+#else
48
+  #define FIL_RUNOUT_PIN   PB5
49
+#endif
50
+
51
+//
52
+// Steppers
53
+//
54
+#define X_STEP_PIN         PB8
55
+#define X_DIR_PIN          PB9
56
+#define X_ENABLE_PIN       PA8
57
+
58
+#define Y_STEP_PIN         PB2
59
+#ifdef pins_v2_20190128
60
+  #define Y_DIR_PIN        PB3
61
+#else
62
+  #define Y_DIR_PIN        PB0
63
+#endif
64
+#define Y_ENABLE_PIN       PB1
65
+
66
+#define Z_STEP_PIN         PC0
67
+#define Z_DIR_PIN          PC1
68
+#define Z_ENABLE_PIN       PC2
69
+
70
+#define E0_STEP_PIN        PC15
71
+#define E0_DIR_PIN         PC14
72
+#define E0_ENABLE_PIN      PC13
73
+
74
+//
75
+// Stepper current PWM
76
+//
77
+
78
+// X:PA2 Y:PA3 Z:PB12 E:PB13 // changed for test
79
+#define MOTOR_CURRENT_PWM_XY_PIN PA3
80
+#define MOTOR_CURRENT_PWM_Z_PIN  PA2 // PB12
81
+//#define MOTOR_CURRENT_PWM_XY_PIN PB6
82
+//#define MOTOR_CURRENT_PWM_Z_PIN  PB7 // PB12
83
+#define MOTOR_CURRENT_PWM_E_PIN  -1  // PB13
84
+// Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
85
+#ifndef MOTOR_CURRENT_PWM_RANGE
86
+  #define MOTOR_CURRENT_PWM_RANGE 1500 // geo-f:old 2000
87
+#endif
88
+#define DEFAULT_PWM_MOTOR_CURRENT  {500, 500, 400} // geo-f:old 1300 1300 1250
89
+
90
+// 采用 SDIO PCB从左到右数
91
+// 1:PC10 - SDIO_D2
92
+// 2:PC11 - SDIO_D3
93
+// 3:PD2 - SDIO_CMD
94
+// 4:VCC
95
+// 5:PC12 - SDIO_CK
96
+// 6:VDD
97
+// 7:PC8 - SDIO_D0
98
+// 8:PC9 - SDIO_D1
99
+// 9:PA15 - SD_DETECT_PIN
100
+
101
+//
102
+// Heaters / Fans
103
+//
104
+#define HEATER_0_PIN       PC7
105
+#define HEATER_BED_PIN     PC6
106
+#ifndef FAN_PIN
107
+  #define FAN_PIN          PC8
108
+#endif
109
+
110
+//
111
+// Temperature Sensors
112
+//
113
+#define TEMP_BED_PIN       PC5   // Analog Input
114
+#define TEMP_0_PIN         PC4   // Analog Input
115
+
116
+//
117
+// Misc. Functions
118
+//
119
+#define SDSS               PA4
120
+
121
+//
122
+// LCD Pins
123
+//
124
+#if ENABLED(ULTRA_LCD)
125
+
126
+  #define BEEPER_PIN       PC9
127
+
128
+  #if HAS_GRAPHICAL_LCD
129
+
130
+    #define DOGLCD_A0      PA15
131
+    #ifdef pins_v2_20190128
132
+      #define DOGLCD_CS    PB5
133
+    #else
134
+      #define DOGLCD_CS    PB7
135
+    #endif
136
+
137
+    //#define LCD_CONTRAST 190
138
+    //#define LCD_SCREEN_ROT_90
139
+    //#define LCD_SCREEN_ROT_180
140
+    //#define LCD_SCREEN_ROT_270
141
+
142
+  #endif
143
+
144
+  // not connected to a pin
145
+  #define SD_DETECT_PIN    PC3
146
+
147
+  #if ENABLED(NEWPANEL)
148
+    // The encoder and click button
149
+    #define BTN_EN1        PC10
150
+    #define BTN_EN2        PC11
151
+    #define BTN_ENC        PC12
152
+  #endif
153
+
154
+  #ifdef pins_v2_20190128
155
+    #define LCD_RESET_PIN  PB4
156
+    #ifndef RGB_LED_R_PIN
157
+      #define RGB_LED_R_PIN PB0
158
+    #endif
159
+    #ifndef RGB_LED_G_PIN
160
+      #define RGB_LED_G_PIN PB6
161
+    #endif
162
+    #ifndef RGB_LED_B_PIN
163
+      #define RGB_LED_B_PIN PB7
164
+    #endif
165
+  #else
166
+    #define LCD_RESET_PIN  PB6
167
+    #ifndef RGB_LED_R_PIN
168
+      #define RGB_LED_R_PIN PB3
169
+    #endif
170
+    #ifndef RGB_LED_G_PIN
171
+      #define RGB_LED_G_PIN PB4
172
+    #endif
173
+    #ifndef RGB_LED_B_PIN
174
+      #define RGB_LED_B_PIN PB5
175
+    #endif
176
+  #endif
177
+
178
+#endif

+ 142
- 0
Marlin/src/pins/pins_FYSETC_CHEETAH.h View File

@@ -0,0 +1,142 @@
1
+/**
2
+ * Marlin 3D Printer Firmware
3
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
4
+ *
5
+ * Based on Sprinter and grbl.
6
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
7
+ *
8
+ * This program is free software: you can redistribute it and/or modify
9
+ * it under the terms of the GNU General Public License as published by
10
+ * the Free Software Foundation, either version 3 of the License, or
11
+ * (at your option) any later version.
12
+ *
13
+ * This program is distributed in the hope that it will be useful,
14
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
15
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
16
+ * GNU General Public License for more details.
17
+ *
18
+ * You should have received a copy of the GNU General Public License
19
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
20
+ *
21
+ */
22
+
23
+#ifndef __STM32F1__
24
+  #error "Oops! Select an STM32F1 board in 'Tools > Board.'"
25
+#endif
26
+
27
+#define DEFAULT_MACHINE_NAME "3D Printer"
28
+
29
+#define BOARD_NAME "FYSETC CHEETAH"
30
+#define BOARD_WEBSITE_URL "https://fysetc.com"
31
+
32
+// Ignore temp readings during develpment.
33
+#define BOGUS_TEMPERATURE_FAILSAFE_OVERRIDE
34
+
35
+//
36
+// Servos
37
+//
38
+#define SERVO0_PIN         PA0
39
+
40
+//
41
+// Limit Switches
42
+//
43
+#define X_STOP_PIN         PA1
44
+#define Y_STOP_PIN         PB4
45
+#define Z_STOP_PIN         PA15
46
+
47
+//
48
+// Filament runout
49
+//
50
+#define FIL_RUNOUT_PIN     PB5
51
+
52
+//
53
+// Steppers
54
+//
55
+#define X_STEP_PIN         PB8
56
+#define X_DIR_PIN          PB9
57
+#define X_ENABLE_PIN       PA8
58
+
59
+#define Y_STEP_PIN         PB2
60
+#define Y_DIR_PIN          PB3
61
+#define Y_ENABLE_PIN       PB1
62
+
63
+#define Z_STEP_PIN         PC0
64
+#define Z_DIR_PIN          PC1
65
+#define Z_ENABLE_PIN       PC2
66
+
67
+#define E0_STEP_PIN        PC15
68
+#define E0_DIR_PIN         PC14
69
+#define E0_ENABLE_PIN      PC13
70
+
71
+#define X_HARDWARE_SERIAL  MSerial2   // Port correct?
72
+#define Y_HARDWARE_SERIAL  MSerial2
73
+#define Z_HARDWARE_SERIAL  MSerial2
74
+#define E0_HARDWARE_SERIAL MSerial2
75
+
76
+//
77
+// Heaters / Fans
78
+//
79
+#define HEATER_0_PIN       PC6
80
+#define HEATER_BED_PIN     PC7
81
+#ifndef FAN_PIN
82
+  #define FAN_PIN          PC8
83
+#endif
84
+
85
+//
86
+// Temperature Sensors
87
+//
88
+#define TEMP_BED_PIN       PC5   // Analog Input
89
+#define TEMP_0_PIN         PC4   // Analog Input
90
+
91
+//
92
+// Misc. Functions
93
+//
94
+#define SDSS               PA4
95
+
96
+//
97
+// LCD Pins
98
+//
99
+#if ENABLED(ULTRA_LCD)
100
+
101
+  #define BEEPER_PIN       PC9
102
+
103
+  #if HAS_GRAPHICAL_LCD
104
+    #define DOGLCD_A0      PB14
105
+    #define DOGLCD_CS      PB12
106
+    #define DOGLCD_SCK     PB13
107
+    #define DOGLCD_MOSI    PB15
108
+    //#define LCD_SCREEN_ROT_90
109
+    //#define LCD_SCREEN_ROT_180
110
+    //#define LCD_SCREEN_ROT_270
111
+
112
+    #if ENABLED(FYSETC_MINI_12864) || ENABLED(U8GLIB_ST7920)
113
+      #define FORCE_SOFT_SPI
114
+    #endif
115
+  #endif
116
+
117
+  #define LCD_PINS_RS      PB12   // CS -- SOFT SPI for ENDER3 LCD
118
+  #define LCD_PINS_D4      PB13   // SCLK
119
+  #define LCD_PINS_ENABLE  PB15   // DATA MOSI
120
+
121
+  // not connected to a pin
122
+  #define SD_DETECT_PIN    PC3
123
+
124
+  #ifndef RGB_LED_R_PIN
125
+    #define RGB_LED_R_PIN  PB0
126
+  #endif
127
+  #ifndef RGB_LED_G_PIN
128
+    #define RGB_LED_G_PIN  PB7
129
+  #endif
130
+  #ifndef RGB_LED_B_PIN
131
+    #define RGB_LED_B_PIN  PB6
132
+  #endif
133
+
134
+  //#define LCD_CONTRAST   190
135
+
136
+  #if ENABLED(NEWPANEL)
137
+    #define BTN_EN1        PC11
138
+    #define BTN_EN2        PC10
139
+    #define BTN_ENC        PC12
140
+  #endif
141
+
142
+#endif

+ 7
- 6
Marlin/src/pins/pins_FYSETC_F6_13.h View File

@@ -118,17 +118,18 @@
118 118
 
119 119
 #if HAS_DRIVER(TMC2208) || HAS_DRIVER(TMC2209)
120 120
   // Software serial
121
-  #define X_SERIAL_RX_PIN  71
121
+  // At the moment, F6 rx pins are not pc interrupt pins
122
+  #define X_SERIAL_RX_PIN  -1   // 71
122 123
   #define X_SERIAL_TX_PIN  72
123
-  #define Y_SERIAL_RX_PIN  73
124
+  #define Y_SERIAL_RX_PIN  -1   // 73
124 125
   #define Y_SERIAL_TX_PIN  75
125
-  #define Z_SERIAL_RX_PIN  78
126
+  #define Z_SERIAL_RX_PIN  -1   // 78
126 127
   #define Z_SERIAL_TX_PIN  79
127
-  #define E0_SERIAL_RX_PIN 76
128
+  #define E0_SERIAL_RX_PIN -1   // 76
128 129
   #define E0_SERIAL_TX_PIN 77
129
-  #define E1_SERIAL_RX_PIN 80
130
+  #define E1_SERIAL_RX_PIN -1   // 80
130 131
   #define E1_SERIAL_TX_PIN 81
131
-  #define E2_SERIAL_RX_PIN 22
132
+  #define E2_SERIAL_RX_PIN -1   // 22
132 133
   #define E2_SERIAL_TX_PIN 82
133 134
 #endif
134 135
 

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

@@ -47,7 +47,7 @@
47 47
 // Enable EEPROM Emulation for this board
48 48
 
49 49
 //#define FLASH_EEPROM_EMULATION 1
50
-//#define E2END  0xFFF //((uint32)(EEPROM_START_ADDRESS + EEPROM_PAGE_SIZE + EEPROM_PAGE_SIZE)) // 	 not 0xFFF
50
+//#define E2END  0xFFF //((uint32)(EEPROM_START_ADDRESS + EEPROM_PAGE_SIZE + EEPROM_PAGE_SIZE)) // not 0xFFF
51 51
 //#define EEPROM_CHITCHAT
52 52
 //#define DEBUG_EEPROM_READWRITE
53 53
 

+ 18
- 0
buildroot/share/PlatformIO/ldscripts/fysetc_aio_ii.ld View File

@@ -0,0 +1,18 @@
1
+/*
2
+ * Linker script for Generic STM32F103RC boards, using the generic bootloader (which takes the lower 8k of memory)
3
+ */
4
+
5
+MEMORY
6
+{
7
+	ram (rwx) : ORIGIN = 0x20000000, LENGTH = 48K
8
+	rom (rx)  : ORIGIN = 0x08010000, LENGTH = 256K-40K
9
+}
10
+
11
+/* Provide memory region aliases for common.inc */
12
+REGION_ALIAS("REGION_TEXT", rom);
13
+REGION_ALIAS("REGION_DATA", ram);
14
+REGION_ALIAS("REGION_BSS", ram);
15
+REGION_ALIAS("REGION_RODATA", rom);
16
+
17
+/* Let common.inc handle the real work. */
18
+INCLUDE common.inc

+ 40
- 0
buildroot/share/PlatformIO/scripts/fysetc_STM32F1.py View File

@@ -0,0 +1,40 @@
1
+from os.path import join
2
+Import("env", "projenv")
3
+
4
+# Relocate firmware from 0x08000000 to 0x08002000
5
+#env['CPPDEFINES'].remove(("VECT_TAB_ADDR", 134217728))
6
+#env['CPPDEFINES'].append(("VECT_TAB_ADDR", "0x08010000"))
7
+#env.Replace(LDSCRIPT_PATH="buildroot/share/PlatformIO/ldscripts/fysetc_aio_ii.ld")
8
+
9
+# Custom HEX from ELF
10
+env.AddPostAction(
11
+	"$BUILD_DIR/${PROGNAME}.elf",
12
+	env.VerboseAction(" ".join([
13
+				"$OBJCOPY",
14
+				"-O",
15
+				"ihex",
16
+				"$BUILD_DIR/${PROGNAME}.elf",
17
+				"$BUILD_DIR/${PROGNAME}.hex"
18
+			]), "Building $TARGET"))
19
+
20
+# please keep $SOURCE variable, it will be replaced with a path to firmware
21
+
22
+# Generic
23
+#env.Replace(
24
+#	UPLOADER="serial_upload.bat"
25
+#	UPLOADCMD="$UPLOADER stm32loader.py $SOURCE"
26
+#)
27
+
28
+# In-line command with arguments
29
+#env.Replace(
30
+#    UPLOADCMD="executable -arg1 -arg2 $SOURCE"
31
+#)
32
+
33
+# Python callback
34
+#def on_upload(source, target, env):
35
+#    print source, target
36
+#    firmware_path = str(source[0])
37
+#    # do something
38
+#    env.Execute(".\serial_upload.bat")
39
+
40
+#env.Replace(UPLOADCMD=on_upload)

+ 4
- 4
config/examples/FlashForge/CreatorPro/CuraSettings.txt View File

@@ -17,7 +17,7 @@ X (Width) 227
17 17
 Y (Depth) 148
18 18
 Z (Heigth) 150
19 19
 
20
-Extruder 1 - 
20
+Extruder 1 -
21 21
     Nozzle size: 0.4
22 22
     Compatible material diameter: 1.75
23 23
     Nozzle offset X: 0
@@ -55,7 +55,7 @@ X (Width) 227
55 55
 Y (Depth) 148
56 56
 Z (Heigth) 150
57 57
 
58
-Extruder 1 - 
58
+Extruder 1 -
59 59
     Nozzle size: 0.4
60 60
     Compatible material diameter: 1.75
61 61
     Nozzle offset X: -34
@@ -95,7 +95,7 @@ X (Width) 295 <---- bed width + 2 x nozzle offset
95 95
 Y (Depth) 148
96 96
 Z (Heigth) 150
97 97
 
98
-Extruder 1 - 
98
+Extruder 1 -
99 99
     Nozzle size: 0.4
100 100
     Compatible material diameter: 1.75
101 101
     Nozzle offset X: 0
@@ -105,7 +105,7 @@ Extruder 1 -
105 105
     G1 X150 Y70 F9000;move away from print in case extrusion cool down speed modifier too low
106 106
     ;Extruder End G-code;
107 107
 
108
-Extruder 2 - 
108
+Extruder 2 -
109 109
     Nozzle size: 0.4
110 110
     Compatible material diameter: 1.75
111 111
     Nozzle offset X: -34

+ 2153
- 0
config/examples/Fysetc/AIO_II/Configuration.h
File diff suppressed because it is too large
View File


+ 2537
- 0
config/examples/Fysetc/AIO_II/Configuration_adv.h
File diff suppressed because it is too large
View File


+ 2153
- 0
config/examples/Fysetc/CHEETAH/Configuration.h
File diff suppressed because it is too large
View File


+ 2537
- 0
config/examples/Fysetc/CHEETAH/Configuration_adv.h
File diff suppressed because it is too large
View File


+ 2159
- 0
config/examples/Fysetc/F6_13/Configuration.h
File diff suppressed because it is too large
View File


+ 2537
- 0
config/examples/Fysetc/F6_13/Configuration_adv.h
File diff suppressed because it is too large
View File


+ 26
- 0
platformio.ini View File

@@ -275,6 +275,32 @@ src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
275 275
 monitor_speed = 250000
276 276
 
277 277
 #
278
+# fysetc_STM32F1
279
+#
280
+[env:fysetc_STM32F1]
281
+platform      = ststm32
282
+framework     = arduino
283
+board         = genericSTM32F103RC
284
+#board_build.core = maple
285
+extra_scripts = buildroot/share/PlatformIO/scripts/fysetc_STM32F1.py
286
+build_flags   = !python Marlin/src/HAL/HAL_STM32F1/STM32F1_flag_script.py
287
+  ${common.build_flags}
288
+lib_deps      = ${common.lib_deps}
289
+lib_ignore    =
290
+  c1921b4
291
+  libf3c
292
+  lib066
293
+  Adafruit NeoPixel_ID28
294
+  Adafruit NeoPixel
295
+  libf3e
296
+  TMC26XStepper
297
+lib_ldf_mode  = 1
298
+src_filter    = ${common.default_src_filter} +<src/HAL/HAL_STM32F1>
299
+monitor_speed = 250000
300
+debug_tool    = stlink
301
+upload_protocol = serial
302
+
303
+#
278 304
 # BIGTREE_SKR_MINI
279 305
 #
280 306
 [env:BIGTREE_SKR_MINI]

Loading…
Cancel
Save