From 264a09cd8171d246b7df4dc1673dbc631b82443a Mon Sep 17 00:00:00 2001 From: Morten Kals Date: Sat, 18 Jul 2020 10:32:25 +0200 Subject: [PATCH 1/8] added initial configuration for L010R8 --- boards.txt | 8 + variants/Generic_L010x8/PeripheralPins.c | 176 +++++++++++++++ variants/Generic_L010x8/PinNamesVar.h | 25 +++ variants/Generic_L010x8/ldscript.ld | 219 ++++++++++++++++++ variants/Generic_L010x8/readme.txt | 2 + variants/Generic_L010x8/variant.cpp | 175 +++++++++++++++ variants/Generic_L010x8/variant.h | 269 +++++++++++++++++++++++ 7 files changed, 874 insertions(+) create mode 100644 variants/Generic_L010x8/PeripheralPins.c create mode 100644 variants/Generic_L010x8/PinNamesVar.h create mode 100644 variants/Generic_L010x8/ldscript.ld create mode 100644 variants/Generic_L010x8/readme.txt create mode 100644 variants/Generic_L010x8/variant.cpp create mode 100644 variants/Generic_L010x8/variant.h diff --git a/boards.txt b/boards.txt index 65074d3a9f..faee006700 100644 --- a/boards.txt +++ b/boards.txt @@ -1682,6 +1682,14 @@ GenL0.build.mcu=cortex-m0plus GenL0.build.series=STM32L0xx GenL0.build.cmsis_lib_gcc=arm_cortexM0l_math +# Generic L010x8 +GenL0.menu.pnum.Generic_L010x8=Generic L010x8 +GenL0.menu.pnum.Generic_L010x8.upload.maximum_size=65536 +GenL0.menu.pnum.Generic_L010x8.upload.maximum_data_size=8192 +GenL0.menu.pnum.Generic_L010x8.build.board=GENERIC_L010R8 +GenL0.menu.pnum.Generic_L010x8.build.product_line=STM32L010x8 +GenL0.menu.pnum.Generic_L010x8.build.variant=Generic_L010x8 + # ThunderPack GenL0.menu.pnum.THUNDERPACK_L072=ThunderPack v1.0 GenL0.menu.pnum.THUNDERPACK_L072.upload.maximum_size=196608 diff --git a/variants/Generic_L010x8/PeripheralPins.c b/variants/Generic_L010x8/PeripheralPins.c new file mode 100644 index 0000000000..e2b43ea5ee --- /dev/null +++ b/variants/Generic_L010x8/PeripheralPins.c @@ -0,0 +1,176 @@ +/* + ******************************************************************************* + * Copyright (c) 2020, STMicroelectronics + * All rights reserved. + * + * This software component is licensed by ST under BSD 3-Clause license, + * the "License"; You may not use this file except in compliance with the + * License. You may obtain a copy of the License at: + * opensource.org/licenses/BSD-3-Clause + * + ******************************************************************************* + * Automatically generated from STM32L010R8Tx.xml + */ +#include "Arduino.h" +#include "PeripheralPins.h" + +/* ===== + * Note: Commented lines are alternative possibilities which are not used per default. + * If you change them, you will have to know what you do + * ===== + */ + +//*** ADC *** + +#ifdef HAL_ADC_MODULE_ENABLED +WEAK const PinMap PinMap_ADC[] = { + {PA_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC_IN0 + {PA_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC_IN1 + {PA_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC_IN2 + {PA_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC_IN3 + {PA_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC_IN4 + {PA_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC_IN5 + {PA_6, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC_IN6 + {PA_7, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC_IN7 + {PB_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC_IN8 + {PB_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC_IN9 + {PC_0, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC_IN10 + {PC_1, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC_IN11 + {PC_2, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC_IN12 + {PC_3, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC_IN13 + {PC_4, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC_IN14 + {PC_5, ADC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC_IN15 + {NC, NP, 0} +}; +#endif + +//*** No DAC *** + +//*** I2C *** + +#ifdef HAL_I2C_MODULE_ENABLED +WEAK const PinMap PinMap_I2C_SDA[] = { + {PB_7, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)}, + {PB_9, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, + {NC, NP, 0} +}; +#endif + +#ifdef HAL_I2C_MODULE_ENABLED +WEAK const PinMap PinMap_I2C_SCL[] = { + {PB_6, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF1_I2C1)}, + {PB_8, I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, + {NC, NP, 0} +}; +#endif + +//*** PWM *** + +#ifdef HAL_TIM_MODULE_ENABLED +WEAK const PinMap PinMap_PWM[] = { + {PA_0, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 1, 0)}, // TIM2_CH1 + {PA_1, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2 + {PA_2, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3 + {PA_2, TIM21, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM21, 1, 0)}, // TIM21_CH1 + {PA_3, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 4, 0)}, // TIM2_CH4 + {PA_3, TIM21, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM21, 2, 0)}, // TIM21_CH2 + {PA_5, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM2, 1, 0)}, // TIM2_CH1 + {PA_15, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM2, 1, 0)}, // TIM2_CH1 + {PB_3, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 2, 0)}, // TIM2_CH2 + {PB_10, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 3, 0)}, // TIM2_CH3 + {PB_11, TIM2, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM2, 4, 0)}, // TIM2_CH4 + {PB_13, TIM21, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM21, 1, 0)}, // TIM21_CH1 + {PB_14, TIM21, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_TIM21, 2, 0)}, // TIM21_CH2 + {NC, NP, 0} +}; +#endif + +//*** SERIAL *** + +#ifdef HAL_UART_MODULE_ENABLED +WEAK const PinMap PinMap_UART_TX[] = { + {PA_2, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)}, + {PA_14, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)}, + {PB_10, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, + {PC_4, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_LPUART1)}, + {PC_10, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_LPUART1)}, + {NC, NP, 0} +}; +#endif + +#ifdef HAL_UART_MODULE_ENABLED +WEAK const PinMap PinMap_UART_RX[] = { + {PA_3, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)}, + {PA_15, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)}, + {PB_11, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, + {PC_5, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_LPUART1)}, + {PC_11, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_LPUART1)}, + {NC, NP, 0} +}; +#endif + +#ifdef HAL_UART_MODULE_ENABLED +WEAK const PinMap PinMap_UART_RTS[] = { + {PA_1, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)}, + {PB_1, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, + {PB_12, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_LPUART1)}, + {PB_14, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, + {PD_2, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_LPUART1)}, + {NC, NP, 0} +}; +#endif + +#ifdef HAL_UART_MODULE_ENABLED +WEAK const PinMap PinMap_UART_CTS[] = { + {PA_0, USART2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_USART2)}, + {PA_6, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, + {PB_13, LPUART1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_LPUART1)}, + {NC, NP, 0} +}; +#endif + +//*** SPI *** + +#ifdef HAL_SPI_MODULE_ENABLED +WEAK const PinMap PinMap_SPI_MOSI[] = { + {PA_7, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, + {PA_12, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, + {PB_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, + {NC, NP, 0} +}; +#endif + +#ifdef HAL_SPI_MODULE_ENABLED +WEAK const PinMap PinMap_SPI_MISO[] = { + {PA_6, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, + {PA_11, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, + {PB_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, + {NC, NP, 0} +}; +#endif + +#ifdef HAL_SPI_MODULE_ENABLED +WEAK const PinMap PinMap_SPI_SCLK[] = { + {PA_5, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, + {PB_3, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, + {NC, NP, 0} +}; +#endif + +#ifdef HAL_SPI_MODULE_ENABLED +WEAK const PinMap PinMap_SPI_SSEL[] = { + {PA_4, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, + {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_SPI1)}, + {NC, NP, 0} +}; +#endif + +//*** No CAN *** + +//*** No ETHERNET *** + +//*** No QUADSPI *** + +//*** No USB *** + +//*** No SD *** \ No newline at end of file diff --git a/variants/Generic_L010x8/PinNamesVar.h b/variants/Generic_L010x8/PinNamesVar.h new file mode 100644 index 0000000000..44fb330393 --- /dev/null +++ b/variants/Generic_L010x8/PinNamesVar.h @@ -0,0 +1,25 @@ +/* SYS_WKUP */ +#ifdef PWR_WAKEUP_PIN1 + SYS_WKUP1 = PA_0, +#endif +#ifdef PWR_WAKEUP_PIN2 + SYS_WKUP2 = PC_13, +#endif +#ifdef PWR_WAKEUP_PIN3 + SYS_WKUP3 = NC, +#endif +#ifdef PWR_WAKEUP_PIN4 + SYS_WKUP4 = NC, +#endif +#ifdef PWR_WAKEUP_PIN5 + SYS_WKUP5 = NC, +#endif +#ifdef PWR_WAKEUP_PIN6 + SYS_WKUP6 = NC, +#endif +#ifdef PWR_WAKEUP_PIN7 + SYS_WKUP7 = NC, +#endif +#ifdef PWR_WAKEUP_PIN8 + SYS_WKUP8 = NC, +#endif \ No newline at end of file diff --git a/variants/Generic_L010x8/ldscript.ld b/variants/Generic_L010x8/ldscript.ld new file mode 100644 index 0000000000..3a624aacaf --- /dev/null +++ b/variants/Generic_L010x8/ldscript.ld @@ -0,0 +1,219 @@ +/* +***************************************************************************** +** +** File : ldscript.ld +** +** Abstract : Linker script for STM32 Device +** +** Set heap size, stack size and stack location according +** to application requirements. +** +** Set memory bank area and size if external memory is used. +** +** Target : STMicroelectronics STM32 +** +** +***************************************************************************** +*/ +/* Copy here linker script for the new STM32 Device + * or + * replace this file by the new one with the same file name + * It could be get thanks STM32CubeMX after code generation for Toolchain/IDE: 'SW4STM32', + * ldscript will be availabe in the root folder (STM32YYxxxxxx_FLASH.ld) + * or + * copied from a STM32CubeYY project examples + * where 'YY' could be F0, F1, F2, F3, F4, F7, G0, G4, H7, L0, L1, L4, WB) + */ + + + + +/* +****************************************************************************** +** + +** File : LinkerScript.ld +** +** Author : Auto-generated by System Workbench for STM32 +** +** Abstract : Linker script for STM32L010R8Tx series +** 64Kbytes FLASH and 8Kbytes RAM +** +** Set heap size, stack size and stack location according +** to application requirements. +** +** Set memory bank area and size if external memory is used. +** +** Target : STMicroelectronics STM32 +** +** Distribution: The file is distributed “as is,” without any warranty +** of any kind. +** +***************************************************************************** +** @attention +** +**

© COPYRIGHT(c) 2019 STMicroelectronics

+** +** Redistribution and use in source and binary forms, with or without modification, +** are permitted provided that the following conditions are met: +** 1. Redistributions of source code must retain the above copyright notice, +** this list of conditions and the following disclaimer. +** 2. Redistributions in binary form must reproduce the above copyright notice, +** this list of conditions and the following disclaimer in the documentation +** and/or other materials provided with the distribution. +** 3. Neither the name of STMicroelectronics nor the names of its contributors +** may be used to endorse or promote products derived from this software +** without specific prior written permission. +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +** +***************************************************************************** +*/ + +/* Entry Point */ +ENTRY(Reset_Handler) + +/* Highest address of the user mode stack */ +_estack = 0x20002000; /* end of RAM */ +/* Generate a link error if heap and stack don't fit into RAM */ +_Min_Heap_Size = 0x200; /* required amount of heap */ +_Min_Stack_Size = 0x400; /* required amount of stack */ + +/* Specify the memory areas */ +MEMORY +{ +RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 8K +FLASH (rx) : ORIGIN = 0x8000000, LENGTH = 64K +} + +/* Define output sections */ +SECTIONS +{ + /* The startup code goes first into FLASH */ + .isr_vector : + { + . = ALIGN(4); + KEEP(*(.isr_vector)) /* Startup code */ + . = ALIGN(4); + } >FLASH + + /* The program code and other data goes into FLASH */ + .text : + { + . = ALIGN(4); + *(.text) /* .text sections (code) */ + *(.text*) /* .text* sections (code) */ + *(.glue_7) /* glue arm to thumb code */ + *(.glue_7t) /* glue thumb to arm code */ + *(.eh_frame) + + KEEP (*(.init)) + KEEP (*(.fini)) + + . = ALIGN(4); + _etext = .; /* define a global symbols at end of code */ + } >FLASH + + /* Constant data goes into FLASH */ + .rodata : + { + . = ALIGN(4); + *(.rodata) /* .rodata sections (constants, strings, etc.) */ + *(.rodata*) /* .rodata* sections (constants, strings, etc.) */ + . = ALIGN(4); + } >FLASH + + .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH + .ARM : { + __exidx_start = .; + *(.ARM.exidx*) + __exidx_end = .; + } >FLASH + + .preinit_array : + { + PROVIDE_HIDDEN (__preinit_array_start = .); + KEEP (*(.preinit_array*)) + PROVIDE_HIDDEN (__preinit_array_end = .); + } >FLASH + .init_array : + { + PROVIDE_HIDDEN (__init_array_start = .); + KEEP (*(SORT(.init_array.*))) + KEEP (*(.init_array*)) + PROVIDE_HIDDEN (__init_array_end = .); + } >FLASH + .fini_array : + { + PROVIDE_HIDDEN (__fini_array_start = .); + KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array*)) + PROVIDE_HIDDEN (__fini_array_end = .); + } >FLASH + + /* used by the startup to initialize data */ + _sidata = LOADADDR(.data); + + /* Initialized data sections goes into RAM, load LMA copy after code */ + .data : + { + . = ALIGN(4); + _sdata = .; /* create a global symbol at data start */ + *(.data) /* .data sections */ + *(.data*) /* .data* sections */ + + . = ALIGN(4); + _edata = .; /* define a global symbol at data end */ + } >RAM AT> FLASH + + + /* Uninitialized data section */ + . = ALIGN(4); + .bss : + { + /* This is used by the startup in order to initialize the .bss secion */ + _sbss = .; /* define a global symbol at bss start */ + __bss_start__ = _sbss; + *(.bss) + *(.bss*) + *(COMMON) + + . = ALIGN(4); + _ebss = .; /* define a global symbol at bss end */ + __bss_end__ = _ebss; + } >RAM + + /* User_heap_stack section, used to check that there is enough RAM left */ + ._user_heap_stack : + { + . = ALIGN(8); + PROVIDE ( end = . ); + PROVIDE ( _end = . ); + . = . + _Min_Heap_Size; + . = . + _Min_Stack_Size; + . = ALIGN(8); + } >RAM + + + + /* Remove information from the standard libraries */ + /DISCARD/ : + { + libc.a ( * ) + libm.a ( * ) + libgcc.a ( * ) + } + + .ARM.attributes 0 : { *(.ARM.attributes) } +} + + diff --git a/variants/Generic_L010x8/readme.txt b/variants/Generic_L010x8/readme.txt new file mode 100644 index 0000000000..55bcd2736f --- /dev/null +++ b/variants/Generic_L010x8/readme.txt @@ -0,0 +1,2 @@ +See Wiki: +https://github.com/stm32duino/wiki/wiki/Add-a-new-variant-(board) \ No newline at end of file diff --git a/variants/Generic_L010x8/variant.cpp b/variants/Generic_L010x8/variant.cpp new file mode 100644 index 0000000000..239940914f --- /dev/null +++ b/variants/Generic_L010x8/variant.cpp @@ -0,0 +1,175 @@ +/* + ******************************************************************************* + * Copyright (c) 2019, STMicroelectronics + * All rights reserved. + * + * This software component is licensed by ST under BSD 3-Clause license, + * the "License"; You may not use this file except in compliance with the + * License. You may obtain a copy of the License at: + * opensource.org/licenses/BSD-3-Clause + * + ******************************************************************************* + */ + +#include "pins_arduino.h" + +#ifdef __cplusplus +extern "C" { +#endif + +// Digital PinName array +// This array allows to wrap Arduino pin number(Dx or x) +// to STM32 PinName (PX_n) +const PinName digitalPin[] = { + //PX_n, //Dx + PA_0, // D0 / A0 + PA_1, // D1 / A1 + PA_2, // D2 / A2 + PA_3, // D3 / A3 + PA_4, // D4 / A4 + PA_5, // D5 / A5 + PA_6, // D6 / A6 + PA_7, // D7 / A7 + 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 / A8 + PB_1, // D17 / A9 + PB_2, // D18 + PB_3, // D19 + PB_4, // D20 + PB_5, // D21 + PB_6, // D22 + PB_7, // D23 + PB_8, // D24 + PB_9, // D25 + PB_10, // D26 + PB_11, // D27 + PB_12, // D28 + PB_13, // D29 + PB_14, // D30 + PB_15, // D31 + + PC_0, // D32 / A10 + PC_1, // D33 / A11 + PC_2, // D34 / A12 + PC_3, // D35 / A13 + PC_4, // D36 / A14 + PC_5, // D37 / A15 + PC_6, // D38 + PC_7, // D39 + PC_8, // D40 + PC_9, // D41 + PC_10, // D42 + PC_11, // D43 + PC_12, // D44 + PC_13, // D45 + + PD_2, // D46 +}; + +// If analog pins are not contiguous in the digitalPin array: +// Add the analogInputPin array without defining NUM_ANALOG_FIRST +// Analog (Ax) pin number array +// where x is the index to retrieve the digital pin number +const uint32_t analogInputPin[] = { + //PXn, //Ax = Dx + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 16, + 17, + 32, + 33, + 34, + 35, + 36, + 37, +}; + +#ifdef __cplusplus +} +#endif + +// ---------------------------------------------------------------------------- + +#ifdef __cplusplus +extern "C" { +#endif + +/** + * @brief System Clock Configuration + * @param None + * @retval None + */ +WEAK void SystemClock_Config(void) +{ + // Here copy the desired System Clock Configuration + // It could be generated thanks STM32CubeMX after code generation for Toolchain/IDE: 'SW4STM32', + // available in src/main.c + // or + // copied from a STM32CubeYY project examples + // where 'YY' could be F0, F1, F2, F3, F4, F7, G0, G4, H7, L0, L1, L4, MP1, WB + + RCC_OscInitTypeDef RCC_OscInitStruct = {0}; + RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; + RCC_PeriphCLKInitTypeDef PeriphClkInit = {0}; + + /** Configure the main internal regulator output voltage + */ + __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); + /** Initializes the CPU, AHB and APB busses clocks + */ + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_HSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; + RCC_OscInitStruct.LSIState = RCC_LSI_ON; + RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; + RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; + RCC_OscInitStruct.PLL.PLLMUL = RCC_PLLMUL_8; + RCC_OscInitStruct.PLL.PLLDIV = RCC_PLLDIV_2; + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) + { + Error_Handler(); + } + /** Initializes the CPU, AHB and APB busses clocks + */ + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK + |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; + RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; + RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; + RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; + RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; + + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) + { + Error_Handler(); + } + PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART2|RCC_PERIPHCLK_RTC + |RCC_PERIPHCLK_LPTIM1; + PeriphClkInit.Usart2ClockSelection = RCC_USART2CLKSOURCE_PCLK1; + PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; + PeriphClkInit.LptimClockSelection = RCC_LPTIM1CLKSOURCE_PCLK; + + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) + { + Error_Handler(); + } + /** Enables the Clock Security System + */ + HAL_RCC_EnableCSS(); +} + +#ifdef __cplusplus +} +#endif diff --git a/variants/Generic_L010x8/variant.h b/variants/Generic_L010x8/variant.h new file mode 100644 index 0000000000..8ad788d6cd --- /dev/null +++ b/variants/Generic_L010x8/variant.h @@ -0,0 +1,269 @@ +/* + ******************************************************************************* + * Copyright (c) 2019, STMicroelectronics + * All rights reserved. + * + * This software component is licensed by ST under BSD 3-Clause license, + * the "License"; You may not use this file except in compliance with the + * License. You may obtain a copy of the License at: + * opensource.org/licenses/BSD-3-Clause + * + ******************************************************************************* + */ + +#ifndef _VARIANT_ARDUINO_STM32_ +#define _VARIANT_ARDUINO_STM32_ + +#ifdef __cplusplus +extern "C" { +#endif // __cplusplus + +/*---------------------------------------------------------------------------- + * Pins + *----------------------------------------------------------------------------*/ + +// Define pin names to match digital pin number --> Dx +// It could be used with preprocessor tests (e.g. #if PXn == 3) +// so an enum will not work. +// !!! +// !!! Copy the digitalPin[] array from the variant.cpp +// !!! and remove all '_': PX_n --> PXn +// !!! For NC, comment the line to warn x pin number is NC +// !!! // x is NC +// !!! For duplicated pin name, comment the line to warn x pin number +// !!! is PXn which is already defined with y pin number +// !!! // x is PXn (y) +// !!! Ex: +// !!! ... +// !!! #define PA4 20 // A14 <-- if NUM_ANALOG_FIRST not defined +// !!! or +// !!! #define PA4 A14 // 20 <-- if NUM_ANALOG_FIRST defined +// !!! #define PB4 21 +// !!! #define PB5 22 +// !!! #define PB3 23 +// !!! // 24 is PA4 (20) +// !!! // 25 is PB4 (21) +// !!! #define PA2 26 // A15 <-- if NUM_ANALOG_FIRST not defined +// !!! or +// !!! #define PA2 A15 // 26 <-- if NUM_ANALOG_FIRST defined + +#define PA0 0 // A0 +#define PA1 1 // A1 +#define PA2 2 // A2 +#define PA3 3 // A3 +#define PA4 4 // A4 +#define PA5 5 // A5 +#define PA6 6 // A6 +#define PA7 7 // A7 +#define PA8 8 +#define PA9 9 +#define PA10 10 +#define PA11 11 +#define PA12 12 +#define PA13 13 +#define PA14 14 +#define PA15 15 + +#define PB0 16 // A8 +#define PB1 17 // A9 +#define PB2 18 +#define PB3 19 +#define PB4 20 +#define PB5 21 +#define PB6 22 +#define PB7 23 +#define PB8 24 +#define PB9 25 +#define PB10 26 +#define PB11 27 +#define PB12 28 +#define PB13 29 +#define PB14 30 +#define PB15 31 + +#define PC0 32 // A10 +#define PC1 33 // A11 +#define PC2 34 // A12 +#define PC3 35 // A13 +#define PC4 36 // A14 +#define PC5 37 // A15 +#define PC6 38 +#define PC7 39 +#define PC8 40 +#define PC9 41 +#define PC10 42 +#define PC11 43 +#define PC12 44 +#define PC13 45 + +#define PD2 46 + + +// This must be a literal +// It is used with preprocessor tests (e.g. #if NUM_DIGITAL_PINS > 3) +// so an enum will not work. +#define NUM_DIGITAL_PINS 47 + +// Allow to define Arduino style alias for analog input pin number --> Ax +// If no analog pin required then NUM_ANALOG_INPUTS could not be defined +// or set to `0` +// All pins are digital, analog inputs are a subset of digital pins. +// This must be a literal +// It is used with preprocessor tests (e.g. #if NUM_ANALOG_INPUTS > 3) +// so an enum will not work. +// !!! +// !!! It must be aligned with the number of analog PinName +// !!! defined in digitalPin[] array in variant.cpp +// !!! +#define NUM_ANALOG_INPUTS 16 + +// They are 2 possibles way to define analog pins: +//------------------------------------------------------------------------------------------- +// - If they are contiguous in the digitalPin array: +// Simply defined `NUM_ANALOG_FIRST` and all pins Ax will be automatically defined. +// It define the digital pin number of the first analog input (i.e. which digital pin is A0) +// First analog pin value (A0) must be greater than or equal to NUM_ANALOG_INPUTS +// This must be a literal with a value less than or equal to MAX_ANALOG_INPUTS +// defined in pin_arduino.h +//#define NUM_ANALOG_FIRST 0 +//------------------------------------OR------------------------------------------------------ +// - If they are not contiguous in the digitalPin array: +// Add an analogInputPin array in the variant.cpp without defining NUM_ANALOG_FIRST +// In that case the defined PYn for analog pin have to define the Ax definition instead of +// index in digitalPin[] array: +// #define PA4 A14 +//------------------------------------------------------------------------------------------- + +// Below ADC and PWM definitions already done in the core +// Could be redefined here if needed +// ADC resolution is 10 bits +//#define ADC_RESOLUTION 10 + +// PWM resolution +#define PWM_RESOLUTION 8 +#define PWM_FREQUENCY 1000 +#define PWM_MAX_DUTY_CYCLE 255 +#define HAL_TIM_MODULE_ENABLED + +// On-board LED pin number +#define LED_BUILTIN PC2 +#define LED_GREEN LED_BUILTIN + +// On-board user button +#define USER_BTN PB2 + +// Below SPI and I2C definitions already done in the core +// Could be redefined here if differs from the default one +// SPI Definitions +#define PIN_SPI_SS PB8 // Default for Arduino connector compatibility +#define PIN_SPI_MOSI PB5 // Default for Arduino connector compatibility +#define PIN_SPI_MISO PB4 // Default for Arduino connector compatibility +#define PIN_SPI_SCK PB3 // Default for Arduino connector compatibility + +// I2C Definitions +//#define PIN_WIRE_SDA 14 // Default for Arduino connector compatibility +//#define PIN_WIRE_SCL 15 // Default for Arduino connector compatibility + +// I2C timing definitions (optional), avoid time spent to compute if defined +// * I2C_TIMING_SM for Standard Mode (100kHz) +// * I2C_TIMING_FM for Fast Mode (400kHz) +// * I2C_TIMING_FMP for Fast Mode Plus (1000kHz) +//#define I2C_TIMING_SM 0x00000000 +//#define I2C_TIMING_FM 0x00000000 +//#define I2C_TIMING_FMP 0x00000000 + +// Timer Definitions (optional) +// Use TIM6/TIM7 when possible as servo and tone don't need GPIO output pin +#define TIMER_TONE TIM2 +#define TIMER_SERVO TIM2 + +// UART Definitions +// Define here Serial instance number to map on Serial generic name +#define SERIAL_UART_INSTANCE 2 //ex: 2 for Serial2 (USART2) + +// DEBUG_UART could be redefined to print on another instance than 'Serial' +//#define DEBUG_UART ((USART_TypeDef *) U(S)ARTX) // ex: USART3 +// DEBUG_UART baudrate, default: 9600 if not defined +//#define DEBUG_UART_BAUDRATE x +// DEBUG_UART Tx pin name, default: the first one found in PinMap_UART_TX for DEBUG_UART +//#define DEBUG_PINNAME_TX PX_n // PinName used for TX + +// Default pin used for 'Serial' instance (ex: ST-Link) +// Mandatory for Firmata +#define PIN_SERIAL_RX PA3 +#define PIN_SERIAL_TX PA2 + +// Optional PIN_SERIALn_RX and PIN_SERIALn_TX where 'n' is the U(S)ART number +// Used when user instanciate a hardware Serial using its peripheral name. +// Example: HardwareSerial mySerial(USART3); +// will use PIN_SERIAL3_RX and PIN_SERIAL3_TX if defined. +//#define PIN_SERIALn_RX x // For U(S)ARTn RX +//#define PIN_SERIALn_TX x // For U(S)ARTn TX +//#define PIN_SERIALLP1_RX x // For LPUART1 RX +//#define PIN_SERIALLP1_TX x // For LPUART1 TX + +// SD card slot Definitions +// SD detect signal can be defined if required +//#define SD_DETECT_PIN x +// SD Read/Write timeout, default value defined in STM32SD library +//#define SD_DATATIMEOUT x + +// USB Vbus sensing. Require to have Vbus pin connected to Vbus signal. +// Warning, pin is different depending on FullSpeed or High Speed mode used +// See AN4879 https://www.st.com/content/st_com/en/search.html#q=AN4879-t=resources-page=1 +//#define USBD_VBUS_DETECTION_ENABLE + +// If the board has external USB pullup (on DP/DM depending on speed) +// that can be controlled using a GPIO pin, define these: +// - If the the pullup is disabled (USB detached) by default, define +// USBD_ATTACH_PIN to the pin that, when written to +// USBD_ATTACH_LEVEL, attaches the pullup. +// - If the the pullup is enabled (attached) by default, define +// USBD_DETACH_PIN to the pin that, when written to +// USBD_DETACH_LEVEL, detaches the pullup. +//#define USBD_ATTACH_PIN x +//#define USBD_ATTACH_LEVEL LOW +//#define USBD_DETACH_PIN x +//#define USBD_DETACH_LEVEL LOW +// +// This indicates that there is an external and fixed 1.5k pullup +// on the D+ line. This define is not normally needed, since a +// fixed pullup is assumed by default. It is only required when +// the USB peripheral has an internal pullup *and* an external +// fixed pullup is present (which is actually a hardware bug, since just +// the internal pullup is sufficient and having two pullups violates the +// USB specification). In this case, defining this forces +// the "write D+ LOW"-trick to be used. In the future, it might also +// disable the internal pullups, but this is not currently implemented. +// #define USBD_FIXED_PULLUP +#ifdef __cplusplus +} // extern "C" +#endif + + +/*---------------------------------------------------------------------------- + * Arduino objects - C++ only + *----------------------------------------------------------------------------*/ + +#ifdef __cplusplus + // These serial port names are intended to allow libraries and architecture-neutral + // sketches to automatically default to the correct port name for a particular type + // of use. For example, a GPS module would normally connect to SERIAL_PORT_HARDWARE_OPEN, + // the first hardware serial port whose RX/TX pins are not dedicated to another use. + // + // SERIAL_PORT_MONITOR Port which normally prints to the Arduino Serial Monitor + // + // SERIAL_PORT_USBVIRTUAL Port which is USB virtual serial + // + // SERIAL_PORT_LINUXBRIDGE Port which connects to a Linux system via Bridge library + // + // SERIAL_PORT_HARDWARE Hardware serial port, physical RX & TX pins. + // + // SERIAL_PORT_HARDWARE_OPEN Hardware serial ports which are open for use. Their RX & TX + // pins are NOT connected to anything by default. + #define SERIAL_PORT_MONITOR Serial + #define SERIAL_PORT_HARDWARE Serial + +#endif + +#endif /* _VARIANT_ARDUINO_STM32_ */ From b922fc642fbc26c8ce50f4931d7bc2c8d6cb725f Mon Sep 17 00:00:00 2001 From: Morten Kals Date: Sat, 18 Jul 2020 12:23:57 +0200 Subject: [PATCH 2/8] updated readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6d32cf2bd5..10357426fb 100644 --- a/README.md +++ b/README.md @@ -212,6 +212,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d | Status | Device(s) | Name | Release | Notes | | :----: | :-------: | ---- | :-----: | :---- | +| :green_heart: | STM32L010RB | Generic Board | *1.x.x* | | | :green_heart: | STM32L072RB | [PX-HER0](https://piconomix.com/fwlib/_p_i_c_o_n_o_m_i_x__s_t_m32__h_e_r_o__b_o_a_r_d.html) | *1.8.0* | | | :green_heart: | STM32L072KZ | [ThunderPack v1.0](https://github.com/jgillick/ThunderPack) | *1.8.0* | | From 5bbfc5b5624495e080ec1baf03c3671c069dc1ec Mon Sep 17 00:00:00 2001 From: Morten Kals Date: Sat, 18 Jul 2020 12:41:36 +0200 Subject: [PATCH 3/8] fixed styling issues --- variants/Generic_L010x8/variant.cpp | 39 +++++++++++++---------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/variants/Generic_L010x8/variant.cpp b/variants/Generic_L010x8/variant.cpp index 239940914f..310fbee2a5 100644 --- a/variants/Generic_L010x8/variant.cpp +++ b/variants/Generic_L010x8/variant.cpp @@ -38,7 +38,7 @@ const PinName digitalPin[] = { PA_13, // D13 PA_14, // D14 PA_15, // D15 - + PB_0, // D16 / A8 PB_1, // D17 / A9 PB_2, // D18 @@ -70,7 +70,7 @@ const PinName digitalPin[] = { PC_11, // D43 PC_12, // D44 PC_13, // D45 - + PD_2, // D46 }; @@ -89,12 +89,12 @@ const uint32_t analogInputPin[] = { 6, 7, 16, - 17, - 32, - 33, - 34, - 35, - 36, + 17, + 32, + 33, + 34, + 35, + 36, 37, }; @@ -126,33 +126,31 @@ WEAK void SystemClock_Config(void) RCC_ClkInitTypeDef RCC_ClkInitStruct = {0}; RCC_PeriphCLKInitTypeDef PeriphClkInit = {0}; - /** Configure the main internal regulator output voltage + /** Configure the main internal regulator output voltage */ __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1); - /** Initializes the CPU, AHB and APB busses clocks + /** Initializes the CPU, AHB and APB busses clocks */ - RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_HSE; + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_HSE; RCC_OscInitStruct.HSEState = RCC_HSE_ON; RCC_OscInitStruct.LSIState = RCC_LSI_ON; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; RCC_OscInitStruct.PLL.PLLMUL = RCC_PLLMUL_8; RCC_OscInitStruct.PLL.PLLDIV = RCC_PLLDIV_2; - if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) - { + if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { Error_Handler(); } - /** Initializes the CPU, AHB and APB busses clocks + /** Initializes the CPU, AHB and APB busses clocks */ - RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK - |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK + | RCC_CLOCKTYPE_PCLK1 | RCC_CLOCKTYPE_PCLK2; RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1; RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; - if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) - { + if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) { Error_Handler(); } PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART2|RCC_PERIPHCLK_RTC @@ -161,11 +159,10 @@ WEAK void SystemClock_Config(void) PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; PeriphClkInit.LptimClockSelection = RCC_LPTIM1CLKSOURCE_PCLK; - if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) - { + if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) { Error_Handler(); } - /** Enables the Clock Security System + /** Enables the Clock Security System */ HAL_RCC_EnableCSS(); } From 941ac624c574088641ccc4c29cb01825d5144e6d Mon Sep 17 00:00:00 2001 From: Morten Kals Date: Sat, 18 Jul 2020 12:44:40 +0200 Subject: [PATCH 4/8] more style-fixes --- variants/Generic_L010x8/variant.cpp | 4 ++-- variants/Generic_L010x8/variant.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/variants/Generic_L010x8/variant.cpp b/variants/Generic_L010x8/variant.cpp index 310fbee2a5..c48be765f9 100644 --- a/variants/Generic_L010x8/variant.cpp +++ b/variants/Generic_L010x8/variant.cpp @@ -153,8 +153,8 @@ WEAK void SystemClock_Config(void) if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_1) != HAL_OK) { Error_Handler(); } - PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART2|RCC_PERIPHCLK_RTC - |RCC_PERIPHCLK_LPTIM1; + PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USART2 | RCC_PERIPHCLK_RTC + | RCC_PERIPHCLK_LPTIM1; PeriphClkInit.Usart2ClockSelection = RCC_USART2CLKSOURCE_PCLK1; PeriphClkInit.RTCClockSelection = RCC_RTCCLKSOURCE_LSI; PeriphClkInit.LptimClockSelection = RCC_LPTIM1CLKSOURCE_PCLK; diff --git a/variants/Generic_L010x8/variant.h b/variants/Generic_L010x8/variant.h index 8ad788d6cd..dd705b0060 100644 --- a/variants/Generic_L010x8/variant.h +++ b/variants/Generic_L010x8/variant.h @@ -87,9 +87,9 @@ extern "C" { #define PC3 35 // A13 #define PC4 36 // A14 #define PC5 37 // A15 -#define PC6 38 -#define PC7 39 -#define PC8 40 +#define PC6 38 +#define PC7 39 +#define PC8 40 #define PC9 41 #define PC10 42 #define PC11 43 From 1b1d3f4b7a2c33962344b50101052b012109f0e0 Mon Sep 17 00:00:00 2001 From: Morten Kals Date: Thu, 20 Aug 2020 10:10:01 +0200 Subject: [PATCH 5/8] updated to include support for 128k flash variant --- boards.txt | 22 +++++++++++++------ .../PeripheralPins.c | 0 .../PinNamesVar.h | 0 .../ldscript.ld | 0 .../readme.txt | 0 .../variant.cpp | 0 .../variant.h | 0 7 files changed, 15 insertions(+), 7 deletions(-) rename variants/{Generic_L010x8 => Generic_L010Rx}/PeripheralPins.c (100%) rename variants/{Generic_L010x8 => Generic_L010Rx}/PinNamesVar.h (100%) rename variants/{Generic_L010x8 => Generic_L010Rx}/ldscript.ld (100%) rename variants/{Generic_L010x8 => Generic_L010Rx}/readme.txt (100%) rename variants/{Generic_L010x8 => Generic_L010Rx}/variant.cpp (100%) rename variants/{Generic_L010x8 => Generic_L010Rx}/variant.h (100%) diff --git a/boards.txt b/boards.txt index faee006700..0d333b3278 100644 --- a/boards.txt +++ b/boards.txt @@ -1682,13 +1682,21 @@ GenL0.build.mcu=cortex-m0plus GenL0.build.series=STM32L0xx GenL0.build.cmsis_lib_gcc=arm_cortexM0l_math -# Generic L010x8 -GenL0.menu.pnum.Generic_L010x8=Generic L010x8 -GenL0.menu.pnum.Generic_L010x8.upload.maximum_size=65536 -GenL0.menu.pnum.Generic_L010x8.upload.maximum_data_size=8192 -GenL0.menu.pnum.Generic_L010x8.build.board=GENERIC_L010R8 -GenL0.menu.pnum.Generic_L010x8.build.product_line=STM32L010x8 -GenL0.menu.pnum.Generic_L010x8.build.variant=Generic_L010x8 +# Generic L010R8 +GenL0.menu.pnum.Generic_L010R8=Generic L010R8 +GenL0.menu.pnum.Generic_L010R8.upload.maximum_size=65536 +GenL0.menu.pnum.Generic_L010R8.upload.maximum_data_size=8192 +GenL0.menu.pnum.Generic_L010R8.build.board=GENERIC_L010R8 +GenL0.menu.pnum.Generic_L010R8.build.product_line=STM32L010x8 +GenL0.menu.pnum.Generic_L010R8.build.variant=Generic_L010Rx + +# Generic L010RB +GenL0.menu.pnum.Generic_L010RB=Generic L010RB +GenL0.menu.pnum.Generic_L010RB.upload.maximum_size=131072 +GenL0.menu.pnum.Generic_L010RB.upload.maximum_data_size=20480 +GenL0.menu.pnum.Generic_L010RB.build.board=GENERIC_L010RB +GenL0.menu.pnum.Generic_L010RB.build.product_line=STM32L010x8 +GenL0.menu.pnum.Generic_L010RB.build.variant=Generic_L010Rx # ThunderPack GenL0.menu.pnum.THUNDERPACK_L072=ThunderPack v1.0 diff --git a/variants/Generic_L010x8/PeripheralPins.c b/variants/Generic_L010Rx/PeripheralPins.c similarity index 100% rename from variants/Generic_L010x8/PeripheralPins.c rename to variants/Generic_L010Rx/PeripheralPins.c diff --git a/variants/Generic_L010x8/PinNamesVar.h b/variants/Generic_L010Rx/PinNamesVar.h similarity index 100% rename from variants/Generic_L010x8/PinNamesVar.h rename to variants/Generic_L010Rx/PinNamesVar.h diff --git a/variants/Generic_L010x8/ldscript.ld b/variants/Generic_L010Rx/ldscript.ld similarity index 100% rename from variants/Generic_L010x8/ldscript.ld rename to variants/Generic_L010Rx/ldscript.ld diff --git a/variants/Generic_L010x8/readme.txt b/variants/Generic_L010Rx/readme.txt similarity index 100% rename from variants/Generic_L010x8/readme.txt rename to variants/Generic_L010Rx/readme.txt diff --git a/variants/Generic_L010x8/variant.cpp b/variants/Generic_L010Rx/variant.cpp similarity index 100% rename from variants/Generic_L010x8/variant.cpp rename to variants/Generic_L010Rx/variant.cpp diff --git a/variants/Generic_L010x8/variant.h b/variants/Generic_L010Rx/variant.h similarity index 100% rename from variants/Generic_L010x8/variant.h rename to variants/Generic_L010Rx/variant.h From b21300fc06cfde31d63bdf0d07d201b61d465df1 Mon Sep 17 00:00:00 2001 From: Morten Kals Date: Thu, 20 Aug 2020 11:17:05 +0200 Subject: [PATCH 6/8] updated product series --- boards.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards.txt b/boards.txt index 0d333b3278..72bf757456 100644 --- a/boards.txt +++ b/boards.txt @@ -1687,7 +1687,7 @@ GenL0.menu.pnum.Generic_L010R8=Generic L010R8 GenL0.menu.pnum.Generic_L010R8.upload.maximum_size=65536 GenL0.menu.pnum.Generic_L010R8.upload.maximum_data_size=8192 GenL0.menu.pnum.Generic_L010R8.build.board=GENERIC_L010R8 -GenL0.menu.pnum.Generic_L010R8.build.product_line=STM32L010x8 +GenL0.menu.pnum.Generic_L010R8.build.product_line=STM32L010xx GenL0.menu.pnum.Generic_L010R8.build.variant=Generic_L010Rx # Generic L010RB @@ -1695,7 +1695,7 @@ GenL0.menu.pnum.Generic_L010RB=Generic L010RB GenL0.menu.pnum.Generic_L010RB.upload.maximum_size=131072 GenL0.menu.pnum.Generic_L010RB.upload.maximum_data_size=20480 GenL0.menu.pnum.Generic_L010RB.build.board=GENERIC_L010RB -GenL0.menu.pnum.Generic_L010RB.build.product_line=STM32L010x8 +GenL0.menu.pnum.Generic_L010RB.build.product_line=STM32L010xx GenL0.menu.pnum.Generic_L010RB.build.variant=Generic_L010Rx # ThunderPack From e983290daa9a372e3f9bb68a9f22ed90fee79d70 Mon Sep 17 00:00:00 2001 From: Morten Kals Date: Wed, 26 Aug 2020 21:47:55 +0200 Subject: [PATCH 7/8] updated board-line ending --- boards.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boards.txt b/boards.txt index 72bf757456..926f022fed 100644 --- a/boards.txt +++ b/boards.txt @@ -1687,7 +1687,7 @@ GenL0.menu.pnum.Generic_L010R8=Generic L010R8 GenL0.menu.pnum.Generic_L010R8.upload.maximum_size=65536 GenL0.menu.pnum.Generic_L010R8.upload.maximum_data_size=8192 GenL0.menu.pnum.Generic_L010R8.build.board=GENERIC_L010R8 -GenL0.menu.pnum.Generic_L010R8.build.product_line=STM32L010xx +GenL0.menu.pnum.Generic_L010R8.build.product_line=STM32L010x8 GenL0.menu.pnum.Generic_L010R8.build.variant=Generic_L010Rx # Generic L010RB @@ -1695,7 +1695,7 @@ GenL0.menu.pnum.Generic_L010RB=Generic L010RB GenL0.menu.pnum.Generic_L010RB.upload.maximum_size=131072 GenL0.menu.pnum.Generic_L010RB.upload.maximum_data_size=20480 GenL0.menu.pnum.Generic_L010RB.build.board=GENERIC_L010RB -GenL0.menu.pnum.Generic_L010RB.build.product_line=STM32L010xx +GenL0.menu.pnum.Generic_L010RB.build.product_line=STM32L010xb GenL0.menu.pnum.Generic_L010RB.build.variant=Generic_L010Rx # ThunderPack From d3d79c1071c82e2346c08dffe75b4371d3eab741 Mon Sep 17 00:00:00 2001 From: Morten Kals Date: Thu, 27 Aug 2020 16:43:30 +0200 Subject: [PATCH 8/8] updated to capital B for product line --- boards.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards.txt b/boards.txt index 926f022fed..2d019e78c8 100644 --- a/boards.txt +++ b/boards.txt @@ -1695,7 +1695,7 @@ GenL0.menu.pnum.Generic_L010RB=Generic L010RB GenL0.menu.pnum.Generic_L010RB.upload.maximum_size=131072 GenL0.menu.pnum.Generic_L010RB.upload.maximum_data_size=20480 GenL0.menu.pnum.Generic_L010RB.build.board=GENERIC_L010RB -GenL0.menu.pnum.Generic_L010RB.build.product_line=STM32L010xb +GenL0.menu.pnum.Generic_L010RB.build.product_line=STM32L010xB GenL0.menu.pnum.Generic_L010RB.build.variant=Generic_L010Rx # ThunderPack