uart, analog(ADC, PWM), digital validated.

Disconnects debug pins if used but debug pins can be locked if needed.

Signed-off-by: fpr <[email protected]>

Author: fpr

cores/arduino/stm32/PinAF_STM32F1.h

@@ -28,74 +28,98 @@
  *******************************************************************************
  */
 
- #ifndef _PINAF_STM32F1_H
- #define _PINAF_STM32F1_H
+#ifndef _PINAF_STM32F1_H
+#define _PINAF_STM32F1_H
 
- #include "Arduino.h"
+#ifdef STM32F1xx
 
- #ifdef __cplusplus
- extern "C" {
- #endif
+#include "Arduino.h"
 
- static inline void pin_SetF1AFPin(uint32_t afnum)
- {
-     // Enable AFIO clock
-     __HAL_RCC_AFIO_CLK_ENABLE();
+#ifdef __cplusplus
+extern "C" {
+#endif
 
-     if (afnum > 0) {
-         switch (afnum) {
-         case 1: // Remap SPI1
-             __HAL_AFIO_REMAP_SPI1_ENABLE();
-             break;
-         case 2: // Remap I2C1
-             __HAL_AFIO_REMAP_I2C1_ENABLE();
-             break;
-         case 3: // Remap USART1
-             __HAL_AFIO_REMAP_USART1_ENABLE();
-             break;
-         case 4: // Remap USART2
-             __HAL_AFIO_REMAP_USART2_ENABLE();
-             break;
-         case 5: // Partial Remap USART3
-             __HAL_AFIO_REMAP_USART3_PARTIAL();
-             break;
-         case 6: // Partial Remap TIM1
-             __HAL_AFIO_REMAP_TIM1_PARTIAL();
-             break;
-         case 7: // Partial Remap TIM3
-             __HAL_AFIO_REMAP_TIM3_PARTIAL();
-             break;
-         case 8: // Full Remap TIM2
-             __HAL_AFIO_REMAP_TIM2_ENABLE();
-             break;
-         case 9: // Full Remap TIM3
-             __HAL_AFIO_REMAP_TIM3_ENABLE();
-             break;
- #if defined(AFIO_MAPR_CAN_REMAP_REMAP1)
-         case 10: // CAN_RX mapped to PB8, CAN_TX mapped to PB9
-             __HAL_AFIO_REMAP_CAN1_2();
-             break;
-         case 11: // CAN_RX mapped to PB8, CAN_TX mapped to PB9
-             __HAL_AFIO_REMAP_CAN1_3();
-             break;
- #endif
-         case 12: // Full Remap USART3
-             __HAL_AFIO_REMAP_USART3_ENABLE();
-             break;
-         case 13: // Full Remap TIM1
-             __HAL_AFIO_REMAP_TIM1_ENABLE();
-             break;
-         case 14: // Full Remap TIM4
-             __HAL_AFIO_REMAP_TIM4_ENABLE();
-             break;
-         default:
-             break;
-         }
-     }
- }
+static inline void pinF1_DisconnectDebug(PinName pin)
+{
+  /** Enable this flag gives the possibility to use debug pins without any risk
+    * to lose traces
+    */
+#ifndef STM32F1_LOCK_DEBUG
+    // Enable AFIO clock
+    __HAL_RCC_AFIO_CLK_ENABLE();
 
- #ifdef __cplusplus
- }
- #endif
+    // Disconnect JTAG-DP + SW-DP signals.
+    // Warning: Need to reconnect under reset
+    if ((pin == PA13) || (pin == PA14)) {
+        __HAL_AFIO_REMAP_SWJ_DISABLE(); // JTAG-DP Disabled and SW-DP Disabled
+    }
+    if ((pin == PA15) || (pin == PB3) || (pin == PB4)) {
+        __HAL_AFIO_REMAP_SWJ_NOJTAG(); // JTAG-DP Disabled and SW-DP enabled
+    }
+#endif /* STM32F1_FORCE_DEBUG */
+}
 
- #endif /* _PINAF_STM32F1_H */
+static inline void pin_SetF1AFPin(uint32_t afnum)
+{
+   // Enable AFIO clock
+   __HAL_RCC_AFIO_CLK_ENABLE();
+
+   if (afnum > 0) {
+       switch (afnum) {
+       case 1: // Remap SPI1
+           __HAL_AFIO_REMAP_SPI1_ENABLE();
+           break;
+       case 2: // Remap I2C1
+           __HAL_AFIO_REMAP_I2C1_ENABLE();
+           break;
+       case 3: // Remap USART1
+           __HAL_AFIO_REMAP_USART1_ENABLE();
+           break;
+       case 4: // Remap USART2
+           __HAL_AFIO_REMAP_USART2_ENABLE();
+           break;
+       case 5: // Partial Remap USART3
+           __HAL_AFIO_REMAP_USART3_PARTIAL();
+           break;
+       case 6: // Partial Remap TIM1
+           __HAL_AFIO_REMAP_TIM1_PARTIAL();
+           break;
+       case 7: // Partial Remap TIM3
+           __HAL_AFIO_REMAP_TIM3_PARTIAL();
+           break;
+       case 8: // Full Remap TIM2
+           __HAL_AFIO_REMAP_TIM2_ENABLE();
+           break;
+       case 9: // Full Remap TIM3
+           __HAL_AFIO_REMAP_TIM3_ENABLE();
+           break;
+#if defined(AFIO_MAPR_CAN_REMAP_REMAP1)
+       case 10: // CAN_RX mapped to PB8, CAN_TX mapped to PB9
+           __HAL_AFIO_REMAP_CAN1_2();
+           break;
+       case 11: // CAN_RX mapped to PB8, CAN_TX mapped to PB9
+           __HAL_AFIO_REMAP_CAN1_3();
+           break;
+#endif
+       case 12: // Full Remap USART3
+           __HAL_AFIO_REMAP_USART3_ENABLE();
+           break;
+       case 13: // Full Remap TIM1
+           __HAL_AFIO_REMAP_TIM1_ENABLE();
+           break;
+       case 14: // Full Remap TIM4
+           __HAL_AFIO_REMAP_TIM4_ENABLE();
+           break;
+       default:
+           break;
+       }
+   }
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* STM32F1xx */
+
+#endif /* _PINAF_STM32F1_H */

cores/arduino/stm32/analog.c

@@ -50,6 +50,7 @@
 #include "hw_config.h"
 #include "analog.h"
 #include "timer.h"
+#include "PinAF_STM32F1.h"
 
 #ifdef __cplusplus
  extern "C" {
@@ -83,6 +84,7 @@
 #error "ADC SAMPLINGTIME could not be defined"
 #endif
 
+#ifndef STM32F1xx
 #ifdef ADC_CLOCK_SYNC_PCLK_DIV2
 #define ADC_CLOCK_DIV       ADC_CLOCK_SYNC_PCLK_DIV2
 #elif defined(ADC_CLOCK_ASYNC_DIV1)
@@ -92,6 +94,7 @@
 #else
 #error "ADC_CLOCK_DIV could not be defined"
 #endif
+#endif /* STM32F1xx */
 
 #ifndef ADC_REGULAR_RANK_1
 #define ADC_REGULAR_RANK_1  1
@@ -432,7 +435,8 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
 #ifdef __HAL_RCC_ADC_CLK_ENABLE
   __HAL_RCC_ADC_CLK_ENABLE();
 #endif
-#ifdef __HAL_RCC_ADC_CONFIG
+/* For STM32F1xx, ADC prescaler is confgured in SystemClock_Config (variant.cpp) */
+#if defined(__HAL_RCC_ADC_CONFIG) && !defined(STM32F1xx)
   /* ADC Periph interface clock configuration */
   __HAL_RCC_ADC_CONFIG(RCC_ADCCLKSOURCE_SYSCLK);
 #endif
@@ -557,16 +561,22 @@ uint16_t adc_read_value(PinName pin)
 
   if (AdcHandle.Instance == NP) return 0;
 
+#ifndef STM32F1xx
   AdcHandle.Init.ClockPrescaler        = ADC_CLOCK_DIV;          /* Asynchronous clock mode, input ADC clock divided */
   AdcHandle.Init.Resolution            = ADC_RESOLUTION_12B;            /* 12-bit resolution for converted data */
+#endif
   AdcHandle.Init.DataAlign             = ADC_DATAALIGN_RIGHT;           /* Right-alignment for converted data */
   AdcHandle.Init.ScanConvMode          = DISABLE;                       /* Sequencer disabled (ADC conversion on only 1 channel: channel set on rank 1) */
+#ifndef STM32F1xx
   AdcHandle.Init.EOCSelection          = ADC_EOC_SINGLE_CONV;           /* EOC flag picked-up to indicate conversion end */
+#endif
   AdcHandle.Init.ContinuousConvMode    = DISABLE;                       /* Continuous mode disabled to have only 1 conversion at each conversion trig */
   AdcHandle.Init.DiscontinuousConvMode = DISABLE;                       /* Parameter discarded because sequencer is disabled */
   AdcHandle.Init.ExternalTrigConv      = ADC_SOFTWARE_START;            /* Software start to trig the 1st conversion manually, without external event */
+#ifndef STM32F1xx
   AdcHandle.Init.ExternalTrigConvEdge  = ADC_EXTERNALTRIGCONVEDGE_NONE; /* Parameter discarded because software trigger chosen */
   AdcHandle.Init.DMAContinuousRequests = DISABLE;                       /* DMA one-shot mode selected (not applied to this example) */
+#endif
   AdcHandle.State = HAL_ADC_STATE_RESET;
 #if defined (STM32F0xx) || defined (STM32L0xx)
   AdcHandle.Init.LowPowerAutoWait      = DISABLE;                       /* Auto-delayed conversion feature disabled */
@@ -687,7 +697,11 @@ void HAL_TIM_PWM_MspInit(TIM_HandleTypeDef *htim)
   GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
   GPIO_InitStruct.Pull = GPIO_NOPULL;
   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_HIGH;
+#ifdef STM32F1xx
+  pin_SetF1AFPin(STM_PIN_AFNUM(function));
+#else
   GPIO_InitStruct.Alternate = STM_PIN_AFNUM(function);
+#endif /* STM32F1xx */
   GPIO_InitStruct.Pin = STM_GPIO_PIN(g_current_pin);
 
   HAL_GPIO_Init(port, &GPIO_InitStruct);

cores/arduino/stm32/digital_io.c

@@ -38,6 +38,7 @@
 #include "digital_io.h"
 #include "stm32_def.h"
 #include "hw_config.h"
+#include "PinAF_STM32F1.h"
 
 #ifdef __cplusplus
  extern "C" {
@@ -59,6 +60,9 @@ void digital_io_init(PinName pin, uint32_t mode, uint32_t pull)
   GPIO_InitStructure.Speed = GPIO_SPEED_FREQ_HIGH;
   GPIO_InitStructure.Mode = mode;
   GPIO_InitStructure.Pull = pull;
+#ifdef STM32F1xx
+  pinF1_DisconnectDebug(pin);
+#endif /* STM32F1xx */
   HAL_GPIO_Init(port, &GPIO_InitStructure);
 }
 

cores/arduino/stm32/uart.c

@@ -51,6 +51,7 @@
 #include "digital_io.h"
 #include "interrupt.h"
 #include "variant.h"
+#include "PinAF_STM32F1.h"
 
 #ifdef __cplusplus
  extern "C" {
@@ -215,7 +216,11 @@ void uart_init(serial_t *obj)
   GPIO_InitStruct.Mode        = STM_PIN_MODE(pinmap_function(obj->pin_rx,PinMap_UART_RX));
   GPIO_InitStruct.Speed       = GPIO_SPEED_FREQ_HIGH;
   GPIO_InitStruct.Pull        = STM_PIN_PUPD(pinmap_function(obj->pin_rx,PinMap_UART_RX));
+#ifdef STM32F1xx
+  pin_SetF1AFPin(STM_PIN_AFNUM(pinmap_function(obj->pin_rx,PinMap_UART_RX)));
+#else
   GPIO_InitStruct.Alternate   = STM_PIN_AFNUM(pinmap_function(obj->pin_rx,PinMap_UART_RX));
+#endif /* STM32F1xx */
   HAL_GPIO_Init(port, &GPIO_InitStruct);
 
   //TX
@@ -224,7 +229,11 @@ void uart_init(serial_t *obj)
   GPIO_InitStruct.Mode        = STM_PIN_MODE(pinmap_function(obj->pin_tx,PinMap_UART_TX));
   GPIO_InitStruct.Speed       = GPIO_SPEED_FREQ_HIGH;
   GPIO_InitStruct.Pull        = STM_PIN_PUPD(pinmap_function(obj->pin_tx,PinMap_UART_TX));
+#ifdef STM32F1xx
+  pin_SetF1AFPin(STM_PIN_AFNUM(pinmap_function(obj->pin_tx,PinMap_UART_TX)));
+#else
   GPIO_InitStruct.Alternate   = STM_PIN_AFNUM(pinmap_function(obj->pin_tx,PinMap_UART_TX));
+#endif /* STM32F1xx */
   HAL_GPIO_Init(port, &GPIO_InitStruct);
 
   //Configure uart
@@ -519,7 +528,7 @@ void HAL_UART_TxCpltCallback(UART_HandleTypeDef *huart) {
 void HAL_UART_ErrorCallback(UART_HandleTypeDef *huart)
 {
   volatile uint32_t tmpval;
-#ifdef STM32F4xx
+#if defined(STM32F4xx) || defined(STM32F1xx)
   if (__HAL_UART_GET_FLAG(huart, UART_FLAG_PE) != RESET) {
     tmpval = huart->Instance->DR; // Clear PE flag
   } else if (__HAL_UART_GET_FLAG(huart, UART_FLAG_FE) != RESET) {
@@ -659,4 +668,5 @@ void UART8_IRQHandler(void)
 }
 #endif
 
+
 /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

variants/NUCLEO_F103RB/variant.cpp

@@ -91,20 +91,25 @@ const PinName digital_arduino[] = {
  * UART objects
  */
 
-// HardwareSerial Serial(PA3, PA2);    // Connected to ST-Link
-// HardwareSerial Serial1(PA10, PA9);
-//
-// void serialEvent() __attribute__((weak));
-// void serialEvent() { }
-//
-// void serialEvent1() __attribute__((weak));
-// void serialEvent1() { }
-//
-// void serialEventRun(void)
-// {
-//   if (Serial.available()) serialEvent();
-//   if (Serial1.available()) serialEvent1();
-// }
+HardwareSerial Serial(PA3, PA2);    // Connected to ST-Link
+HardwareSerial Serial1(PA10, PA9);
+HardwareSerial Serial2(PC11, PC10); //Morpho pins
+
+void serialEvent() __attribute__((weak));
+void serialEvent() { }
+
+void serialEvent1() __attribute__((weak));
+void serialEvent1() { }
+
+void serialEvent2() __attribute__((weak));
+void serialEvent2() { }
+
+void serialEventRun(void)
+{
+  if (Serial.available()) serialEvent();
+  if (Serial1.available()) serialEvent1();
+  if (Serial2.available()) serialEvent2();
+}
 
 // ----------------------------------------------------------------------------
 

variants/NUCLEO_F103RB/variant.h

@@ -152,6 +152,7 @@ uint32_t pinNametoPinNumber(PinName p);
 #ifdef __cplusplus
 extern HardwareSerial Serial;
 extern HardwareSerial Serial1;
+extern HardwareSerial Serial2;
 
 // 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