new variant: PRNTRv2

boards.txt

@@ -1276,9 +1276,21 @@ LoRa.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
 3dprinter.menu.pnum.PRNTR_F407_V1.build.board=PRNTR_F407_V1
 3dprinter.menu.pnum.PRNTR_F407_V1.build.series=STM32F4xx
 3dprinter.menu.pnum.PRNTR_F407_V1.build.product_line=STM32F407xx
-3dprinter.menu.pnum.PRNTR_F407_V1.build.variant=PRNTR_F407_V1
+3dprinter.menu.pnum.PRNTR_F407_V1.build.variant=PRNTR_Vx
 3dprinter.menu.pnum.PRNTR_F407_V1.build.cmsis_lib_gcc=arm_cortexM4lf_math
 
+# PRNTR_V2 board
+3dprinter.menu.pnum.PRNTR_V2=PRNTR v2
+3dprinter.menu.pnum.PRNTR_V2.upload.maximum_size=524288
+3dprinter.menu.pnum.PRNTR_V2.upload.maximum_data_size=196608
+3dprinter.menu.pnum.PRNTR_V2.build.mcu=cortex-m4
+3dprinter.menu.pnum.PRNTR_V2.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
+3dprinter.menu.pnum.PRNTR_V2.build.board=PRNTR_V2
+3dprinter.menu.pnum.PRNTR_V2.build.series=STM32F4xx
+3dprinter.menu.pnum.PRNTR_V2.build.product_line=STM32F407xx
+3dprinter.menu.pnum.PRNTR_V2.build.variant=PRNTR_Vx
+3dprinter.menu.pnum.PRNTR_V2.build.cmsis_lib_gcc=arm_cortexM4lf_math
+
 # EEXTR_F030_V1 board
 3dprinter.menu.pnum.EEXTR_F030_V1=EExtruder F030 V1
 3dprinter.menu.pnum.EEXTR_F030_V1.upload.maximum_size=65536

variants/PRNTR_F407_V1/variant.h → variants/PRNTR_Vx/variant.h

@@ -35,6 +35,10 @@
 extern "C" {
 #endif // __cplusplus
 
+#if !defined(ARDUINO_PRNTR_F407_V1) && !defined(ARDUINO_PRNTR_V2)
+#error Expected either ARDUINO_PRNTR_F407_V1 or ARDUINO_PRNTR_V2 to be defined. Wrong board variant?
+#endif
+
 /*----------------------------------------------------------------------------
  *        Pins
  *----------------------------------------------------------------------------*/
@@ -124,6 +128,7 @@ extern "C" {
 #define PA14   78
 #define PA15   79
 
+#ifdef ARDUINO_PRNTR_F407_V1
 #define EXP1_1  PE0
 #define EXP1_2  PE1
 #define EXP1_3  PE2
@@ -167,45 +172,58 @@ extern "C" {
 //      EXP4_8  3.3V
 //      EXP4_9  GND
 //      EXP4_10 5V
+#endif
 
 // This must be a literal
 #define NUM_DIGITAL_PINS        80
 // This must be a literal with a value less than or equal to to MAX_ANALOG_INPUTS
 #define NUM_ANALOG_INPUTS       8
 #define NUM_ANALOG_FIRST        64
 
+#ifdef ARDUINO_PRNTR_F407_V1
 // On-board LED pin number
 #define LED_BUILTIN             PB2
 #define LED_GREEN               LED_BUILTIN
-
-// On-board user button
-//#define USER_BTN                -1
+#endif
 
 // SPI Definitions
 //#define PIN_SPI_SS2             -1
+#ifdef ARDUINO_PRNTR_F407_V1
 #define PIN_SPI_MOSI            PB5
 #define PIN_SPI_MISO            PB4
+#else // ARDUINO_PRNTR_V2
+#define PIN_SPI_MOSI            PA7
+#define PIN_SPI_MISO            PA6
+#endif
 #define PIN_SPI_SCK             PB3
 
 // I2C Definitions
+#ifdef ARDUINO_PRNTR_F407_V1
 #define PIN_WIRE_SDA            PB9
 #define PIN_WIRE_SCL            PB8
+#else // ARDUINO_PRNTR_V2
+#define PIN_WIRE_SDA            PB7
+#define PIN_WIRE_SCL            PB6
+#endif
 
 // Timer Definitions
 // Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin
 #define TIMER_TONE              TIM6
 #define TIMER_SERVO             TIM7
+#define TIMER_SERIAL            TIM12
 
 // UART Definitions
-#define SERIAL_UART_INSTANCE    1 //Connected to ST-Link
+#define SERIAL_UART_INSTANCE    1
 
 // Default pin used for 'Serial' instance (ex: ST-Link)
 // Mandatory for Firmata
 #define PIN_SERIAL_RX           PA10
 #define PIN_SERIAL_TX           PA9
 
 /* Extra HAL modules */
+#ifdef ARDUINO_PRNTR_F407_V1
 #define HAL_DAC_MODULE_ENABLED
+#endif
 #define HAL_SD_MODULE_ENABLED
 
 #ifdef __cplusplus