Removed useless entries in boards.txt

darkhedie · darkhedie · commit d76356a64b9b · 2018-08-16T08:18:18.000+02:00
Corrected pin-definition in variant.cpp and variant.h
diff --git a/boards.txt b/boards.txt
@@ -440,8 +440,8 @@ Disco.menu.upload_method.STLink.upload.tool=stlink_upload
 # Other boards
 
 ###############################
-# Generic F030
-GenF030.name=Generic STM32F030 series
+# Generic F030K6 Chip
+GenF030.name=Generic STM32F030K6 Chip
 
 GenF030.build.vid=0x1EAF
 GenF030.build.pid=0x0004
@@ -452,10 +452,9 @@ GenF030.build.core=arduino
 GenF030.build.board=GenF030
 GenF030.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial}
 
-# Generic F030 board
+# Generic F030K6 Chip
 # Support: Serial1 (USART1 on PA10, PA9)
-GenF030.menu.pnum.GENERIC_F030K6=Generic F030K6
-GenF030.menu.pnum.GENERIC_F030K6.node="No_mass_storage_for_this_board_Use_STLink_upload_method"
+GenF030.menu.pnum.GENERIC_F030K6=Generic F030K6 Chip
 GenF030.menu.pnum.GENERIC_F030K6.upload.maximum_data_size=4096
 GenF030.menu.pnum.GENERIC_F030K6.build.mcu=cortex-m0
 GenF030.menu.pnum.GENERIC_F030K6.build.board=GENERIC_F030K6
@@ -753,9 +752,6 @@ GenF103.menu.opt.ogstd=Debug (-g)
 GenF103.menu.opt.ogstd.build.flags.optimize=-g -Og
 GenF103.menu.opt.ogstd.build.flags.ldspecs=
 
-GenF030.menu.opt.osstd=Smallest (-Os default)
-GenF030.menu.opt.osstd.build.flags.optimize=-Os
-GenF030.menu.opt.osstd.build.flags.ldspecs=
 GenF030.menu.opt.oslto=Smallest (-Os) with LTO
 GenF030.menu.opt.oslto.build.flags.optimize=-Os -flto
 GenF030.menu.opt.oslto.build.flags.ldspecs=-flto
diff --git a/variants/GENERIC_F030K6/variant.cpp b/variants/GENERIC_F030K6/variant.cpp
@@ -36,80 +36,43 @@ extern "C" {
 
 // Pin number
 const PinName digitalPin[] = {
- //P1 connector Right side (bottom view)
-  PC_13, //D0
-  PC_14, //D1
-  PC_15, //D2
-  PF_0,  //D3
-  PF_1,  //D4
-  PC_0,  //D5
-  PC_1,  //D6
-  PC_2,  //D7
-  PC_3,  //D8
-  PA_0,  //D9 - USER_BTN
-  PA_1,  //D10
-  PA_2,  //D11
-  PA_3,  //D12
-  PF_4,  //D13
-  PF_5,  //D14
-  PA_4,  //D15
-  PA_5,  //D16
-  PA_6,  //D17
-  PA_7,  //D18
-  PC_4,  //D19
-  PC_5,  //D20
-  PB_0,  //D21
-  PB_1,  //D22
-  PB_2,  //D23
-  PB_10, //D24
-  PB_11, //D25
-  PB_12, //D26
-  //P2 connector Left side (bottom view)
-  PB_9,  //D27
-  PB_8,  //D28
-  PB_7,  //D29
-  PB_6,  //D30
-  PB_5,  //D31
-  PB_4,  //D32
-  PB_3,  //D33
-  PD_2,  //D34
-  PC_12, //D35
-  PC_11, //D36
-  PC_10, //D37
-  PA_15, //D38
-  PA_14, //D39
-  PF_7,  //D40
-  PF_6,  //D41
-  PA_13, //D42
-  PA_12, //D43
-  PA_11, //D44
-  PA_10, //D45
-  PA_9,  //D46
-  PA_8,  //D47
-  PC_9,  //D48 - LED_GREEN (LD3)
-  PC_8,  //D49 - LED_BLUE (LD4)
-  PC_7,  //D50
-  PC_6,  //D51
-  PB_15, //D52
-  PB_14, //D53
-  PB_13, //D54
+  PA_0,  //D0
+  PA_1,  //D1
+  PA_2,  //D2
+  PA_3,  //D3
+  PA_4,  //D4
+  PA_5,  //D5
+  PA_6,  //D6
+  PA_7,  //D7
+  PA_8,  //D8
+  PA_9,  //D9
+  PA_10, //D10
+  PA_11, //D11
+  PA_12, //D12
+  PA_13, //D13
+  PA_14, //D14
+  PA_15, //D15
+  PB_0,  //D16
+  PB_1,  //D17
+  PB_2,  //D18
+  PB_3,  //D19
+  PB_4,  //D20
+  PB_5,  //D21
+  PB_6,  //D22
+  PB_7,  //D23
+  PF_0,  //D24
+  PF_1,  //D25
   // Duplicated pins in order to be aligned with PinMap_ADC
-  PC_0,  //D55/A0 = D5
-  PC_1,  //D56/A1 = D6
-  PC_2,  //D57/A2 = D7
-  PC_3,  //D58/A3 = D8
-  PA_0,  //D59/A4 = D9
-  PA_1,  //D60/A5 = D10
-  PA_2,  //D61/A6 = D11
-  PA_3,  //D62/A7 = D12
-  PA_4,  //D63/A8 = D15
-  PA_5,  //D64/A9 = D16
-  PA_6,  //D65/A10= D17
-  PA_7,  //D66/A11= D18
-  PC_4,  //D67/A12 = D19
-  PC_5,  //D68/A13 = D20
-  PB_0,  //D69/A14 = D21
-  PB_1   //D70/A15 = D22
+  PA_0,  //D26/A0 = D0
+  PA_1,  //D27/A1 = D1
+  PA_2,  //D28/A2 = D2
+  PA_3,  //D29/A3 = D3
+  PA_4,  //D30/A4 = D4
+  PA_5,  //D31/A5 = D5
+  PA_6,  //D32/A6 = D6
+  PA_7,  //D33/A7 = D7
+  PB_0,  //D34/A8 = D16
+  PB_1,  //D35/A9 = D17
 };
 
 #ifdef __cplusplus
diff --git a/variants/GENERIC_F030K6/variant.h b/variants/GENERIC_F030K6/variant.h
@@ -47,109 +47,69 @@ extern "C"{
 extern const PinName digitalPin[];
 
 enum {
-  //P1 connector Right side (bottom view)
-  PC13, //D0
-  PC14, //D1
-  PC15, //D2
-  PF0,  //D3
-  PF1,  //D4
-  PC0,  //D5
-  PC1,  //D6
-  PC2,  //D7
-  PC3,  //D8
-  PA0,  //D9 - USER_BTN
-  PA1,  //D10
-  PA2,  //D11
-  PA3,  //D12
-  PF4,  //D13
-  PF5,  //D14
-  PA4,  //D15
-  PA5,  //D16
-  PA6,  //D17
-  PA7,  //D18
-  PC4,  //D19
-  PC5,  //D20
-  PB0,  //D21
-  PB1,  //D22
-  PB2,  //D23
-  PB10, //D24
-  PB11, //D25
-  PB12, //D26
-  //P2 connector Left side (bottom view)
-  PB9,  //D27
-  PB8,  //D28
-  PB7,  //D29
-  PB6,  //D30
-  PB5,  //D31
-  PB4,  //D32
-  PB3,  //D33
-  PD2,  //D34
-  PC12, //D35
-  PC11, //D36
-  PC10, //D37
-  PA15, //D38
-  PA14, //D39
-  PF7,  //D40
-  PF6,  //D41
-  PA13, //D42
-  PA12, //D43
-  PA11, //D44
-  PA10, //D45
-  PA9,  //D46
-  PA8,  //D47
-  PC9,  //D48 - LED_GREEN (LD3)
-  PC8,  //D49 - LED_BLUE (LD4)
-  PC7,  //D50
-  PC6,  //D51
-  PB15, //D52
-  PB14, //D53
-  PB13, //D54
+  PA_0,  //D0
+  PA_1,  //D1
+  PA_2,  //D2
+  PA_3,  //D3
+  PA_4,  //D4
+  PA_5,  //D5
+  PA_6,  //D6
+  PA_7,  //D7
+  PA_8,  //D8
+  PA_9,  //D9
+  PA_10, //D10
+  PA_11, //D11
+  PA_12, //D12
+  PA_13, //D13
+  PA_14, //D14
+  PA_15, //D15
+  PB_0,  //D16
+  PB_1,  //D17
+  PB_2,  //D18
+  PB_3,  //D19
+  PB_4,  //D20
+  PB_5,  //D21
+  PB_6,  //D22
+  PB_7,  //D23
+  PF_0,  //D24
+  PF_1,  //D25
   // Duplicated pins in order to be aligned with PinMap_ADC
-  PC_0_A, //D55/A0 = D5
-  PC_1_A, //D56/A1 = D6
-  PC_2_A, //D57/A2 = D7
-  PC_3_A, //D58/A3 = D8
-  PA_0_A, //D59/A4 = D9
-  PA_1_A, //D60/A5 = D10
-  PA_2_A, //D61/A6 = D11
-  PA_3_A, //D62/A7 = D12
-  PA_4_A, //D63/A8 = D15
-  PA_5_A, //D64/A9 = D16
-  PA_6_A, //D65/A10 = D17
-  PA_7_A, //D66/A11 = D18
-  PC_4_A, //D67/A12 = D19
-  PC_5_A, //D68/A13 = D20
-  PB_0_A, //D69/A14 = D21
-  PB_1_A, //D70/A15 = D22
+  PA_0_A,  //D26/A0 = D0
+  PA_1_A,  //D27/A1 = D1
+  PA_2_A,  //D28/A2 = D2
+  PA_3_A,  //D29/A3 = D3
+  PA_4_A,  //D30/A4 = D4
+  PA_5_A,  //D31/A5 = D5
+  PA_6_A,  //D32/A6 = D6
+  PA_7_A,  //D33/A7 = D7
+  PB_0_A,  //D34/A8 = D16
+  PB_1_A,  //D35/A9 = D17
   PEND
 };
 
 // This must be a literal with the same value as PEND
-#define NUM_DIGITAL_PINS        71
+#define NUM_DIGITAL_PINS        36
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
-#define NUM_ANALOG_INPUTS       16
-#define NUM_ANALOG_FIRST        55
+#define NUM_ANALOG_INPUTS       10
+#define NUM_ANALOG_FIRST        26
 
 
 
 // SPI definitions
 // SPI1 is used
 #define PIN_SPI_SS              PA4
-#define PIN_SPI_SS1             PC4
-#define PIN_SPI_SS2             PB12
-#define PIN_SPI_SS3             PC6
 #define PIN_SPI_MOSI            PA7
 #define PIN_SPI_MISO            PA6
 #define PIN_SPI_SCK             PA5
 
 // I2C Definitions
 // I2C1 is used
-#define PIN_WIRE_SDA            PB9
-#define PIN_WIRE_SCL            PB8
+#define PIN_WIRE_SDA            PB7
+#define PIN_WIRE_SCL            PB6
 
 // Timer Definitions
 //Do not use timer used by PWM pins when possible. See PinMap_PWM.
-// STM32F030x6 does not have basic timers. So we have to use TIM14 (General purpose)
+// STM32F030K6 does not have basic timers. So we have to use TIM14 (General purpose)
 #define TIMER_TONE              TIM14
 
 //Do not use basic timer: OC is required
