Merge pull request #244 from bcostm/master

[NUCLEO_xxx] Various bugs correction
pull/246/head
Bogdan Marinescu 2014-04-02 18:12:39 +01:00
commit be141acdd0
9 changed files with 15 additions and 6 deletions

View File

@ -148,6 +148,8 @@ typedef enum {
LED3 = PA_5,
LED4 = PA_5,
USER_BUTTON = PC_13,
SERIAL_TX = PA_2,
SERIAL_RX = PA_3,
USBTX = PA_2,
USBRX = PA_3,
I2C_SCL = PB_8,

View File

@ -28,6 +28,7 @@
*******************************************************************************
*/
#include "pinmap.h"
#include "PortNames.h"
#include "error.h"
// Enable GPIO clock and return GPIO base address

View File

@ -138,6 +138,8 @@ typedef enum {
LED3 = PA_5,
LED4 = PA_5,
USER_BUTTON = PC_13,
SERIAL_TX = PA_2,
SERIAL_RX = PA_3,
USBTX = PA_2,
USBRX = PA_3,
I2C_SCL = PB_8,

View File

@ -28,6 +28,7 @@
*******************************************************************************
*/
#include "pinmap.h"
#include "PortNames.h"
#include "error.h"
// Alternate-function mapping

View File

@ -131,9 +131,9 @@ typedef enum {
D8 = PA_9,
D9 = PC_7,
D10 = PB_6,
D11 = PA_7,
D12 = PA_6,
D13 = PA_5,
D11 = PB_15,
D12 = PB_14,
D13 = PB_13,
D14 = PB_9,
D15 = PB_8,

View File

@ -28,6 +28,7 @@
*******************************************************************************
*/
#include "pinmap.h"
#include "PortNames.h"
#include "error.h"
// Enable GPIO clock and return GPIO base address

View File

@ -28,6 +28,7 @@
*******************************************************************************
*/
#include "pinmap.h"
#include "PortNames.h"
#include "error.h"
#include "stm32f4xx_hal.h"

View File

@ -77,7 +77,7 @@ static const PinMap PinMap_PWM[] = {
{PC_6, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH1
{PC_7, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH2
{PC_8, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH3
{PC_9, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH3
{PC_9, PWM_3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3)}, // TIM3_CH4
{NC, NC, 0}
};
@ -189,7 +189,6 @@ void pwmout_write(pwmout_t* obj, float value) {
case PB_8:
case PB_10:
case PC_8:
case PC_9:
channel = TIM_CHANNEL_3;
break;
// Channels 3N
@ -202,7 +201,8 @@ void pwmout_write(pwmout_t* obj, float value) {
//case PA_3:
case PA_11:
//case PB_1:
case PB_9:
case PB_9:
case PC_9:
channel = TIM_CHANNEL_4;
break;
default:

View File

@ -28,6 +28,7 @@
*******************************************************************************
*/
#include "pinmap.h"
#include "PortNames.h"
#include "error.h"
// Enable GPIO clock and return GPIO base address