diff --git a/.cproject b/.cproject
index d05fa9c..aea3950 100644
--- a/.cproject
+++ b/.cproject
@@ -14,12 +14,12 @@
-
+
-
+
@@ -34,7 +34,7 @@
-
+
@@ -87,8 +87,8 @@
-
-
+
+
diff --git a/.mxproject b/.mxproject
index a24093e..e105cff 100644
--- a/.mxproject
+++ b/.mxproject
@@ -1,12 +1,12 @@
-[PreviousLibFiles]
-LibFiles=Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c;Drivers/CMSIS/Include/core_cmInstr.h;Drivers/CMSIS/Include/core_cm0plus.h;Drivers/CMSIS/Include/core_sc000.h;Drivers/CMSIS/Include/arm_const_structs.h;Drivers/CMSIS/Include/core_sc300.h;Drivers/CMSIS/Include/core_cm7.h;Drivers/CMSIS/Include/core_cmFunc.h;Drivers/CMSIS/Include/cmsis_armcc.h;Drivers/CMSIS/Include/arm_math.h;Drivers/CMSIS/Include/cmsis_armcc_V6.h;Drivers/CMSIS/Include/core_cm3.h;Drivers/CMSIS/Include/core_cmSimd.h;Drivers/CMSIS/Include/core_cm0.h;Drivers/CMSIS/Include/cmsis_gcc.h;Drivers/CMSIS/Include/core_cm4.h;Drivers/CMSIS/Include/arm_common_tables.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f102x6.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xe.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xg.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xe.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101x6.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xe.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f105xc.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f102xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xg.h;
-
[PreviousGenFiles]
-HeaderPath=/home/ondra/devel/f103-simon/Inc
-SourcePath=/home/ondra/devel/f103-simon/Src
+HeaderPath=/home/ondra/devel/f103-bluepill/Inc
+SourcePath=/home/ondra/devel/f103-bluepill/Src
SourceFiles=gpio.h;usart.h;stm32f1xx_it.h;stm32f1xx_hal_conf.h;mxconstants.h;gpio.c;usart.c;stm32f1xx_it.c;stm32f1xx_hal_msp.c;main.c;
HeaderFiles=gpio.h;usart.h;stm32f1xx_it.h;stm32f1xx_hal_conf.h;mxconstants.h;
+[PreviousLibFiles]
+LibFiles=Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_tim_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_uart.h;Drivers/STM32F1xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_rcc_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_gpio_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma_ex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_dma.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_cortex.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_pwr.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash.h;Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_flash_ex.h;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c;Drivers/CMSIS/Include/core_cmInstr.h;Drivers/CMSIS/Include/core_cm0plus.h;Drivers/CMSIS/Include/core_sc000.h;Drivers/CMSIS/Include/arm_const_structs.h;Drivers/CMSIS/Include/core_sc300.h;Drivers/CMSIS/Include/core_cm7.h;Drivers/CMSIS/Include/core_cmFunc.h;Drivers/CMSIS/Include/cmsis_armcc.h;Drivers/CMSIS/Include/arm_math.h;Drivers/CMSIS/Include/cmsis_armcc_V6.h;Drivers/CMSIS/Include/core_cm3.h;Drivers/CMSIS/Include/core_cmSimd.h;Drivers/CMSIS/Include/core_cm0.h;Drivers/CMSIS/Include/cmsis_gcc.h;Drivers/CMSIS/Include/core_cm4.h;Drivers/CMSIS/Include/arm_common_tables.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f102x6.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103x6.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f100xe.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xg.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/system_stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f1xx.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xe.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101x6.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xe.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f107xc.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f103xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f105xc.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f102xb.h;Drivers/CMSIS/Device/ST/STM32F1xx/Include/stm32f101xg.h;
+
[PreviousUsedRideFiles]
HeaderPath=../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Include;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;
SourceFiles=../Src/main.c;../Src/gpio.c;../Src/usart.c;../Src/stm32f1xx_it.c;../Src/stm32f1xx_hal_msp.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.c;../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.c;../Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/system_stm32f1xx.c;../Drivers/CMSIS/Device/ST/STM32F1xx/Source/Templates/gcc/startup_stm32f103xb.s;
diff --git a/.project b/.project
index e1a209c..b6b20f1 100644
--- a/.project
+++ b/.project
@@ -1,6 +1,6 @@
- f103-simon
+ f103-bluepill
diff --git a/Inc/mxconstants.h b/Inc/mxconstants.h
index dc63104..0e9f6ba 100644
--- a/Inc/mxconstants.h
+++ b/Inc/mxconstants.h
@@ -43,16 +43,6 @@
#define LED1_Pin GPIO_PIN_13
#define LED1_GPIO_Port GPIOC
-#define RGB_DOUT_Pin GPIO_PIN_11
-#define RGB_DOUT_GPIO_Port GPIOB
-#define BTN1_Pin GPIO_PIN_5
-#define BTN1_GPIO_Port GPIOB
-#define BTN2_Pin GPIO_PIN_6
-#define BTN2_GPIO_Port GPIOB
-#define BTN3_Pin GPIO_PIN_7
-#define BTN3_GPIO_Port GPIOB
-#define BTN4_Pin GPIO_PIN_8
-#define BTN4_GPIO_Port GPIOB
/* USER CODE BEGIN Private defines */
/* USER CODE END Private defines */
diff --git a/Src/gpio.c b/Src/gpio.c
index 0c0d2b4..b9ced21 100644
--- a/Src/gpio.c
+++ b/Src/gpio.c
@@ -60,33 +60,17 @@ void MX_GPIO_Init(void)
/* GPIO Ports Clock Enable */
__HAL_RCC_GPIOC_CLK_ENABLE();
__HAL_RCC_GPIOD_CLK_ENABLE();
- __HAL_RCC_GPIOB_CLK_ENABLE();
__HAL_RCC_GPIOA_CLK_ENABLE();
/*Configure GPIO pin Output Level */
HAL_GPIO_WritePin(LED1_GPIO_Port, LED1_Pin, GPIO_PIN_RESET);
- /*Configure GPIO pin Output Level */
- HAL_GPIO_WritePin(RGB_DOUT_GPIO_Port, RGB_DOUT_Pin, GPIO_PIN_RESET);
-
/*Configure GPIO pin : PtPin */
GPIO_InitStruct.Pin = LED1_Pin;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
HAL_GPIO_Init(LED1_GPIO_Port, &GPIO_InitStruct);
- /*Configure GPIO pin : PtPin */
- GPIO_InitStruct.Pin = RGB_DOUT_Pin;
- GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
- GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_MEDIUM;
- HAL_GPIO_Init(RGB_DOUT_GPIO_Port, &GPIO_InitStruct);
-
- /*Configure GPIO pins : PBPin PBPin PBPin PBPin */
- GPIO_InitStruct.Pin = BTN1_Pin|BTN2_Pin|BTN3_Pin|BTN4_Pin;
- GPIO_InitStruct.Mode = GPIO_MODE_INPUT;
- GPIO_InitStruct.Pull = GPIO_PULLUP;
- HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-
}
/* USER CODE BEGIN 2 */
diff --git a/Src/stm32f1xx_it.c b/Src/stm32f1xx_it.c
index 4b3dd24..924c1d8 100644
--- a/Src/stm32f1xx_it.c
+++ b/Src/stm32f1xx_it.c
@@ -36,7 +36,53 @@
#include "stm32f1xx_it.h"
/* USER CODE BEGIN 0 */
-
+#include "utils/debug.h"
+/**
+ * Hard Fault diagnosis function (for use with debugger)
+ *
+ * Source:
+ * http://www.freertos.org/Debugging-Hard-Faults-On-Cortex-M-Microcontrollers.html
+ */
+static void __attribute__((noreturn)) __attribute__((used))
+prvGetRegistersFromStack(uint32_t *pulFaultStackAddress)
+{
+ /* These are volatile to try and prevent the compiler/linker optimising them
+ away as the variables never actually get used. If the debugger won't show the
+ values of the variables, make them global my moving their declaration outside
+ of this function. */
+ volatile __attribute__((unused)) uint32_t r0;
+ volatile __attribute__((unused)) uint32_t r1;
+ volatile __attribute__((unused)) uint32_t r2;
+ volatile __attribute__((unused)) uint32_t r3;
+ volatile __attribute__((unused)) uint32_t r12;
+ volatile __attribute__((unused)) uint32_t lr; /* Link register. */
+ volatile __attribute__((unused)) uint32_t pc; /* Program counter. */
+ volatile __attribute__((unused)) uint32_t psr;/* Program status register. */
+
+ r0 = pulFaultStackAddress[ 0 ];
+ r1 = pulFaultStackAddress[ 1 ];
+ r2 = pulFaultStackAddress[ 2 ];
+ r3 = pulFaultStackAddress[ 3 ];
+
+ r12 = pulFaultStackAddress[ 4 ];
+ lr = pulFaultStackAddress[ 5 ];
+ pc = pulFaultStackAddress[ 6 ];
+ psr = pulFaultStackAddress[ 7 ];
+
+ error("Hard fault.");
+
+ dbg("r0 = 0x%08"PRIu32, r0);
+ dbg("r1 = 0x%08"PRIu32, r1);
+ dbg("r2 = 0x%08"PRIu32, r2);
+ dbg("r3 = 0x%08"PRIu32, r3);
+ dbg("r12 = 0x%08"PRIu32, r12);
+ dbg("LR = 0x%08"PRIu32, lr);
+ dbg("PC = 0x%08"PRIu32, pc);
+ dbg("PSR = 0x%08"PRIu32, psr);
+
+ /* When the following line is hit, the variables contain the register values. */
+ for (;;);
+}
/* USER CODE END 0 */
/* External variables --------------------------------------------------------*/
@@ -65,6 +111,20 @@ void HardFault_Handler(void)
{
/* USER CODE BEGIN HardFault_IRQn 0 */
+ // Branch to HF reporting routine
+
+ __asm volatile (
+ " tst lr, #4 \n"
+ " ite eq \n"
+ " mrseq r0, msp \n"
+ " mrsne r0, psp \n"
+ " ldr r1, [r0, #24] \n"
+ " ldr r2, =prvGetRegistersFromStack \n"
+ " bx r2 \n"
+ );
+
+ // NOTE: Dead code follows
+
/* USER CODE END HardFault_IRQn 0 */
while (1)
{
@@ -80,7 +140,7 @@ void HardFault_Handler(void)
void MemManage_Handler(void)
{
/* USER CODE BEGIN MemoryManagement_IRQn 0 */
-
+ error("Memory management fault.");
/* USER CODE END MemoryManagement_IRQn 0 */
while (1)
{
@@ -96,7 +156,7 @@ void MemManage_Handler(void)
void BusFault_Handler(void)
{
/* USER CODE BEGIN BusFault_IRQn 0 */
-
+ error("Prefetch fault.");
/* USER CODE END BusFault_IRQn 0 */
while (1)
{
@@ -112,7 +172,7 @@ void BusFault_Handler(void)
void UsageFault_Handler(void)
{
/* USER CODE BEGIN UsageFault_IRQn 0 */
-
+ error("Usage fault.");
/* USER CODE END UsageFault_IRQn 0 */
while (1)
{
diff --git a/User/handlers.c b/User/handlers.c
index 3bd76b9..bf6301e 100644
--- a/User/handlers.c
+++ b/User/handlers.c
@@ -8,7 +8,7 @@
#include "handlers.h"
/**
- * @brief Handle a button press
+ * @brief Handle a button press. Delete if not needed - a possible callback for debouncer.
* @param button: button identifier
* @param press: press state (1 = just pressed, 0 = just released)
*/
diff --git a/User/init.c b/User/init.c
index 51b4e1a..f80314c 100644
--- a/User/init.c
+++ b/User/init.c
@@ -15,21 +15,9 @@ static void init_buttons()
debo.GPIOx = GPIOB; // All buttons are on port B
debo.callback = ButtonHandler;
- debo.pin = BTN1_Pin;
- debo.cb_payload = 1;
- debo_register_pin(&debo);
-
- debo.pin = BTN2_Pin;
- debo.cb_payload = 2;
- debo_register_pin(&debo);
-
- debo.pin = BTN3_Pin;
- debo.cb_payload = 3;
- debo_register_pin(&debo);
-
- debo.pin = BTN4_Pin;
- debo.cb_payload = 4;
- debo_register_pin(&debo);
+ //debo.pin = BTN1_Pin;
+ //debo.cb_payload = 1;
+ //debo_register_pin(&debo);
}
/** Init the application */
diff --git a/f103-bluepill.ioc b/f103-bluepill.ioc
index 31eb5c1..9b32b20 100644
--- a/f103-bluepill.ioc
+++ b/f103-bluepill.ioc
@@ -11,23 +11,18 @@ Mcu.Name=STM32F103C(8-B)Tx
Mcu.Package=LQFP48
Mcu.Pin0=PC13-TAMPER-RTC
Mcu.Pin1=PC14-OSC32_IN
-Mcu.Pin10=PB7
-Mcu.Pin11=PB8
-Mcu.Pin12=VP_SYS_VS_ND
-Mcu.Pin13=VP_SYS_VS_Systick
Mcu.Pin2=PC15-OSC32_OUT
Mcu.Pin3=PD0-OSC_IN
Mcu.Pin4=PD1-OSC_OUT
-Mcu.Pin5=PB11
-Mcu.Pin6=PA9
-Mcu.Pin7=PA10
-Mcu.Pin8=PB5
-Mcu.Pin9=PB6
-Mcu.PinsNb=14
+Mcu.Pin5=PA9
+Mcu.Pin6=PA10
+Mcu.Pin7=VP_SYS_VS_ND
+Mcu.Pin8=VP_SYS_VS_Systick
+Mcu.PinsNb=9
Mcu.UserConstants=
Mcu.UserName=STM32F103C8Tx
-MxCube.Version=4.15.1
-MxDb.Version=DB.4.0.151
+MxCube.Version=4.16.0
+MxDb.Version=DB.4.0.160
NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true
NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true
NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true
@@ -42,31 +37,6 @@ PA10.Mode=Asynchronous
PA10.Signal=USART1_RX
PA9.Mode=Asynchronous
PA9.Signal=USART1_TX
-PB11.GPIOParameters=GPIO_Speed,GPIO_Label
-PB11.GPIO_Label=RGB_DOUT
-PB11.GPIO_Speed=GPIO_SPEED_FREQ_MEDIUM
-PB11.Locked=true
-PB11.Signal=GPIO_Output
-PB5.GPIOParameters=GPIO_PuPd,GPIO_Label
-PB5.GPIO_Label=BTN1
-PB5.GPIO_PuPd=GPIO_PULLUP
-PB5.Locked=true
-PB5.Signal=GPIO_Input
-PB6.GPIOParameters=GPIO_PuPd,GPIO_Label
-PB6.GPIO_Label=BTN2
-PB6.GPIO_PuPd=GPIO_PULLUP
-PB6.Locked=true
-PB6.Signal=GPIO_Input
-PB7.GPIOParameters=GPIO_PuPd,GPIO_Label
-PB7.GPIO_Label=BTN3
-PB7.GPIO_PuPd=GPIO_PULLUP
-PB7.Locked=true
-PB7.Signal=GPIO_Input
-PB8.GPIOParameters=GPIO_PuPd,GPIO_Label
-PB8.GPIO_Label=BTN4
-PB8.GPIO_PuPd=GPIO_PULLUP
-PB8.Locked=true
-PB8.Signal=GPIO_Input
PC13-TAMPER-RTC.GPIOParameters=GPIO_Label
PC13-TAMPER-RTC.GPIO_Label=LED1
PC13-TAMPER-RTC.Locked=true
@@ -78,7 +48,7 @@ PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
PCC.Checker=false
PCC.Line=STM32F103
PCC.MCU=STM32F103C(8-B)Tx
-PCC.MXVersion=4.15.1
+PCC.MXVersion=4.16.0
PCC.PartNumber=STM32F103C8Tx
PCC.Seq0=0
PCC.Series=STM32F1
@@ -104,8 +74,8 @@ ProjectManager.LastFirmware=true
ProjectManager.LibraryCopy=1
ProjectManager.PreviousToolchain=SW4STM32
ProjectManager.ProjectBuild=false
-ProjectManager.ProjectFileName=f103-simon.ioc
-ProjectManager.ProjectName=f103-simon
+ProjectManager.ProjectFileName=f103-bluepill.ioc
+ProjectManager.ProjectName=f103-bluepill
ProjectManager.StackSize=0x400
ProjectManager.TargetToolchain=SW4STM32
ProjectManager.ToolChainLocation=/home/ondra/devel/f103-simon
@@ -137,4 +107,4 @@ VP_SYS_VS_ND.Mode=No_Debug
VP_SYS_VS_ND.Signal=SYS_VS_ND
VP_SYS_VS_Systick.Mode=SysTick
VP_SYS_VS_Systick.Signal=SYS_VS_Systick
-board=f103-simon
+board=f103-bluepill
diff --git a/f103-bluepill.xml b/f103-bluepill.xml
index 5f73183..a9a7eb3 100644
--- a/f103-bluepill.xml
+++ b/f103-bluepill.xml
@@ -1,6 +1,6 @@
-
+
f103-bluepill
STM32F103C8Tx
SWD