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

MEEB cleanup, whitespace

Followup to #18138
Scott Lahteine 4 лет назад
Родитель
Сommit
c9a260ee12

+ 1
- 0
.github/workflows/test-builds.yml Просмотреть файл

@@ -49,6 +49,7 @@ jobs:
49 49
         - STM32F103RE_btt
50 50
         - STM32F103RE_btt_USB
51 51
         - STM32F103RC_fysetc
52
+        - STM32F103RC_meeb
52 53
         - jgaurora_a5s_a1
53 54
         - STM32F103VE_longer
54 55
         - STM32F407VE_black

+ 1
- 1
Marlin/src/pins/pins.h Просмотреть файл

@@ -535,7 +535,7 @@
535 535
 #elif MB(MKS_ROBIN_E3)
536 536
   #include "stm32f1/pins_MKS_ROBIN_E3.h"        // STM32F1                                env:mks_robin_e3
537 537
 #elif MB(CCROBOT_MEEB_3DP)
538
-  #include "stm32f1/pins_CCROBOT_MEEB_3DP.h"    // STM32F1                                env:STM32F103RC_cc_meeb_3dp
538
+  #include "stm32f1/pins_CCROBOT_MEEB_3DP.h"    // STM32F1                                env:STM32F103RC_meeb
539 539
 
540 540
 //
541 541
 // ARM Cortex-M4F

+ 2
- 4
buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP.py Просмотреть файл

@@ -13,7 +13,7 @@ print(projenv)
13 13
 config = configparser.ConfigParser()
14 14
 config.read("platformio.ini")
15 15
 
16
-#com_port = config.get("env:STM32F103RC_cc_meeb_3dp", "upload_port")
16
+#com_port = config.get("env:STM32F103RC_meeb", "upload_port")
17 17
 #print('Use the {0:s} to reboot the board to dfu mode.'.format(com_port))
18 18
 
19 19
 #
@@ -48,7 +48,7 @@ for define in env['CPPDEFINES']:
48 48
     if define[0] == "STM32_FLASH_SIZE":
49 49
         flash_size = define[1]
50 50
 
51
-print('Use the {0:s} address as the marlin app entry point.'.format(vect_tab_addr))        
51
+print('Use the {0:s} address as the marlin app entry point.'.format(vect_tab_addr))
52 52
 print('Use the {0:d}KB flash version of stm32f103rct6 chip.'.format(flash_size))
53 53
 
54 54
 custom_ld_script = os.path.abspath("buildroot/share/PlatformIO/ldscripts/STM32F103RC_MEEB_3DP.ld")
@@ -57,5 +57,3 @@ for i, flag in enumerate(env["LINKFLAGS"]):
57 57
         env["LINKFLAGS"][i] = "-Wl,-T" + custom_ld_script
58 58
     elif flag == "-T":
59 59
         env["LINKFLAGS"][i + 1] = custom_ld_script
60
-        
61
-        

+ 2
- 2
buildroot/share/PlatformIO/scripts/STM32F103RC_MEEB_3DP_create_variant.py Просмотреть файл

@@ -27,8 +27,8 @@ assert os.path.isdir(source_dir)
27 27
 
28 28
 if os.path.isdir(variant_dir):
29 29
     shutil.rmtree(variant_dir)
30
-    
30
+
31 31
 if not os.path.isdir(variant_dir):
32 32
     os.mkdir(variant_dir)
33 33
 
34
-copytree(source_dir, variant_dir)
34
+copytree(source_dir, variant_dir)

+ 11
- 11
buildroot/share/PlatformIO/variants/MEEB_3DP/board.cpp Просмотреть файл

@@ -73,19 +73,19 @@ void boardInit(void) {
73 73
 
74 74
 extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
75 75
 /*
76
-    gpio_dev *gpio_device;      GPIO device 
76
+    gpio_dev *gpio_device;      GPIO device
77 77
     timer_dev *timer_device;    Pin's timer device, if any.
78
-    const adc_dev *adc_device;  ADC device, if any. 
79
-    uint8 gpio_bit;             Pin's GPIO port bit. 
80
-    uint8 timer_channel;        Timer channel, or 0 if none. 
81
-    uint8 adc_channel;          Pin ADC channel, or ADCx if none. 
78
+    const adc_dev *adc_device;  ADC device, if any.
79
+    uint8 gpio_bit;             Pin's GPIO port bit.
80
+    uint8 timer_channel;        Timer channel, or 0 if none.
81
+    uint8 adc_channel;          Pin ADC channel, or ADCx if none.
82 82
 */
83 83
 
84 84
     {&gpioa, &timer2, &adc1,  0, 1,    0}, /* PA0 */
85 85
     {&gpioa, &timer2, &adc1,  1, 2,    1}, /* PA1 */
86 86
 	{&gpioa, &timer2, &adc1,  2, 3,    2}, /* PA2 */
87 87
     {&gpioa, &timer2, &adc1,  3, 4,    3}, /* PA3 */
88
-	{&gpioa,   NULL, &adc1,  4, 0,    4}, /* PA4 */	
88
+	{&gpioa,   NULL, &adc1,  4, 0,    4}, /* PA4 */
89 89
     {&gpioa,   NULL, &adc1,  5, 0,    5}, /* PA5 */
90 90
     {&gpioa, &timer3, &adc1,  6, 1,    6}, /* PA6 */
91 91
     {&gpioa, &timer3, &adc1,  7, 2,    7}, /* PA7 */
@@ -93,14 +93,14 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
93 93
     {&gpioa, &timer1, NULL,  9, 2, ADCx}, /* PA9 */
94 94
     {&gpioa, &timer1, NULL, 10, 3, ADCx}, /* PA10 */
95 95
     {&gpioa,   NULL, NULL, 11, 0, ADCx}, /* PA11 */
96
-    {&gpioa,   NULL, NULL, 12, 0, ADCx}, /* PA12 */	
96
+    {&gpioa,   NULL, NULL, 12, 0, ADCx}, /* PA12 */
97 97
     {&gpioa,   NULL, NULL, 13, 0, ADCx}, /* PA13 */
98 98
     {&gpioa,   NULL, NULL, 14, 0, ADCx}, /* PA14 */
99 99
     {&gpioa,   NULL, NULL, 15, 0, ADCx}, /* PA15 */
100
-	
100
+
101 101
 	{&gpiob, &timer3, &adc1,  0, 3,    8}, /* PB0 */
102 102
 	{&gpiob, &timer3, &adc1,  1, 4,    9}, /* PB1 */
103
-	{&gpiob,   NULL, NULL,  2, 0, ADCx}, /* PB2  */	
103
+	{&gpiob,   NULL, NULL,  2, 0, ADCx}, /* PB2  */
104 104
 	{&gpiob,   NULL, NULL,  3, 0, ADCx}, /* PB3  */
105 105
     {&gpiob,   NULL, NULL,  4, 0, ADCx}, /* PB4  */
106 106
     {&gpiob,   NULL, NULL,  5, 0, ADCx}, /* PB5 */
@@ -122,13 +122,13 @@ extern const stm32_pin_info PIN_MAP[BOARD_NR_GPIO_PINS] = {
122 122
     {&gpioc,   NULL, &adc1,  3, 0,   13}, /* PC3 */
123 123
     {&gpioc,   NULL, &adc1,  4, 0,   14}, /* PC4 */
124 124
     {&gpioc,   NULL, &adc1,  5, 0,   15}, /* PC5 */
125
-    {&gpioc, &timer8, NULL,  6, 1, ADCx}, /* PC6 */	
125
+    {&gpioc, &timer8, NULL,  6, 1, ADCx}, /* PC6 */
126 126
 	{&gpioc, &timer8, NULL,  7, 2, ADCx}, /* PC7 */
127 127
     {&gpioc, &timer8, NULL,  8, 3, ADCx}, /* PC8 */
128 128
     {&gpioc, &timer8, NULL,  9, 4, ADCx}, /* PC9 */
129 129
     {&gpioc,   NULL, NULL, 10, 0, ADCx}, /* PC10 UART4_TX/SDIO_D2 */
130 130
     {&gpioc,   NULL, NULL, 11, 0, ADCx}, /* PC11 UART4_RX/SDIO_D3 */
131
-    {&gpioc,   NULL, NULL, 12, 0, ADCx}, /* PC12 UART5_TX/SDIO_CK */	
131
+    {&gpioc,   NULL, NULL, 12, 0, ADCx}, /* PC12 UART5_TX/SDIO_CK */
132 132
     {&gpioc,   NULL, NULL, 13, 0, ADCx}, /* PC13 TAMPER-RTC */
133 133
     {&gpioc,   NULL, NULL, 14, 0, ADCx}, /* PC14 OSC32_IN */
134 134
     {&gpioc,   NULL, NULL, 15, 0, ADCx}, /* PC15 OSC32_OUT */

+ 1
- 1
buildroot/share/PlatformIO/variants/MEEB_3DP/ld/stm32f103rb.ld Просмотреть файл

@@ -1,5 +1,5 @@
1 1
 /*
2
- * Linker script for Generic STM32F103RB boards. 
2
+ * Linker script for Generic STM32F103RB boards.
3 3
  */
4 4
 MEMORY
5 5
 {

+ 1
- 1
buildroot/share/PlatformIO/variants/MEEB_3DP/ld/stm32f103rc.ld Просмотреть файл

@@ -1,5 +1,5 @@
1 1
 /*
2
- * Linker script for Generic STM32F103RC boards. 
2
+ * Linker script for Generic STM32F103RC boards.
3 3
  */
4 4
 MEMORY
5 5
 {

+ 1
- 1
buildroot/share/PlatformIO/variants/MEEB_3DP/ld/stm32f103re.ld Просмотреть файл

@@ -1,5 +1,5 @@
1 1
 /*
2
- * Linker script for Generic STM32F103RE boards. 
2
+ * Linker script for Generic STM32F103RE boards.
3 3
  */
4 4
 MEMORY
5 5
 {

+ 7
- 7
buildroot/share/PlatformIO/variants/MEEB_3DP/wirish/boards_setup.cpp Просмотреть файл

@@ -72,8 +72,8 @@ namespace wirish {
72 72
 			#if F_CPU == 72000000
73 73
 			rcc_set_prescaler(RCC_PRESCALER_USB, RCC_USB_SYSCLK_DIV_1_5);
74 74
 			#elif F_CPU == 48000000
75
-			rcc_set_prescaler(RCC_PRESCALER_USB, RCC_USB_SYSCLK_DIV_1);			
76
-			#endif	
75
+			rcc_set_prescaler(RCC_PRESCALER_USB, RCC_USB_SYSCLK_DIV_1);
76
+			#endif
77 77
         }
78 78
 
79 79
         __weak void board_setup_gpio(void) {
@@ -81,16 +81,16 @@ namespace wirish {
81 81
         }
82 82
 
83 83
         __weak void board_setup_usb(void) {
84
-#ifdef SERIAL_USB 
85
-			
86
-#ifdef GENERIC_BOOTLOADER			
84
+#ifdef SERIAL_USB
85
+
86
+#ifdef GENERIC_BOOTLOADER
87 87
 			//Reset the USB interface on generic boards - developed by Victor PV
88 88
 			gpio_set_mode(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit, GPIO_OUTPUT_PP);
89 89
 			gpio_write_bit(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit,0);
90
-			
90
+
91 91
 			for(volatile unsigned int i=0;i<512;i++);// Only small delay seems to be needed, and USB pins will get configured in Serial.begin
92 92
 			gpio_set_mode(PIN_MAP[PA12].gpio_device, PIN_MAP[PA12].gpio_bit, GPIO_INPUT_FLOATING);
93
-#endif	
93
+#endif
94 94
 
95 95
 			Serial.begin();// Roger Clark. Changed SerialUSB to Serial for Arduino sketch compatibility
96 96
 #endif

buildroot/share/tests/STM32F103RC_cc_meeb_3dp-tests → buildroot/share/tests/STM32F103RC_meeb-tests Просмотреть файл


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

@@ -282,7 +282,7 @@ monitor_speed     = 115200
282 282
 #
283 283
 # MEEB_3DP (STM32F103RCT6 with 512K)
284 284
 #
285
-[env:STM32F103RC_cc_meeb_3dp]
285
+[env:STM32F103RC_meeb]
286 286
 platform          = ${common_stm32f1.platform}
287 287
 extends           = common_stm32f1
288 288
 board             = MEEB_3DP

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