mirror of https://github.com/ARMmbed/mbed-os.git
[NUCLEO_F302R8] Code formatting
parent
60d326e241
commit
a5090fa636
|
|
@ -1,6 +1,6 @@
|
||||||
;******************** (C) COPYRIGHT 2014 STMicroelectronics ********************
|
;******************** (C) COPYRIGHT 2014 STMicroelectronics ********************
|
||||||
;* File Name : startup_stm32f302x8.s
|
;* File Name : startup_stm32f302x8.s
|
||||||
; STM32F302x8 Devices vector table for MDK ARM_MICRO toolchain
|
; STM32F302x8 Devices vector table for MDK ARM_STD toolchain
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
; Copyright (c) 2014, STMicroelectronics
|
; Copyright (c) 2014, STMicroelectronics
|
||||||
; All rights reserved.
|
; All rights reserved.
|
||||||
|
|
|
||||||
|
|
@ -90,7 +90,7 @@ void analogin_init(analogin_t *obj, PinName pin) {
|
||||||
wait_us(10);
|
wait_us(10);
|
||||||
ADC_SelectCalibrationMode(adc, ADC_CalibrationMode_Single);
|
ADC_SelectCalibrationMode(adc, ADC_CalibrationMode_Single);
|
||||||
ADC_StartCalibration(adc);
|
ADC_StartCalibration(adc);
|
||||||
while (ADC_GetCalibrationStatus(adc) != RESET ) {}
|
while (ADC_GetCalibrationStatus(adc) != RESET) {}
|
||||||
|
|
||||||
// Configure ADC
|
// Configure ADC
|
||||||
ADC_CommonInitStructure.ADC_Mode = ADC_Mode_Independent;
|
ADC_CommonInitStructure.ADC_Mode = ADC_Mode_Independent;
|
||||||
|
|
@ -113,7 +113,7 @@ void analogin_init(analogin_t *obj, PinName pin) {
|
||||||
// Enable ADC
|
// Enable ADC
|
||||||
ADC_Cmd(adc, ENABLE);
|
ADC_Cmd(adc, ENABLE);
|
||||||
|
|
||||||
while(!ADC_GetFlagStatus(adc, ADC_FLAG_RDY)) {}
|
while (!ADC_GetFlagStatus(adc, ADC_FLAG_RDY)) {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -177,13 +177,13 @@ static inline uint16_t adc_read(analogin_t *obj) {
|
||||||
|
|
||||||
ADC_StartConversion(adc); // Start conversion
|
ADC_StartConversion(adc); // Start conversion
|
||||||
|
|
||||||
while(ADC_GetFlagStatus(adc, ADC_FLAG_EOC) == RESET); // Wait end of conversion
|
while (ADC_GetFlagStatus(adc, ADC_FLAG_EOC) == RESET); // Wait end of conversion
|
||||||
|
|
||||||
return(ADC_GetConversionValue(adc)); // Get conversion value
|
return (ADC_GetConversionValue(adc)); // Get conversion value
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16_t analogin_read_u16(analogin_t *obj) {
|
uint16_t analogin_read_u16(analogin_t *obj) {
|
||||||
return(adc_read(obj));
|
return (adc_read(obj));
|
||||||
}
|
}
|
||||||
|
|
||||||
float analogin_read(analogin_t *obj) {
|
float analogin_read(analogin_t *obj) {
|
||||||
|
|
|
||||||
|
|
@ -96,8 +96,7 @@ void analogout_write(dac_t *obj, float value) {
|
||||||
void analogout_write_u16(dac_t *obj, uint16_t value) {
|
void analogout_write_u16(dac_t *obj, uint16_t value) {
|
||||||
if (value > (uint16_t)RANGE_12BIT) {
|
if (value > (uint16_t)RANGE_12BIT) {
|
||||||
dac_write(obj, (uint16_t)RANGE_12BIT); // Max value
|
dac_write(obj, (uint16_t)RANGE_12BIT); // Max value
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
dac_write(obj, value);
|
dac_write(obj, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -65,8 +65,7 @@ void gpio_mode(gpio_t *obj, PinMode mode) {
|
||||||
void gpio_dir(gpio_t *obj, PinDirection direction) {
|
void gpio_dir(gpio_t *obj, PinDirection direction) {
|
||||||
if (direction == PIN_OUTPUT) {
|
if (direction == PIN_OUTPUT) {
|
||||||
pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF));
|
pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF));
|
||||||
}
|
} else { // PIN_INPUT
|
||||||
else { // PIN_INPUT
|
|
||||||
pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF));
|
pin_function(obj->pin, STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -53,8 +53,7 @@ static void handle_interrupt_in(uint32_t irq_index) {
|
||||||
uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]);
|
uint32_t pin = (uint32_t)(1 << channel_pin[irq_index]);
|
||||||
|
|
||||||
// Clear interrupt flag
|
// Clear interrupt flag
|
||||||
if (EXTI_GetITStatus(channel_pin[irq_index]) != RESET)
|
if (EXTI_GetITStatus(channel_pin[irq_index]) != RESET) {
|
||||||
{
|
|
||||||
EXTI_ClearITPendingBit(channel_pin[irq_index]);
|
EXTI_ClearITPendingBit(channel_pin[irq_index]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -63,20 +62,38 @@ static void handle_interrupt_in(uint32_t irq_index) {
|
||||||
// Check which edge has generated the irq
|
// Check which edge has generated the irq
|
||||||
if ((gpio->IDR & pin) == 0) {
|
if ((gpio->IDR & pin) == 0) {
|
||||||
irq_handler(channel_ids[irq_index], IRQ_FALL);
|
irq_handler(channel_ids[irq_index], IRQ_FALL);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
irq_handler(channel_ids[irq_index], IRQ_RISE);
|
irq_handler(channel_ids[irq_index], IRQ_RISE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// The irq_index is passed to the function
|
static void gpio_irq0(void) {
|
||||||
static void gpio_irq0(void) {handle_interrupt_in(0);} // EXTI line 0
|
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_irq1(void) {
|
||||||
static void gpio_irq4(void) {handle_interrupt_in(4);} // EXTI line 4
|
handle_interrupt_in(1); // EXTI line 1
|
||||||
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
|
|
||||||
|
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
|
||||||
|
}
|
||||||
|
|
||||||
extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
|
extern uint32_t Set_GPIO_Clock(uint32_t port_idx);
|
||||||
|
|
||||||
|
|
@ -203,8 +220,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)) {
|
if ((obj->event == EDGE_FALL) || (obj->event == EDGE_BOTH)) {
|
||||||
EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Rising_Falling;
|
EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Rising_Falling;
|
||||||
obj->event = EDGE_BOTH;
|
obj->event = EDGE_BOTH;
|
||||||
}
|
} else { // NONE or RISE
|
||||||
else { // NONE or RISE
|
|
||||||
EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Rising;
|
EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Rising;
|
||||||
obj->event = EDGE_RISE;
|
obj->event = EDGE_RISE;
|
||||||
}
|
}
|
||||||
|
|
@ -214,8 +230,7 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) {
|
||||||
if ((obj->event == EDGE_RISE) || (obj->event == EDGE_BOTH)) {
|
if ((obj->event == EDGE_RISE) || (obj->event == EDGE_BOTH)) {
|
||||||
EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Rising_Falling;
|
EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Rising_Falling;
|
||||||
obj->event = EDGE_BOTH;
|
obj->event = EDGE_BOTH;
|
||||||
}
|
} else { // NONE or FALL
|
||||||
else { // NONE or FALL
|
|
||||||
EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Falling;
|
EXTI_InitStructure.EXTI_Trigger = EXTI_Trigger_Falling;
|
||||||
obj->event = EDGE_FALL;
|
obj->event = EDGE_FALL;
|
||||||
}
|
}
|
||||||
|
|
@ -223,8 +238,7 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable) {
|
||||||
|
|
||||||
if (enable) {
|
if (enable) {
|
||||||
EXTI_InitStructure.EXTI_LineCmd = ENABLE;
|
EXTI_InitStructure.EXTI_LineCmd = ENABLE;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
EXTI_InitStructure.EXTI_LineCmd = DISABLE;
|
EXTI_InitStructure.EXTI_LineCmd = DISABLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -50,8 +50,7 @@ typedef struct {
|
||||||
static inline void gpio_write(gpio_t *obj, int value) {
|
static inline void gpio_write(gpio_t *obj, int value) {
|
||||||
if (value) {
|
if (value) {
|
||||||
*obj->reg_set = obj->mask;
|
*obj->reg_set = obj->mask;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
*obj->reg_clr = obj->mask;
|
*obj->reg_clr = obj->mask;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -326,7 +326,7 @@ void i2c_slave_mode(i2c_t *obj, int enable_slave) {
|
||||||
|
|
||||||
int i2c_slave_receive(i2c_t *obj) {
|
int i2c_slave_receive(i2c_t *obj) {
|
||||||
// TO BE DONE
|
// TO BE DONE
|
||||||
return(0);
|
return (0);
|
||||||
}
|
}
|
||||||
|
|
||||||
int i2c_slave_read(i2c_t *obj, char *data, int length) {
|
int i2c_slave_read(i2c_t *obj, char *data, int length) {
|
||||||
|
|
|
||||||
|
|
@ -66,8 +66,7 @@ void port_dir(port_t *obj, PinDirection dir) {
|
||||||
if (obj->mask & (1 << i)) { // If the pin is used
|
if (obj->mask & (1 << i)) { // If the pin is used
|
||||||
if (dir == PIN_OUTPUT) {
|
if (dir == PIN_OUTPUT) {
|
||||||
pin_function(port_pin(obj->port, i), STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF));
|
pin_function(port_pin(obj->port, i), STM_PIN_DATA(GPIO_Mode_OUT, GPIO_OType_PP, GPIO_PuPd_NOPULL, 0xFF));
|
||||||
}
|
} else { // PIN_INPUT
|
||||||
else { // PIN_INPUT
|
|
||||||
pin_function(port_pin(obj->port, i), STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF));
|
pin_function(port_pin(obj->port, i), STM_PIN_DATA(GPIO_Mode_IN, 0, GPIO_PuPd_NOPULL, 0xFF));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -90,8 +89,7 @@ void port_write(port_t *obj, int value) {
|
||||||
int port_read(port_t *obj) {
|
int port_read(port_t *obj) {
|
||||||
if (obj->direction == PIN_OUTPUT) {
|
if (obj->direction == PIN_OUTPUT) {
|
||||||
return (*obj->reg_out & obj->mask);
|
return (*obj->reg_out & obj->mask);
|
||||||
}
|
} else { // PIN_INPUT
|
||||||
else { // PIN_INPUT
|
|
||||||
return (*obj->reg_in & obj->mask);
|
return (*obj->reg_in & obj->mask);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,44 +35,44 @@
|
||||||
|
|
||||||
// TIM2 cannot be used because already used by the us_ticker
|
// TIM2 cannot be used because already used by the us_ticker
|
||||||
static const PinMap PinMap_PWM[] = {
|
static const PinMap PinMap_PWM[] = {
|
||||||
//{PA_0, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH1
|
// {PA_0, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH1
|
||||||
//{PA_1, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH2
|
// {PA_1, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH2
|
||||||
{PA_1, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_9)}, // TIM15_CH1N
|
{PA_1, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_9)}, // TIM15_CH1N
|
||||||
{PA_2, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_9)}, // TIM15_CH1
|
{PA_2, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_9)}, // TIM15_CH1
|
||||||
{PA_3, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_9)}, // TIM15_CH2
|
{PA_3, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_9)}, // TIM15_CH2
|
||||||
//{PA_5, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH1
|
// {PA_5, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH1
|
||||||
{PA_6, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1
|
{PA_6, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1
|
||||||
{PA_7, PWM_17, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM17_CH1
|
{PA_7, PWM_17, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM17_CH1
|
||||||
//{PA_7, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH1N
|
// {PA_7, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH1N
|
||||||
{PA_8, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH1
|
{PA_8, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH1
|
||||||
{PA_9, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH2
|
{PA_9, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH2
|
||||||
//{PA_9, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_10)}, // TIM2_CH3
|
// {PA_9, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_10)}, // TIM2_CH3
|
||||||
{PA_10, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH3
|
{PA_10, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH3
|
||||||
//{PA_10, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_10)}, // TIM2_CH4
|
// {PA_10, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_10)}, // TIM2_CH4
|
||||||
{PA_11, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_11)}, // TIM1_CH4
|
{PA_11, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_11)}, // TIM1_CH4
|
||||||
//{PA_11, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH1N
|
// {PA_11, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH1N
|
||||||
{PA_12, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1
|
{PA_12, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1
|
||||||
//{PA_12, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH2N
|
// {PA_12, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH2N
|
||||||
{PA_13, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1N
|
{PA_13, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1N
|
||||||
//{PA_15, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH1
|
// {PA_15, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH1
|
||||||
|
|
||||||
{PB_0, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH2N
|
{PB_0, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH2N
|
||||||
{PB_1, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH3N
|
{PB_1, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH3N
|
||||||
//{PB_3, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH2
|
// {PB_3, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH2
|
||||||
{PB_4, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1
|
{PB_4, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1
|
||||||
{PB_5, PWM_17, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_10)}, // TIM17_CH1
|
{PB_5, PWM_17, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_10)}, // TIM17_CH1
|
||||||
{PB_6, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1N
|
{PB_6, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1N
|
||||||
{PB_7, PWM_17, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM17_CH1N
|
{PB_7, PWM_17, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM17_CH1N
|
||||||
{PB_8, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1
|
{PB_8, PWM_16, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM16_CH1
|
||||||
{PB_9, PWM_17, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM17_CH1
|
{PB_9, PWM_17, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM17_CH1
|
||||||
//{PB_10, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH3
|
// {PB_10, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH3
|
||||||
//{PB_11, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH4
|
// {PB_11, PWM_2, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM2_CH4
|
||||||
{PB_13, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH1N
|
{PB_13, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH1N
|
||||||
{PB_14, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM15_CH1
|
{PB_14, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM15_CH1
|
||||||
//{PB_14, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH2N
|
// {PB_14, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_6)}, // TIM1_CH2N
|
||||||
{PB_15, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM15_CH2
|
{PB_15, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_1)}, // TIM15_CH2
|
||||||
//{PB_15, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_2)}, // TIM15_CH1N
|
// {PB_15, PWM_15, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_2)}, // TIM15_CH1N
|
||||||
//{PB_15, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_4)}, // TIM1_CH3N
|
// {PB_15, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_4)}, // TIM1_CH3N
|
||||||
|
|
||||||
{PC_0, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_2)}, // TIM1_CH1
|
{PC_0, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_2)}, // TIM1_CH1
|
||||||
{PC_1, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_2)}, // TIM1_CH2
|
{PC_1, PWM_1, STM_PIN_DATA(GPIO_Mode_AF, GPIO_OType_PP, GPIO_PuPd_UP, GPIO_AF_2)}, // TIM1_CH2
|
||||||
|
|
@ -136,14 +136,14 @@ void pwmout_write(pwmout_t* obj, float value) {
|
||||||
|
|
||||||
switch (obj->pin) {
|
switch (obj->pin) {
|
||||||
// Channels 1
|
// Channels 1
|
||||||
//case PA_0:
|
// case PA_0:
|
||||||
case PA_2:
|
case PA_2:
|
||||||
//case PA_5:
|
// case PA_5:
|
||||||
case PA_6:
|
case PA_6:
|
||||||
case PA_7:
|
case PA_7:
|
||||||
case PA_8:
|
case PA_8:
|
||||||
case PA_12:
|
case PA_12:
|
||||||
//case PA_15:
|
// case PA_15:
|
||||||
case PB_4:
|
case PB_4:
|
||||||
case PB_5:
|
case PB_5:
|
||||||
case PB_8:
|
case PB_8:
|
||||||
|
|
@ -156,23 +156,23 @@ void pwmout_write(pwmout_t* obj, float value) {
|
||||||
break;
|
break;
|
||||||
// Channels 1N
|
// Channels 1N
|
||||||
case PA_1:
|
case PA_1:
|
||||||
//case PA_7:
|
// case PA_7:
|
||||||
//case PA_11:
|
// case PA_11:
|
||||||
case PA_13:
|
case PA_13:
|
||||||
case PB_6:
|
case PB_6:
|
||||||
case PB_7:
|
case PB_7:
|
||||||
case PB_13:
|
case PB_13:
|
||||||
//case PB_15:
|
// case PB_15:
|
||||||
case PC_13:
|
case PC_13:
|
||||||
TIM_OCInitStructure.TIM_OutputNState = TIM_OutputNState_Enable;
|
TIM_OCInitStructure.TIM_OutputNState = TIM_OutputNState_Enable;
|
||||||
TIM_OC1PreloadConfig(tim, TIM_OCPreload_Enable);
|
TIM_OC1PreloadConfig(tim, TIM_OCPreload_Enable);
|
||||||
TIM_OC1Init(tim, &TIM_OCInitStructure);
|
TIM_OC1Init(tim, &TIM_OCInitStructure);
|
||||||
break;
|
break;
|
||||||
// Channels 2
|
// Channels 2
|
||||||
//case PA_1:
|
// case PA_1:
|
||||||
case PA_3:
|
case PA_3:
|
||||||
case PA_9:
|
case PA_9:
|
||||||
//case PB_3:
|
// case PB_3:
|
||||||
case PB_15:
|
case PB_15:
|
||||||
case PC_1:
|
case PC_1:
|
||||||
TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
|
TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
|
||||||
|
|
@ -180,17 +180,17 @@ void pwmout_write(pwmout_t* obj, float value) {
|
||||||
TIM_OC2Init(tim, &TIM_OCInitStructure);
|
TIM_OC2Init(tim, &TIM_OCInitStructure);
|
||||||
break;
|
break;
|
||||||
// Channels 2N
|
// Channels 2N
|
||||||
//case PA_12:
|
// case PA_12:
|
||||||
case PB_0:
|
case PB_0:
|
||||||
//case PB_14:
|
// case PB_14:
|
||||||
TIM_OCInitStructure.TIM_OutputNState = TIM_OutputNState_Enable;
|
TIM_OCInitStructure.TIM_OutputNState = TIM_OutputNState_Enable;
|
||||||
TIM_OC2PreloadConfig(tim, TIM_OCPreload_Enable);
|
TIM_OC2PreloadConfig(tim, TIM_OCPreload_Enable);
|
||||||
TIM_OC2Init(tim, &TIM_OCInitStructure);
|
TIM_OC2Init(tim, &TIM_OCInitStructure);
|
||||||
break;
|
break;
|
||||||
// Channels 3
|
// Channels 3
|
||||||
//case PA_9:
|
// case PA_9:
|
||||||
case PA_10:
|
case PA_10:
|
||||||
//case PB_10:
|
// case PB_10:
|
||||||
case PC_2:
|
case PC_2:
|
||||||
TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
|
TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
|
||||||
TIM_OC3PreloadConfig(tim, TIM_OCPreload_Enable);
|
TIM_OC3PreloadConfig(tim, TIM_OCPreload_Enable);
|
||||||
|
|
@ -199,15 +199,15 @@ void pwmout_write(pwmout_t* obj, float value) {
|
||||||
// Channels 3N
|
// Channels 3N
|
||||||
case PB_1:
|
case PB_1:
|
||||||
case PF_0:
|
case PF_0:
|
||||||
//case PB_15:
|
// case PB_15:
|
||||||
TIM_OCInitStructure.TIM_OutputNState = TIM_OutputNState_Enable;
|
TIM_OCInitStructure.TIM_OutputNState = TIM_OutputNState_Enable;
|
||||||
TIM_OC3PreloadConfig(tim, TIM_OCPreload_Enable);
|
TIM_OC3PreloadConfig(tim, TIM_OCPreload_Enable);
|
||||||
TIM_OC3Init(tim, &TIM_OCInitStructure);
|
TIM_OC3Init(tim, &TIM_OCInitStructure);
|
||||||
break;
|
break;
|
||||||
// Channels 4
|
// Channels 4
|
||||||
//case PA_10:
|
// case PA_10:
|
||||||
case PA_11:
|
case PA_11:
|
||||||
//case PB_11:
|
// case PB_11:
|
||||||
case PC_3:
|
case PC_3:
|
||||||
TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
|
TIM_OCInitStructure.TIM_OutputState = TIM_OutputState_Enable;
|
||||||
TIM_OC4PreloadConfig(tim, TIM_OCPreload_Enable);
|
TIM_OC4PreloadConfig(tim, TIM_OCPreload_Enable);
|
||||||
|
|
|
||||||
|
|
@ -147,8 +147,7 @@ void serial_baud(serial_t *obj, int baudrate) {
|
||||||
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
|
void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_bits) {
|
||||||
if (data_bits == 8) {
|
if (data_bits == 8) {
|
||||||
obj->databits = USART_WordLength_8b;
|
obj->databits = USART_WordLength_8b;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
obj->databits = USART_WordLength_9b;
|
obj->databits = USART_WordLength_9b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -168,8 +167,7 @@ void serial_format(serial_t *obj, int data_bits, SerialParity parity, int stop_b
|
||||||
|
|
||||||
if (stop_bits == 2) {
|
if (stop_bits == 2) {
|
||||||
obj->stopbits = USART_StopBits_2;
|
obj->stopbits = USART_StopBits_2;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
obj->stopbits = USART_StopBits_1;
|
obj->stopbits = USART_StopBits_1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -194,9 +192,15 @@ static void uart_irq(USART_TypeDef* usart, int id) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void uart1_irq(void) {uart_irq((USART_TypeDef*)UART_1, 0);}
|
static void uart1_irq(void) {
|
||||||
static void uart2_irq(void) {uart_irq((USART_TypeDef*)UART_2, 1);}
|
uart_irq((USART_TypeDef*)UART_1, 0);
|
||||||
static void uart3_irq(void) {uart_irq((USART_TypeDef*)UART_3, 2);}
|
}
|
||||||
|
static void uart2_irq(void) {
|
||||||
|
uart_irq((USART_TypeDef*)UART_2, 1);
|
||||||
|
}
|
||||||
|
static void uart3_irq(void) {
|
||||||
|
uart_irq((USART_TypeDef*)UART_3, 2);
|
||||||
|
}
|
||||||
|
|
||||||
void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) {
|
void serial_irq_handler(serial_t *obj, uart_irq_handler handler, uint32_t id) {
|
||||||
irq_handler = handler;
|
irq_handler = handler;
|
||||||
|
|
@ -227,8 +231,7 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
|
||||||
|
|
||||||
if (irq == RxIrq) {
|
if (irq == RxIrq) {
|
||||||
USART_ITConfig(usart, USART_IT_RXNE, ENABLE);
|
USART_ITConfig(usart, USART_IT_RXNE, ENABLE);
|
||||||
}
|
} else { // TxIrq
|
||||||
else { // TxIrq
|
|
||||||
USART_ITConfig(usart, USART_IT_TC, ENABLE);
|
USART_ITConfig(usart, USART_IT_TC, ENABLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -243,8 +246,7 @@ void serial_irq_set(serial_t *obj, SerialIrq irq, uint32_t enable) {
|
||||||
USART_ITConfig(usart, USART_IT_RXNE, DISABLE);
|
USART_ITConfig(usart, USART_IT_RXNE, DISABLE);
|
||||||
// Check if TxIrq is disabled too
|
// Check if TxIrq is disabled too
|
||||||
if ((usart->CR1 & USART_CR1_TXEIE) == 0) all_disabled = 1;
|
if ((usart->CR1 & USART_CR1_TXEIE) == 0) all_disabled = 1;
|
||||||
}
|
} else { // TxIrq
|
||||||
else { // TxIrq
|
|
||||||
USART_ITConfig(usart, USART_IT_TXE, DISABLE);
|
USART_ITConfig(usart, USART_IT_TXE, DISABLE);
|
||||||
// Check if RxIrq is disabled too
|
// Check if RxIrq is disabled too
|
||||||
if ((usart->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1;
|
if ((usart->CR1 & USART_CR1_RXNEIE) == 0) all_disabled = 1;
|
||||||
|
|
|
||||||
|
|
@ -34,8 +34,7 @@
|
||||||
extern void SetSysClock(void);
|
extern void SetSysClock(void);
|
||||||
|
|
||||||
// MCU SLEEP mode
|
// MCU SLEEP mode
|
||||||
void sleep(void)
|
void sleep(void) {
|
||||||
{
|
|
||||||
// Enable PWR clock
|
// Enable PWR clock
|
||||||
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
|
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
|
||||||
|
|
||||||
|
|
@ -44,8 +43,7 @@ void sleep(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
// MCU STOP mode
|
// MCU STOP mode
|
||||||
void deepsleep(void)
|
void deepsleep(void) {
|
||||||
{
|
|
||||||
// Enable PWR clock
|
// Enable PWR clock
|
||||||
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
|
RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -128,8 +128,7 @@ void spi_init(spi_t *obj, PinName mosi, PinName miso, PinName sclk, PinName ssel
|
||||||
if (ssel == NC) { // Master
|
if (ssel == NC) { // Master
|
||||||
obj->mode = SPI_Mode_Master;
|
obj->mode = SPI_Mode_Master;
|
||||||
obj->nss = SPI_NSS_Soft;
|
obj->nss = SPI_NSS_Soft;
|
||||||
}
|
} else { // Slave
|
||||||
else { // Slave
|
|
||||||
pinmap_pinout(ssel, PinMap_SPI_SSEL);
|
pinmap_pinout(ssel, PinMap_SPI_SSEL);
|
||||||
obj->mode = SPI_Mode_Slave;
|
obj->mode = SPI_Mode_Slave;
|
||||||
obj->nss = SPI_NSS_Soft;
|
obj->nss = SPI_NSS_Soft;
|
||||||
|
|
@ -147,8 +146,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {
|
||||||
// Save new values
|
// Save new values
|
||||||
if (bits == 8) {
|
if (bits == 8) {
|
||||||
obj->bits = SPI_DataSize_8b;
|
obj->bits = SPI_DataSize_8b;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
obj->bits = SPI_DataSize_16b;
|
obj->bits = SPI_DataSize_16b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -174,8 +172,7 @@ void spi_format(spi_t *obj, int bits, int mode, int slave) {
|
||||||
if (slave == 0) {
|
if (slave == 0) {
|
||||||
obj->mode = SPI_Mode_Master;
|
obj->mode = SPI_Mode_Master;
|
||||||
obj->nss = SPI_NSS_Soft;
|
obj->nss = SPI_NSS_Soft;
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
obj->mode = SPI_Mode_Slave;
|
obj->mode = SPI_Mode_Slave;
|
||||||
obj->nss = SPI_NSS_Hard;
|
obj->nss = SPI_NSS_Hard;
|
||||||
}
|
}
|
||||||
|
|
@ -187,26 +184,19 @@ void spi_frequency(spi_t *obj, int hz) {
|
||||||
// Note: The frequencies are obtained with SPI2 clock = 32 MHz (APB1 clock)
|
// Note: The frequencies are obtained with SPI2 clock = 32 MHz (APB1 clock)
|
||||||
if (hz < 250000) {
|
if (hz < 250000) {
|
||||||
obj->br_presc = SPI_BaudRatePrescaler_256; // 125 kHz
|
obj->br_presc = SPI_BaudRatePrescaler_256; // 125 kHz
|
||||||
}
|
} else if ((hz >= 250000) && (hz < 500000)) {
|
||||||
else if ((hz >= 250000) && (hz < 500000)) {
|
|
||||||
obj->br_presc = SPI_BaudRatePrescaler_128; // 250 kHz
|
obj->br_presc = SPI_BaudRatePrescaler_128; // 250 kHz
|
||||||
}
|
} else if ((hz >= 500000) && (hz < 1000000)) {
|
||||||
else if ((hz >= 500000) && (hz < 1000000)) {
|
|
||||||
obj->br_presc = SPI_BaudRatePrescaler_64; // 500 kHz
|
obj->br_presc = SPI_BaudRatePrescaler_64; // 500 kHz
|
||||||
}
|
} else if ((hz >= 1000000) && (hz < 2000000)) {
|
||||||
else if ((hz >= 1000000) && (hz < 2000000)) {
|
|
||||||
obj->br_presc = SPI_BaudRatePrescaler_32; // 1 MHz
|
obj->br_presc = SPI_BaudRatePrescaler_32; // 1 MHz
|
||||||
}
|
} else if ((hz >= 2000000) && (hz < 4000000)) {
|
||||||
else if ((hz >= 2000000) && (hz < 4000000)) {
|
|
||||||
obj->br_presc = SPI_BaudRatePrescaler_16; // 2 MHz
|
obj->br_presc = SPI_BaudRatePrescaler_16; // 2 MHz
|
||||||
}
|
} else if ((hz >= 4000000) && (hz < 8000000)) {
|
||||||
else if ((hz >= 4000000) && (hz < 8000000)) {
|
|
||||||
obj->br_presc = SPI_BaudRatePrescaler_8; // 4 MHz
|
obj->br_presc = SPI_BaudRatePrescaler_8; // 4 MHz
|
||||||
}
|
} else if ((hz >= 8000000) && (hz < 16000000)) {
|
||||||
else if ((hz >= 8000000) && (hz < 16000000)) {
|
|
||||||
obj->br_presc = SPI_BaudRatePrescaler_4; // 8 MHz
|
obj->br_presc = SPI_BaudRatePrescaler_4; // 8 MHz
|
||||||
}
|
} else { // >= 16000000
|
||||||
else { // >= 16000000
|
|
||||||
obj->br_presc = SPI_BaudRatePrescaler_2; // 16 MHz
|
obj->br_presc = SPI_BaudRatePrescaler_2; // 16 MHz
|
||||||
}
|
}
|
||||||
init_spi(obj);
|
init_spi(obj);
|
||||||
|
|
@ -233,8 +223,7 @@ static inline void ssp_write(spi_t *obj, int value) {
|
||||||
while (!ssp_writeable(obj));
|
while (!ssp_writeable(obj));
|
||||||
if (obj->bits == SPI_DataSize_8b) {
|
if (obj->bits == SPI_DataSize_8b) {
|
||||||
SPI_SendData8(spi, (uint8_t)value);
|
SPI_SendData8(spi, (uint8_t)value);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
SPI_I2S_SendData16(spi, (uint16_t)value);
|
SPI_I2S_SendData16(spi, (uint16_t)value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -244,8 +233,7 @@ static inline int ssp_read(spi_t *obj) {
|
||||||
while (!ssp_readable(obj));
|
while (!ssp_readable(obj));
|
||||||
if (obj->bits == SPI_DataSize_8b) {
|
if (obj->bits == SPI_DataSize_8b) {
|
||||||
return (int)SPI_ReceiveData8(spi);
|
return (int)SPI_ReceiveData8(spi);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return (int)SPI_I2S_ReceiveData16(spi);
|
return (int)SPI_I2S_ReceiveData16(spi);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -270,8 +258,7 @@ int spi_slave_read(spi_t *obj) {
|
||||||
SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi);
|
SPI_TypeDef *spi = (SPI_TypeDef *)(obj->spi);
|
||||||
if (obj->bits == SPI_DataSize_8b) {
|
if (obj->bits == SPI_DataSize_8b) {
|
||||||
return (int)SPI_ReceiveData8(spi);
|
return (int)SPI_ReceiveData8(spi);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
return (int)SPI_I2S_ReceiveData16(spi);
|
return (int)SPI_I2S_ReceiveData16(spi);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -281,8 +268,7 @@ void spi_slave_write(spi_t *obj, int value) {
|
||||||
while (!ssp_writeable(obj));
|
while (!ssp_writeable(obj));
|
||||||
if (obj->bits == SPI_DataSize_8b) {
|
if (obj->bits == SPI_DataSize_8b) {
|
||||||
SPI_SendData8(spi, (uint8_t)value);
|
SPI_SendData8(spi, (uint8_t)value);
|
||||||
}
|
} else {
|
||||||
else {
|
|
||||||
SPI_I2S_SendData16(spi, (uint16_t)value);
|
SPI_I2S_SendData16(spi, (uint16_t)value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue