mirror of https://github.com/ARMmbed/mbed-os.git
[NUCLEO_F401RE] Add LSE configuration for RTC, remove trailing spaces, typo corrections
parent
16b63bab2c
commit
aba7d50e7d
|
@ -26,14 +26,13 @@
|
|||
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*/
|
||||
#include "analogin_api.h"
|
||||
#include "wait_api.h"
|
||||
|
||||
#if DEVICE_ANALOGIN
|
||||
|
||||
#include "wait_api.h"
|
||||
#include "cmsis.h"
|
||||
#include "pinmap.h"
|
||||
#include "error.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
static const PinMap PinMap_ADC[] = {
|
||||
{PA_0, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN0
|
||||
|
@ -60,7 +59,7 @@ ADC_HandleTypeDef AdcHandle;
|
|||
int adc_inited = 0;
|
||||
|
||||
void analogin_init(analogin_t *obj, PinName pin) {
|
||||
// Get the peripheral name (ADC_1, ADC_2...) from the pin and assign it to the object
|
||||
// Get the peripheral name from the pin and assign it to the object
|
||||
obj->adc = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
|
||||
|
||||
if (obj->adc == (ADCName)NC) {
|
||||
|
@ -99,91 +98,87 @@ void analogin_init(analogin_t *obj, PinName pin) {
|
|||
}
|
||||
|
||||
static inline uint16_t adc_read(analogin_t *obj) {
|
||||
ADC_ChannelConfTypeDef sConfig;
|
||||
ADC_ChannelConfTypeDef sConfig;
|
||||
|
||||
AdcHandle.Instance = (ADC_TypeDef *)(obj->adc);
|
||||
AdcHandle.Instance = (ADC_TypeDef *)(obj->adc);
|
||||
|
||||
// Configure ADC channel
|
||||
sConfig.Rank = 1;
|
||||
sConfig.SamplingTime = ADC_SAMPLETIME_3CYCLES;
|
||||
sConfig.Offset = 0;
|
||||
// Configure ADC channel
|
||||
sConfig.Rank = 1;
|
||||
sConfig.SamplingTime = ADC_SAMPLETIME_3CYCLES;
|
||||
sConfig.Offset = 0;
|
||||
|
||||
switch (obj->pin) {
|
||||
case PA_0:
|
||||
sConfig.Channel = ADC_CHANNEL_0;
|
||||
break;
|
||||
case PA_1:
|
||||
sConfig.Channel = ADC_CHANNEL_1;
|
||||
break;
|
||||
case PA_2:
|
||||
sConfig.Channel = ADC_CHANNEL_2;
|
||||
break;
|
||||
case PA_3:
|
||||
sConfig.Channel = ADC_CHANNEL_3;
|
||||
break;
|
||||
case PA_4:
|
||||
sConfig.Channel = ADC_CHANNEL_4;
|
||||
break;
|
||||
case PA_5:
|
||||
sConfig.Channel = ADC_CHANNEL_5;
|
||||
break;
|
||||
case PA_6:
|
||||
sConfig.Channel = ADC_CHANNEL_6;
|
||||
break;
|
||||
case PA_7:
|
||||
sConfig.Channel = ADC_CHANNEL_7;
|
||||
break;
|
||||
case PB_0:
|
||||
sConfig.Channel = ADC_CHANNEL_8;
|
||||
break;
|
||||
case PB_1:
|
||||
sConfig.Channel = ADC_CHANNEL_9;
|
||||
break;
|
||||
case PC_0:
|
||||
sConfig.Channel = ADC_CHANNEL_10;
|
||||
break;
|
||||
case PC_1:
|
||||
sConfig.Channel = ADC_CHANNEL_11;
|
||||
break;
|
||||
case PC_2:
|
||||
sConfig.Channel = ADC_CHANNEL_12;
|
||||
break;
|
||||
case PC_3:
|
||||
sConfig.Channel = ADC_CHANNEL_13;
|
||||
break;
|
||||
case PC_4:
|
||||
sConfig.Channel = ADC_CHANNEL_14;
|
||||
break;
|
||||
case PC_5:
|
||||
sConfig.Channel = ADC_CHANNEL_15;
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
switch (obj->pin) {
|
||||
case PA_0:
|
||||
sConfig.Channel = ADC_CHANNEL_0;
|
||||
break;
|
||||
case PA_1:
|
||||
sConfig.Channel = ADC_CHANNEL_1;
|
||||
break;
|
||||
case PA_2:
|
||||
sConfig.Channel = ADC_CHANNEL_2;
|
||||
break;
|
||||
case PA_3:
|
||||
sConfig.Channel = ADC_CHANNEL_3;
|
||||
break;
|
||||
case PA_4:
|
||||
sConfig.Channel = ADC_CHANNEL_4;
|
||||
break;
|
||||
case PA_5:
|
||||
sConfig.Channel = ADC_CHANNEL_5;
|
||||
break;
|
||||
case PA_6:
|
||||
sConfig.Channel = ADC_CHANNEL_6;
|
||||
break;
|
||||
case PA_7:
|
||||
sConfig.Channel = ADC_CHANNEL_7;
|
||||
break;
|
||||
case PB_0:
|
||||
sConfig.Channel = ADC_CHANNEL_8;
|
||||
break;
|
||||
case PB_1:
|
||||
sConfig.Channel = ADC_CHANNEL_9;
|
||||
break;
|
||||
case PC_0:
|
||||
sConfig.Channel = ADC_CHANNEL_10;
|
||||
break;
|
||||
case PC_1:
|
||||
sConfig.Channel = ADC_CHANNEL_11;
|
||||
break;
|
||||
case PC_2:
|
||||
sConfig.Channel = ADC_CHANNEL_12;
|
||||
break;
|
||||
case PC_3:
|
||||
sConfig.Channel = ADC_CHANNEL_13;
|
||||
break;
|
||||
case PC_4:
|
||||
sConfig.Channel = ADC_CHANNEL_14;
|
||||
break;
|
||||
case PC_5:
|
||||
sConfig.Channel = ADC_CHANNEL_15;
|
||||
break;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
|
||||
HAL_ADC_ConfigChannel(&AdcHandle, &sConfig);
|
||||
HAL_ADC_ConfigChannel(&AdcHandle, &sConfig);
|
||||
|
||||
HAL_ADC_Start(&AdcHandle); // Start conversion
|
||||
HAL_ADC_Start(&AdcHandle); // Start conversion
|
||||
|
||||
HAL_ADC_PollForConversion(&AdcHandle, 10); // Wait end of conversion
|
||||
|
||||
if (HAL_ADC_GetState(&AdcHandle) == HAL_ADC_STATE_EOC_REG)
|
||||
{
|
||||
return(HAL_ADC_GetValue(&AdcHandle)); // Get conversion value
|
||||
}
|
||||
else
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
// Wait end of conversion and get value
|
||||
if (HAL_ADC_PollForConversion(&AdcHandle, 10) == HAL_OK) {
|
||||
return (HAL_ADC_GetValue(&AdcHandle));
|
||||
} else {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
uint16_t analogin_read_u16(analogin_t *obj) {
|
||||
return(adc_read(obj));
|
||||
return (adc_read(obj));
|
||||
}
|
||||
|
||||
float analogin_read(analogin_t *obj) {
|
||||
uint16_t value = adc_read(obj);
|
||||
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
|
||||
uint16_t value = adc_read(obj);
|
||||
return (float)value * (1.0f / (float)0xFFF); // 12 bits range
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#include "gpio_api.h"
|
||||
#include "pinmap.h"
|
||||
#include "error.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
|
||||
|
||||
|
@ -66,8 +65,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) {
|
|||
void gpio_dir(gpio_t *obj, PinDirection direction) {
|
||||
if (direction == PIN_OUTPUT) {
|
||||
pin_function(obj->pin, STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0));
|
||||
}
|
||||
else { // PIN_INPUT
|
||||
} else { // PIN_INPUT
|
||||
pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,10 +29,8 @@
|
|||
*/
|
||||
#include <stddef.h>
|
||||
#include "cmsis.h"
|
||||
|
||||
#include "gpio_irq_api.h"
|
||||
#include "pinmap.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
#include "error.h"
|
||||
|
||||
#define EDGE_NONE (0)
|
||||
|
@ -54,8 +52,7 @@ static void handle_interrupt_in(uint32_t irq_index) {
|
|||
uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]);
|
||||
|
||||
// Clear interrupt flag
|
||||
if (__HAL_GPIO_EXTI_GET_FLAG(pin) != RESET)
|
||||
{
|
||||
if (__HAL_GPIO_EXTI_GET_FLAG(pin) != RESET) {
|
||||
__HAL_GPIO_EXTI_CLEAR_FLAG(pin);
|
||||
}
|
||||
|
||||
|
@ -64,20 +61,40 @@ static void handle_interrupt_in(uint32_t irq_index) {
|
|||
// Check which edge has generated the irq
|
||||
if ((gpio->IDR & pin) == 0) {
|
||||
irq_handler(channel_ids[irq_index], IRQ_FALL);
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
irq_handler(channel_ids[irq_index], IRQ_RISE);
|
||||
}
|
||||
}
|
||||
|
||||
// The irq_index is passed to the function
|
||||
static void gpio_irq0(void) {handle_interrupt_in(0);} // EXTI line 0
|
||||
static void gpio_irq1(void) {handle_interrupt_in(1);} // EXTI line 1
|
||||
static void gpio_irq2(void) {handle_interrupt_in(2);} // EXTI line 2
|
||||
static void gpio_irq3(void) {handle_interrupt_in(3);} // EXTI line 3
|
||||
static void gpio_irq4(void) {handle_interrupt_in(4);} // EXTI line 4
|
||||
static void gpio_irq5(void) {handle_interrupt_in(5);} // EXTI lines 5 to 9
|
||||
static void gpio_irq6(void) {handle_interrupt_in(6);} // EXTI lines 10 to 15
|
||||
// EXTI line 0
|
||||
static void gpio_irq0(void) {
|
||||
handle_interrupt_in(0);
|
||||
}
|
||||
// EXTI line 1
|
||||
static void gpio_irq1(void) {
|
||||
handle_interrupt_in(1);
|
||||
}
|
||||
// EXTI line 2
|
||||
static void gpio_irq2(void) {
|
||||
handle_interrupt_in(2);
|
||||
}
|
||||
// EXTI line 3
|
||||
static void gpio_irq3(void) {
|
||||
handle_interrupt_in(3);
|
||||
}
|
||||
// EXTI line 4
|
||||
static void gpio_irq4(void) {
|
||||
handle_interrupt_in(4);
|
||||
}
|
||||
// EXTI lines 5 to 9
|
||||
static void gpio_irq5(void) {
|
||||
handle_interrupt_in(5);
|
||||
}
|
||||
// EXTI lines 10 to 15
|
||||
static void gpio_irq6(void) {
|
||||
handle_interrupt_in(6);
|
||||
}
|
||||
|
||||
extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
|
||||
|
||||
|
@ -138,7 +155,7 @@ int gpio_irq_init(gpio_irq_t *obj, PinName pin, gpio_irq_handler handler, uint32
|
|||
irq_index = 6;
|
||||
break;
|
||||
default:
|
||||
error("InterruptIn error: pin not supported.");
|
||||
error("InterruptIn error: pin not supported.\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -187,8 +204,7 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) {
|
|||
if ((obj->event == EDGE_FALL) || (obj->event == EDGE_BOTH)) {
|
||||
mode = STM_MODE_IT_RISING_FALLING;
|
||||
obj->event = EDGE_BOTH;
|
||||
}
|
||||
else { // NONE or RISE
|
||||
} else { // NONE or RISE
|
||||
mode = STM_MODE_IT_RISING;
|
||||
obj->event = EDGE_RISE;
|
||||
}
|
||||
|
@ -198,14 +214,12 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) {
|
|||
if ((obj->event == EDGE_RISE) || (obj->event == EDGE_BOTH)) {
|
||||
mode = STM_MODE_IT_RISING_FALLING;
|
||||
obj->event = EDGE_BOTH;
|
||||
}
|
||||
else { // NONE or FALL
|
||||
} else { // NONE or FALL
|
||||
mode = STM_MODE_IT_FALLING;
|
||||
obj->event = EDGE_FALL;
|
||||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
mode = STM_MODE_INPUT;
|
||||
pull = GPIO_NOPULL;
|
||||
obj->event = EDGE_NONE;
|
||||
|
|
|
@ -50,8 +50,7 @@ typedef struct {
|
|||
static inline void gpio_write(gpio_t *obj, int value) {
|
||||
if (value) {
|
||||
*obj->reg_set = obj->mask;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
*obj->reg_clr = obj->mask;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -34,7 +34,6 @@
|
|||
#include "cmsis.h"
|
||||
#include "pinmap.h"
|
||||
#include "error.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
/* Timeout values for flags and events waiting loops. These timeouts are
|
||||
not based on accurate values, they just guarantee that the application will
|
||||
|
@ -131,9 +130,9 @@ inline int i2c_start(i2c_t *obj) {
|
|||
// Wait the START condition has been correctly sent
|
||||
timeout = FLAG_TIMEOUT;
|
||||
while (__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_SB) == RESET) {
|
||||
if ((timeout--) == 0) {
|
||||
return 1;
|
||||
}
|
||||
if ((timeout--) == 0) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
@ -189,9 +188,9 @@ int i2c_byte_read(i2c_t *obj, int last) {
|
|||
// Wait until the byte is received
|
||||
timeout = FLAG_TIMEOUT;
|
||||
while (__HAL_I2C_GET_FLAG(&I2cHandle, I2C_FLAG_RXNE) == RESET) {
|
||||
if ((timeout--) == 0) {
|
||||
return 0;
|
||||
}
|
||||
if ((timeout--) == 0) {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
return (int)i2c->DR;
|
||||
|
|
|
@ -0,0 +1,34 @@
|
|||
/* mbed Microcontroller Library
|
||||
* Copyright (c) 2014, STMicroelectronics
|
||||
* All rights reserved.
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
#include "cmsis.h"
|
||||
|
||||
// This function is called after RAM initialization and before main.
|
||||
void mbed_sdk_init() {
|
||||
// Update the SystemCoreClock variable.
|
||||
SystemCoreClockUpdate();
|
||||
}
|
|
@ -30,7 +30,6 @@
|
|||
#include "pinmap.h"
|
||||
#include "PortNames.h"
|
||||
#include "error.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
// GPIO mode look-up table
|
||||
static const uint32_t gpio_mode[12] = {
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#include "pinmap.h"
|
||||
#include "gpio_api.h"
|
||||
#include "error.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
#if DEVICE_PORTIN || DEVICE_PORTOUT
|
||||
|
||||
|
@ -40,7 +39,7 @@ extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
|
|||
// high nibble = port number (0=A, 1=B, 2=C, 3=D, 4=E, 5=F, ...)
|
||||
// low nibble = pin number
|
||||
PinName port_pin(PortName port, int pin_n) {
|
||||
return (PinName)(pin_n + (port << 4));
|
||||
return (PinName)(pin_n + (port << 4));
|
||||
}
|
||||
|
||||
void port_init(port_t *obj, PortName port, int mask, PinDirection dir) {
|
||||
|
@ -67,8 +66,7 @@ void port_dir(port_t *obj, PinDirection dir) {
|
|||
if (obj->mask & (1 << i)) { // If the pin is used
|
||||
if (dir == PIN_OUTPUT) {
|
||||
pin_function(port_pin(obj->port, i), STM_PIN_DATA(STM_MODE_OUTPUT_PP, GPIO_NOPULL, 0));
|
||||
}
|
||||
else { // PIN_INPUT
|
||||
} else { // PIN_INPUT
|
||||
pin_function(port_pin(obj->port, i), STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
|
||||
}
|
||||
}
|
||||
|
@ -91,8 +89,7 @@ void port_write(port_t *obj, int value) {
|
|||
int port_read(port_t *obj) {
|
||||
if (obj->direction == PIN_OUTPUT) {
|
||||
return (*obj->reg_out & obj->mask);
|
||||
}
|
||||
else { // PIN_INPUT
|
||||
} else { // PIN_INPUT
|
||||
return (*obj->reg_in & obj->mask);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -29,27 +29,28 @@
|
|||
*/
|
||||
#include "pwmout_api.h"
|
||||
|
||||
#if DEVICE_PWMOUT
|
||||
|
||||
#include "cmsis.h"
|
||||
#include "pinmap.h"
|
||||
#include "error.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
// TIM5 cannot be used because already used by the us_ticker
|
||||
static const PinMap PinMap_PWM[] = {
|
||||
{PA_0, PWM_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2)}, // TIM2_CH1
|
||||
//{PA_0, PWM_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5)}, // TIM5_CH1
|
||||
// {PA_0, PWM_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5)}, // TIM5_CH1
|
||||
{PA_1, PWM_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2)}, // TIM2_CH2
|
||||
//{PA_1, PWM_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5)}, // TIM5_CH2
|
||||
// {PA_1, PWM_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5)}, // TIM5_CH2
|
||||
{PA_2, PWM_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2)}, // TIM2_CH3
|
||||
//{PA_2, PWM_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5)}, // TIM5_CH3
|
||||
//{PA_2, PWM_9, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9)}, // TIM9_CH1
|
||||
// {PA_2, PWM_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5)}, // TIM5_CH3
|
||||
// {PA_2, PWM_9, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9)}, // TIM9_CH1
|
||||
{PA_3, PWM_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2)}, // TIM2_CH3
|
||||
//{PA_3, PWM_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5)}, // TIM5_CH4
|
||||
//{PA_3, PWM_9, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9)}, // TIM9_CH2
|
||||
// {PA_3, PWM_5, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5)}, // TIM5_CH4
|
||||
// {PA_3, PWM_9, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9)}, // TIM9_CH2
|
||||
{PA_5, PWM_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2)}, // TIM2_CH1
|
||||
{PA_6, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH1
|
||||
{PA_7, PWM_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1)}, // TIM1_CH1N
|
||||
//{PA_7, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH2
|
||||
// {PA_7, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH2
|
||||
{PA_8, PWM_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1)}, // TIM1_CH1
|
||||
{PA_9, PWM_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1)}, // TIM1_CH2
|
||||
{PA_10, PWM_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1)}, // TIM1_CH3
|
||||
|
@ -57,18 +58,18 @@ static const PinMap PinMap_PWM[] = {
|
|||
{PA_15, PWM_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2)}, // TIM2_CH1
|
||||
|
||||
{PB_0, PWM_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1)}, // TIM1_CH2N
|
||||
//{PB_0, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH3
|
||||
// {PB_0, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH3
|
||||
{PB_1, PWM_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1)}, // TIM1_CH3N
|
||||
//{PB_1, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH4
|
||||
// {PB_1, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH4
|
||||
{PB_3, PWM_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2)}, // TIM2_CH2
|
||||
{PB_4, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH1
|
||||
{PB_5, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH2
|
||||
{PB_6, PWM_4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4)}, // TIM4_CH1
|
||||
{PB_7, PWM_4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4)}, // TIM4_CH2
|
||||
{PB_8, PWM_4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4)}, // TIM4_CH3
|
||||
//{PB_8, PWM_10,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10)}, // TIM10_CH1
|
||||
// {PB_8, PWM_10,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10)}, // TIM10_CH1
|
||||
{PB_9, PWM_4, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4)}, // TIM4_CH4
|
||||
//{PB_9, PWM_11,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11)}, // TIM11_CH1
|
||||
// {PB_9, PWM_11,STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11)}, // TIM11_CH1
|
||||
{PB_10, PWM_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2)}, // TIM2_CH3
|
||||
{PB_13, PWM_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1)}, // TIM1_CH1N
|
||||
{PB_14, PWM_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1)}, // TIM1_CH2N
|
||||
|
@ -112,10 +113,7 @@ void pwmout_init(pwmout_t* obj, PinName pin) {
|
|||
}
|
||||
|
||||
void pwmout_free(pwmout_t* obj) {
|
||||
TimHandle.Instance = (TIM_TypeDef *)(obj->pwm);
|
||||
|
||||
HAL_TIM_PWM_DeInit(&TimHandle);
|
||||
|
||||
// Configure GPIO
|
||||
pin_function(obj->pin, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, 0));
|
||||
}
|
||||
|
||||
|
@ -146,15 +144,15 @@ void pwmout_write(pwmout_t* obj, float value) {
|
|||
switch (obj->pin) {
|
||||
// Channels 1
|
||||
case PA_0:
|
||||
//case PA_2:
|
||||
// case PA_2:
|
||||
case PA_5:
|
||||
case PA_6:
|
||||
case PA_8:
|
||||
case PA_15:
|
||||
case PB_4:
|
||||
case PB_6:
|
||||
//case PB_8:
|
||||
//case PB_9:
|
||||
// case PB_8:
|
||||
// case PB_9:
|
||||
case PC_6:
|
||||
channel = TIM_CHANNEL_1;
|
||||
break;
|
||||
|
@ -166,8 +164,8 @@ void pwmout_write(pwmout_t* obj, float value) {
|
|||
break;
|
||||
// Channels 2
|
||||
case PA_1:
|
||||
//case PA_3:
|
||||
//case PA_7:
|
||||
// case PA_3:
|
||||
// case PA_7:
|
||||
case PA_9:
|
||||
case PB_3:
|
||||
case PB_5:
|
||||
|
@ -185,7 +183,7 @@ void pwmout_write(pwmout_t* obj, float value) {
|
|||
case PA_2:
|
||||
case PA_3:
|
||||
case PA_10:
|
||||
//case PB_0:
|
||||
// case PB_0:
|
||||
case PB_8:
|
||||
case PB_10:
|
||||
case PC_8:
|
||||
|
@ -198,9 +196,9 @@ void pwmout_write(pwmout_t* obj, float value) {
|
|||
complementary_channel = 1;
|
||||
break;
|
||||
// Channels 4
|
||||
//case PA_3:
|
||||
// case PA_3:
|
||||
case PA_11:
|
||||
//case PB_1:
|
||||
// case PB_1:
|
||||
case PB_9:
|
||||
case PC_9:
|
||||
channel = TIM_CHANNEL_4;
|
||||
|
@ -268,3 +266,5 @@ void pwmout_pulsewidth_us(pwmout_t* obj, int us) {
|
|||
float value = (float)us / (float)obj->period;
|
||||
pwmout_write(obj, value);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -28,7 +28,9 @@
|
|||
*******************************************************************************
|
||||
*/
|
||||
#include "rtc_api.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
#if DEVICE_RTC
|
||||
|
||||
#include "error.h"
|
||||
|
||||
static int rtc_inited = 0;
|
||||
|
@ -36,6 +38,9 @@ static int rtc_inited = 0;
|
|||
static RTC_HandleTypeDef RtcHandle;
|
||||
|
||||
void rtc_init(void) {
|
||||
RCC_OscInitTypeDef RCC_OscInitStruct;
|
||||
uint32_t rtc_freq = 0;
|
||||
|
||||
if (rtc_inited) return;
|
||||
rtc_inited = 1;
|
||||
|
||||
|
@ -44,39 +49,49 @@ void rtc_init(void) {
|
|||
// Enable Power clock
|
||||
__PWR_CLK_ENABLE();
|
||||
|
||||
// Allow access to RTC
|
||||
// Enable access to Backup domain
|
||||
HAL_PWR_EnableBkUpAccess();
|
||||
|
||||
// Reset Backup domain
|
||||
__HAL_RCC_BACKUPRESET_FORCE();
|
||||
__HAL_RCC_BACKUPRESET_RELEASE();
|
||||
|
||||
// Enable LSI clock
|
||||
RCC_OscInitTypeDef RCC_OscInitStruct;
|
||||
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
|
||||
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
|
||||
RCC_OscInitStruct.LSIState = RCC_LSI_ON;
|
||||
RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
|
||||
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
|
||||
error("RTC error: LSI clock initialization failed.");
|
||||
// Enable LSE Oscillator
|
||||
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSE;
|
||||
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; /* Mandatory, otherwise the PLL is reconfigured! */
|
||||
RCC_OscInitStruct.LSEState = RCC_LSE_ON; /* External 32.768 kHz clock on OSC_IN/OSC_OUT */
|
||||
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) == HAL_OK)
|
||||
{
|
||||
// Connect LSE to RTC
|
||||
__HAL_RCC_RTC_CLKPRESCALER(RCC_RTCCLKSOURCE_LSE);
|
||||
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSE);
|
||||
rtc_freq = LSE_VALUE;
|
||||
} else {
|
||||
// Enable LSI clock
|
||||
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
|
||||
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE; // Mandatory, otherwise the PLL is reconfigured!
|
||||
RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
|
||||
RCC_OscInitStruct.LSIState = RCC_LSI_ON;
|
||||
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
|
||||
error("RTC error: LSI clock initialization failed.");
|
||||
}
|
||||
// Connect LSI to RTC
|
||||
__HAL_RCC_RTC_CLKPRESCALER(RCC_RTCCLKSOURCE_LSI);
|
||||
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI);
|
||||
// [TODO] This value is LSI typical value. To be measured precisely using a timer input capture
|
||||
rtc_freq = 32000;
|
||||
}
|
||||
|
||||
// Connect LSI to RTC
|
||||
__HAL_RCC_RTC_CLKPRESCALER(RCC_RTCCLKSOURCE_LSI);
|
||||
__HAL_RCC_RTC_CONFIG(RCC_RTCCLKSOURCE_LSI);
|
||||
|
||||
// Enable RTC clock
|
||||
// Enable RTC
|
||||
__HAL_RCC_RTC_ENABLE();
|
||||
|
||||
// [TODO] This value is LSI typical value. To be measured precisely using a timer input capture
|
||||
uint32_t lsi_freq = 32000;
|
||||
|
||||
RtcHandle.Init.HourFormat = RTC_HOURFORMAT_24;
|
||||
RtcHandle.Init.AsynchPrediv = 127;
|
||||
RtcHandle.Init.SynchPrediv = (lsi_freq / 128) - 1;
|
||||
RtcHandle.Init.SynchPrediv = (rtc_freq / 128) - 1;
|
||||
RtcHandle.Init.OutPut = RTC_OUTPUT_DISABLE;
|
||||
RtcHandle.Init.OutPutPolarity = RTC_OUTPUT_POLARITY_HIGH;
|
||||
RtcHandle.Init.OutPutType = RTC_OUTPUT_TYPE_OPENDRAIN;
|
||||
|
||||
if (HAL_RTC_Init(&RtcHandle) != HAL_OK) {
|
||||
error("RTC error: RTC initialization failed.");
|
||||
}
|
||||
|
@ -86,18 +101,22 @@ void rtc_free(void) {
|
|||
// Enable Power clock
|
||||
__PWR_CLK_ENABLE();
|
||||
|
||||
// Allow access to RTC
|
||||
// Enable access to Backup domain
|
||||
HAL_PWR_EnableBkUpAccess();
|
||||
|
||||
// Reset Backup domain
|
||||
__HAL_RCC_BACKUPRESET_FORCE();
|
||||
__HAL_RCC_BACKUPRESET_RELEASE();
|
||||
|
||||
// Disable LSI clock
|
||||
// Disable access to Backup domain
|
||||
HAL_PWR_DisableBkUpAccess();
|
||||
|
||||
// Disable LSI and LSE clocks
|
||||
RCC_OscInitTypeDef RCC_OscInitStruct;
|
||||
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI;
|
||||
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
|
||||
RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
|
||||
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI | RCC_OSCILLATORTYPE_LSE;
|
||||
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_NONE;
|
||||
RCC_OscInitStruct.LSIState = RCC_LSI_OFF;
|
||||
RCC_OscInitStruct.LSEState = RCC_LSE_OFF;
|
||||
HAL_RCC_OscConfig(&RCC_OscInitStruct);
|
||||
|
||||
rtc_inited = 0;
|
||||
|
@ -176,3 +195,5 @@ void rtc_write(time_t t) {
|
|||
HAL_RTC_SetDate(&RtcHandle, &dateStruct, FORMAT_BIN);
|
||||
HAL_RTC_SetTime(&RtcHandle, &timeStruct, FORMAT_BIN);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -28,11 +28,13 @@
|
|||
*******************************************************************************
|
||||
*/
|
||||
#include "serial_api.h"
|
||||
|
||||
#if DEVICE_SERIAL
|
||||
|
||||
#include "cmsis.h"
|
||||
#include "pinmap.h"
|
||||
#include "error.h"
|
||||
#include <string.h>
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
static const PinMap PinMap_UART_TX[] = {
|
||||
{PA_2, UART_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)},
|
||||
|
@ -54,7 +56,7 @@ static const PinMap PinMap_UART_RX[] = {
|
|||
|
||||
#define UART_NUM (3)
|
||||
|
||||
static uint32_t serial_irq_ids[UART_NUM] = {0};
|
||||
static uint32_t serial_irq_ids[UART_NUM] = {0, 0, 0};
|
||||
|
||||
static uart_irq_handler irq_handler;
|
||||
|
||||
|
@ -138,29 +140,27 @@ void serial_baud(serial_t *obj, int baudrate) {
|
|||
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
|
||||
if (data_bits == 8) {
|
||||
obj->databits = UART_WORDLENGTH_8B;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
obj->databits = UART_WORDLENGTH_9B;
|
||||
}
|
||||
|
||||
switch (parity) {
|
||||
case ParityOdd:
|
||||
case ParityForced0:
|
||||
obj->parity = UART_PARITY_ODD;
|
||||
break;
|
||||
case ParityEven:
|
||||
case ParityForced1:
|
||||
obj->parity = UART_PARITY_EVEN;
|
||||
break;
|
||||
default: // ParityNone
|
||||
obj->parity = UART_PARITY_NONE;
|
||||
break;
|
||||
case ParityOdd:
|
||||
case ParityForced0:
|
||||
obj->parity = UART_PARITY_ODD;
|
||||
break;
|
||||
case ParityEven:
|
||||
case ParityForced1:
|
||||
obj->parity = UART_PARITY_EVEN;
|
||||
break;
|
||||
default: // ParityNone
|
||||
obj->parity = UART_PARITY_NONE;
|
||||
break;
|
||||
}
|
||||
|
||||
if (stop_bits == 2) {
|
||||
obj->stopbits = UART_STOPBITS_2;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
obj->stopbits = UART_STOPBITS_1;
|
||||
}
|
||||
|
||||
|
@ -171,10 +171,8 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
|
|||
* INTERRUPTS HANDLING
|
||||
******************************************************************************/
|
||||
|
||||
// Not part of mbed api
|
||||
static void uart_irq(UARTName name, int id) {
|
||||
UartHandle.Instance = (USART_TypeDef *)name;
|
||||
|
||||
if (serial_irq_ids[id] != 0) {
|
||||
if (__HAL_UART_GET_FLAG(&UartHandle, UART_FLAG_TC) != RESET) {
|
||||
irq_handler(serial_irq_ids[id], TxIrq);
|
||||
|
@ -187,10 +185,15 @@ static void uart_irq(UARTName name, int id) {
|
|||
}
|
||||
}
|
||||
|
||||
// Not part of mbed api
|
||||
static void uart1_irq(void) {uart_irq(UART_1, 0);}
|
||||
static void uart2_irq(void) {uart_irq(UART_2, 1);}
|
||||
static void uart6_irq(void) {uart_irq(UART_6, 2);}
|
||||
static void uart1_irq(void) {
|
||||
uart_irq(UART_1, 0);
|
||||
}
|
||||
static void uart2_irq(void) {
|
||||
uart_irq(UART_2, 1);
|
||||
}
|
||||
static void uart6_irq(void) {
|
||||
uart_irq(UART_6, 2);
|
||||
}
|
||||
|
||||
void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) {
|
||||
irq_handler = handler;
|
||||
|
@ -204,26 +207,25 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
|
|||
UartHandle.Instance = (USART_TypeDef *)(obj->uart);
|
||||
|
||||
if (obj->uart == UART_1) {
|
||||
irq_n = USART1_IRQn;
|
||||
vector = (uint32_t)&uart1_irq;
|
||||
irq_n = USART1_IRQn;
|
||||
vector = (uint32_t)&uart1_irq;
|
||||
}
|
||||
|
||||
if (obj->uart == UART_2) {
|
||||
irq_n = USART2_IRQn;
|
||||
vector = (uint32_t)&uart2_irq;
|
||||
irq_n = USART2_IRQn;
|
||||
vector = (uint32_t)&uart2_irq;
|
||||
}
|
||||
|
||||
if (obj->uart == UART_6) {
|
||||
irq_n = USART6_IRQn;
|
||||
vector = (uint32_t)&uart6_irq;
|
||||
irq_n = USART6_IRQn;
|
||||
vector = (uint32_t)&uart6_irq;
|
||||
}
|
||||
|
||||
if (enable) {
|
||||
|
||||
if (irq == RxIrq) {
|
||||
__HAL_UART_ENABLE_IT(&UartHandle, UART_IT_RXNE);
|
||||
}
|
||||
else { // TxIrq
|
||||
} else { // TxIrq
|
||||
__HAL_UART_ENABLE_IT(&UartHandle, UART_IT_TC);
|
||||
}
|
||||
|
||||
|
@ -235,11 +237,10 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
|
|||
int all_disabled = 0;
|
||||
|
||||
if (irq == RxIrq) {
|
||||
__HAL_UART_DISABLE_IT(&UartHandle, UART_IT_RXNE);
|
||||
__HAL_UART_DISABLE_IT(&UartHandle, UART_IT_RXNE);
|
||||
// Check if TxIrq is disabled too
|
||||
if ((UartHandle.Instance->CR1 & USART_CR1_TXEIE) == 0) all_disabled = 1;
|
||||
}
|
||||
else { // TxIrq
|
||||
} else { // TxIrq
|
||||
__HAL_UART_DISABLE_IT(&UartHandle, UART_IT_TXE);
|
||||
// Check if RxIrq is disabled too
|
||||
if ((UartHandle.Instance->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1;
|
||||
|
@ -299,3 +300,5 @@ void serial_break_set(serial_t *obj) {
|
|||
|
||||
void serial_break_clear(serial_t *obj) {
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -28,24 +28,24 @@
|
|||
*******************************************************************************
|
||||
*/
|
||||
#include "sleep_api.h"
|
||||
#include "cmsis.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
// This function is in the system_stm32f4xx.c file
|
||||
extern void SystemClock_Config(void);
|
||||
#if DEVICE_SLEEP
|
||||
|
||||
#include "cmsis.h"
|
||||
|
||||
static TIM_HandleTypeDef TimMasterHandle;
|
||||
|
||||
void sleep(void)
|
||||
{
|
||||
void sleep(void) {
|
||||
// Request to enter SLEEP mode
|
||||
HAL_PWR_EnterSLEEPMode(PWR_MAINREGULATOR_ON, PWR_SLEEPENTRY_WFI);
|
||||
}
|
||||
|
||||
void deepsleep(void)
|
||||
{
|
||||
void deepsleep(void) {
|
||||
// Request to enter STOP mode with regulator in low power mode
|
||||
HAL_PWR_EnterSTOPMode(PWR_LOWPOWERREGULATOR_ON, PWR_STOPENTRY_WFI);
|
||||
|
||||
// After wake-up from STOP reconfigure the PLL
|
||||
SystemClock_Config();
|
||||
SetSysClock();
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
@ -35,12 +35,11 @@
|
|||
#include "cmsis.h"
|
||||
#include "pinmap.h"
|
||||
#include "error.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
static const PinMap PinMap_SPI_MOSI[] = {
|
||||
{PA_7, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
|
||||
{PB_5, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
|
||||
//{PB_5, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
|
||||
// {PB_5, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
|
||||
{PB_15, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
|
||||
{PC_3, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
|
||||
{PC_12, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
|
||||
|
@ -50,7 +49,7 @@ static const PinMap PinMap_SPI_MOSI[] = {
|
|||
static const PinMap PinMap_SPI_MISO[] = {
|
||||
{PA_6, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
|
||||
{PB_4, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
|
||||
//{PB_4, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
|
||||
// {PB_4, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
|
||||
{PB_14, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
|
||||
{PC_2, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
|
||||
{PC_11, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
|
||||
|
@ -60,7 +59,7 @@ static const PinMap PinMap_SPI_MISO[] = {
|
|||
static const PinMap PinMap_SPI_SCLK[] = {
|
||||
{PA_5, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
|
||||
{PB_3, SPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)},
|
||||
//{PB_3, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
|
||||
// {PB_3, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
|
||||
{PB_10, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
|
||||
{PB_13, SPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)},
|
||||
{PC_10, SPI_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)},
|
||||
|
@ -69,9 +68,9 @@ static const PinMap PinMap_SPI_SCLK[] = {
|
|||
|
||||
static const PinMap PinMap_SPI_SSEL[] = {
|
||||
{PA_4, SPI_1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF5_SPI1)},
|
||||
//{PA_4, SPI_3, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF6_SPI3)},
|
||||
// {PA_4, SPI_3, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF6_SPI3)},
|
||||
{PA_15, SPI_1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF5_SPI1)},
|
||||
//{PA_15, SPI_3, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF6_SPI3)},
|
||||
// {PA_15, SPI_3, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF6_SPI3)},
|
||||
{PB_9, SPI_2, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF5_SPI2)},
|
||||
{PB_12, SPI_2, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF5_SPI2)},
|
||||
{NC, NC, 0}
|
||||
|
@ -142,8 +141,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
|
|||
if (ssel == NC) { // SW NSS Master mode
|
||||
obj->mode = SPI_MODE_MASTER;
|
||||
obj->nss = SPI_NSS_SOFT;
|
||||
}
|
||||
else { // Slave
|
||||
} else { // Slave
|
||||
pinmap_pinout(ssel, PinMap_SPI_SSEL);
|
||||
obj->mode = SPI_MODE_SLAVE;
|
||||
obj->nss = SPI_NSS_HARD_INPUT;
|
||||
|
@ -161,35 +159,33 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {
|
|||
// Save new values
|
||||
if (bits == 8) {
|
||||
obj->bits = SPI_DATASIZE_8BIT;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
obj->bits = SPI_DATASIZE_16BIT;
|
||||
}
|
||||
|
||||
switch (mode) {
|
||||
case 0:
|
||||
obj->cpol = SPI_POLARITY_LOW;
|
||||
obj->cpha = SPI_PHASE_1EDGE;
|
||||
break;
|
||||
obj->cpol = SPI_POLARITY_LOW;
|
||||
obj->cpha = SPI_PHASE_1EDGE;
|
||||
break;
|
||||
case 1:
|
||||
obj->cpol = SPI_POLARITY_LOW;
|
||||
obj->cpha = SPI_PHASE_2EDGE;
|
||||
break;
|
||||
obj->cpol = SPI_POLARITY_LOW;
|
||||
obj->cpha = SPI_PHASE_2EDGE;
|
||||
break;
|
||||
case 2:
|
||||
obj->cpol = SPI_POLARITY_HIGH;
|
||||
obj->cpha = SPI_PHASE_1EDGE;
|
||||
break;
|
||||
obj->cpol = SPI_POLARITY_HIGH;
|
||||
obj->cpha = SPI_PHASE_1EDGE;
|
||||
break;
|
||||
default:
|
||||
obj->cpol = SPI_POLARITY_HIGH;
|
||||
obj->cpha = SPI_PHASE_2EDGE;
|
||||
break;
|
||||
obj->cpol = SPI_POLARITY_HIGH;
|
||||
obj->cpha = SPI_PHASE_2EDGE;
|
||||
break;
|
||||
}
|
||||
|
||||
if (slave == 0) {
|
||||
obj->mode = SPI_MODE_MASTER;
|
||||
obj->nss = SPI_NSS_SOFT;
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
obj->mode = SPI_MODE_SLAVE;
|
||||
obj->nss = SPI_NSS_HARD_INPUT;
|
||||
}
|
||||
|
@ -201,26 +197,19 @@ void spi_frequency(spi_t *obj, int hz) {
|
|||
// Note: The frequencies are obtained with SPI1 clock = 84 MHz (APB2 clock)
|
||||
if (hz < 600000) {
|
||||
obj->br_presc = SPI_BAUDRATEPRESCALER_256; // 330 kHz
|
||||
}
|
||||
else if ((hz >= 600000) && (hz < 1000000)) {
|
||||
} else if ((hz >= 600000) && (hz < 1000000)) {
|
||||
obj->br_presc = SPI_BAUDRATEPRESCALER_128; // 656 kHz
|
||||
}
|
||||
else if ((hz >= 1000000) && (hz < 2000000)) {
|
||||
} else if ((hz >= 1000000) && (hz < 2000000)) {
|
||||
obj->br_presc = SPI_BAUDRATEPRESCALER_64; // 1.3 MHz
|
||||
}
|
||||
else if ((hz >= 2000000) && (hz < 5000000)) {
|
||||
} else if ((hz >= 2000000) && (hz < 5000000)) {
|
||||
obj->br_presc = SPI_BAUDRATEPRESCALER_32; // 2.6 MHz
|
||||
}
|
||||
else if ((hz >= 5000000) && (hz < 10000000)) {
|
||||
} else if ((hz >= 5000000) && (hz < 10000000)) {
|
||||
obj->br_presc = SPI_BAUDRATEPRESCALER_16; // 5.25 MHz
|
||||
}
|
||||
else if ((hz >= 10000000) && (hz < 21000000)) {
|
||||
} else if ((hz >= 10000000) && (hz < 21000000)) {
|
||||
obj->br_presc = SPI_BAUDRATEPRESCALER_8; // 10.5 MHz
|
||||
}
|
||||
else if ((hz >= 21000000) && (hz < 42000000)) {
|
||||
} else if ((hz >= 21000000) && (hz < 42000000)) {
|
||||
obj->br_presc = SPI_BAUDRATEPRESCALER_4; // 21 MHz
|
||||
}
|
||||
else { // >= 42000000
|
||||
} else { // >= 42000000
|
||||
obj->br_presc = SPI_BAUDRATEPRESCALER_2; // 42 MHz
|
||||
}
|
||||
init_spi(obj);
|
||||
|
@ -267,11 +256,12 @@ int spi_master_write(spi_t *obj, int value) {
|
|||
}
|
||||
|
||||
int spi_slave_receive(spi_t *obj) {
|
||||
return (ssp_readable(obj) && !ssp_busy(obj)) ? (1) : (0);
|
||||
return (!ssp_busy(obj)) ? (1) : (0);
|
||||
};
|
||||
|
||||
int spi_slave_read(spi_t *obj) {
|
||||
SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi);
|
||||
while (!ssp_readable(obj));
|
||||
return (int)spi->DR;
|
||||
}
|
||||
|
||||
|
|
|
@ -28,12 +28,11 @@
|
|||
#include <stddef.h>
|
||||
#include "us_ticker_api.h"
|
||||
#include "PeripheralNames.h"
|
||||
#include "stm32f4xx_hal.h"
|
||||
|
||||
// 32-bit timer selection
|
||||
#define TIM_MST TIM5
|
||||
#define TIM_MST_IRQ TIM5_IRQn
|
||||
#define TIM_MST_RCC __TIM5_CLK_ENABLE()
|
||||
#define TIM_MST TIM5
|
||||
#define TIM_MST_IRQ TIM5_IRQn
|
||||
#define TIM_MST_RCC __TIM5_CLK_ENABLE()
|
||||
|
||||
static TIM_HandleTypeDef TimMasterHandle;
|
||||
static int us_ticker_inited = 0;
|
||||
|
|
Loading…
Reference in New Issue