Revision 7:cd502aeab71a, committed 2017-02-21

Comitter:

Brand101

Date:

Tue Feb 21 15:33:10 2017 +0000

Parent:

6:11dea4c204ba

Commit message:

45465446

Changed in this revision

diff -r 11dea4c204ba -r cd502aeab71a EncoderMspInitF0.cpp
--- a/EncoderMspInitF0.cpp	Fri Oct 14 13:38:48 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-#include "mbed.h"
-/*
- * HAL_TIM_Encoder_MspInit()
- * Overrides the __weak function stub in stm32f0xx_hal_tim.h
- *
- * Edit the below for your preferred pin wiring & pullup/down
- * I have encoder common at 3V3, using GPIO_PULLDOWN on inputs.
- * Encoder A&B outputs connected directly to GPIOs.
- *
- * http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00088500.pdf
- * Table 11 has GPIO alternate function pinout mappings.
- *
- * TIM1_CH1: AF2 @ PA_8 - TIM1 used as system ticker under mbed, so unavailable
- * TIM1_CH2: AF2 @ PA_9
- *
- * TIM3_CH1: AF1 @ PA_6, PB_4; AF0 @ PC_6*  *only for F030xC devices
- * TIM3_CH2: AF1 @ PA_7, PB_5; AF0 @ PC_7*
- *
- */
-
-#ifdef TARGET_STM32F0
-void HAL_TIM_Encoder_MspInit(TIM_HandleTypeDef *htim)
-{
-    GPIO_InitTypeDef GPIO_InitStruct;
-
-    if (htim->Instance == TIM3) { //PB_4 PB_5 = Nucleo D5 D4
-        __TIM3_CLK_ENABLE();
-        __GPIOB_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_4 | GPIO_PIN_5;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF1_TIM3;
-        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-    }
-}
-#endif
\ No newline at end of file

diff -r 11dea4c204ba -r cd502aeab71a EncoderMspInitF1.cpp
--- a/EncoderMspInitF1.cpp	Fri Oct 14 13:38:48 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-#include "mbed.h"
-/*
- * HAL_TIM_Encoder_MspInit()
- * Overrides the __weak function stub in stm32f1xx_hal_tim.h
- *
- * Edit the below for your preferred pin wiring & pullup/down
- * I have encoder common at 3V3, using GPIO_PULLDOWN on inputs.
- * Encoder A&B outputs connected directly to GPIOs.
- *
- * http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/CD00161566.pdf
- * Table 5 has GPIO alternate function pinout mappings.
- *
- * TIM1_CH1: default PA_8, remap PE_9
- * TIM1_CH2: default PA_9, remap PE_11
- *
- * TIM2_CH1: default PA_0 
- * TIM2_CH2: default PA_1, remap PB_3
- *
- * TIM3_CH1: default PA_6, remap PB_4, PC_6
- * TIM3_CH2: default PA_7, remap PB_5, PC_7
- *
- * TIM4_CH1: default PB_6, remap PD_12
- * TIM4_CH2: default PB_7, remap PD_13
- *
- * NB one of these timers will be the employed by mbed as systick, unavailable as encoder.
- */
-
-#ifdef TARGET_STM32F1
-void HAL_TIM_Encoder_MspInit(TIM_HandleTypeDef *htim)
-{
-    GPIO_InitTypeDef GPIO_InitStruct;
-
-    if (htim->Instance == TIM1) { //PA8 PA9 = Nucleo D7 D8
-        __TIM1_CLK_ENABLE();
-        __GPIOA_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_9;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-//        GPIO_InitStruct.Alternate = GPIO_AF1_TIM1;
-        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-    }
-    else if (htim->Instance == TIM2) { //PA0 PA1 = Nucleo A0 A1
-        __TIM2_CLK_ENABLE();
-        __GPIOA_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-//        GPIO_InitStruct.Alternate = GPIO_AF1_TIM2;
-        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-    }
-    else if (htim->Instance == TIM3) { //PA6 PA7 = Nucleo D12 D11
-        __TIM3_CLK_ENABLE();
-        __GPIOA_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_6 | GPIO_PIN_7;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-//        GPIO_InitStruct.Alternate = GPIO_AF2_TIM3;
-        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-    }
-    else if (htim->Instance == TIM4) { // PB6 PB7 = Nucleo D10 MORPHO PB7
-        __TIM4_CLK_ENABLE();
-        __GPIOB_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_6 | GPIO_PIN_7;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-//        GPIO_InitStruct.Alternate = GPIO_AF2_TIM4;
-        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-    }
-}
-#endif
\ No newline at end of file

diff -r 11dea4c204ba -r cd502aeab71a EncoderMspInitF3.cpp
--- a/EncoderMspInitF3.cpp	Fri Oct 14 13:38:48 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-#include "mbed.h"
-/*
- * HAL_TIM_Encoder_MspInit()
- * Overrides the __weak function stub in stm32f3xx_hal_tim.h
- *
- * Edit the below for your preferred pin wiring & pullup/down
- * I have encoder common at 3V3, using GPIO_PULLDOWN on inputs.
- * Encoder A&B outputs connected directly to GPIOs.
- *
- * http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00093333.pdf
- * http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00097745.pdf
- * http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00133117.pdf
- * Table 14 has GPIO alternate function pinout mappings.
- *
- * TIM1_CH1: AF2 @ PC_0, PE_9; AF6 @ PA_8
- * TIM1_CH2: AF2 @ PC_1, PE_11; AF6 @ PA_9
- *
- * (TIM2_CH1: AF1 @ PA_0, PA_5, PA_15; AF2 @ PD_3)  TIM2 is the mbed system ticker, so unavailable as encoder.
- * (TIM2_CH2: AF1 @ PA_1, PB_3; AF2 @ PD_4)
- *
- * TIM3_CH1: AF2 @ PA_6, PB_4, PC_6, PE_2           not for F302R8, OK @ F334R8
- * TIM3_CH2: AF2 @ PA_4, PA_7, PB_5, PC_7, PE_3
- *
- * TIM4_CH1: AF2 @ PB_6, PD_12; AF10 @ PA_11        not for both F302R8 & F334R8
- * TIM4_CH2: AF2 @ PB_7, PD_13; AF10 @ PA_12
- *
- */
-
-#ifdef TARGET_STM32F3
-
-void HAL_TIM_Encoder_MspInit(TIM_HandleTypeDef *htim)
-{
-    GPIO_InitTypeDef GPIO_InitStruct;
-
-    if (htim->Instance == TIM1) { //PA8 PA9 = Nucleo D7 D8
-        __TIM1_CLK_ENABLE();
-        __GPIOA_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_9;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF6_TIM1;
-        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-    }
-#if 0 //TIM2 is the mbed system ticker
-    else if (htim->Instance == TIM2) { //PA0 PA1 = Nucleo A0 A1
-        __TIM2_CLK_ENABLE();
-        __GPIOA_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF1_TIM2;
-        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-    }
-#endif
-#if defined TARGET_STM32F334R8
-    else if (htim->Instance == TIM3) { //PB4 PB5 = Nucleo D5 D4
-        __TIM3_CLK_ENABLE();
-        __GPIOB_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_4 | GPIO_PIN_5;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF2_TIM3;
-        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-    }
-#endif
-#if 0
-    else if (htim->Instance == TIM4) { // PB6 PB7 = Nucleo D10 MORPHO_PB7
-        __TIM4_CLK_ENABLE();
-        __GPIOB_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_6 | GPIO_PIN_7;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF2_TIM4;
-        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-    }
-#endif
-}
-#endif
\ No newline at end of file

diff -r 11dea4c204ba -r cd502aeab71a EncoderMspInitF4.cpp
--- a/EncoderMspInitF4.cpp	Fri Oct 14 13:38:48 2016 +0000
+++ b/EncoderMspInitF4.cpp	Tue Feb 21 15:33:10 2017 +0000
@@ -52,10 +52,10 @@
         GPIO_InitStruct.Alternate = GPIO_AF1_TIM2;
         HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
     }
-    else if (htim->Instance == TIM3) { //PB4 PB5 = Nucleo D5 D4
+    else if (htim->Instance == TIM3) { //PA6 PA7 = Nucleo D12 D11               //MY MODIF
         __TIM3_CLK_ENABLE();
         __GPIOB_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_4 | GPIO_PIN_5;
+        GPIO_InitStruct.Pin = GPIO_PIN_6 | GPIO_PIN_7;                          //MY MODIF
         GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
         GPIO_InitStruct.Pull = GPIO_PULLDOWN;
         GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;

diff -r 11dea4c204ba -r cd502aeab71a EncoderMspInitL0.cpp
--- a/EncoderMspInitL0.cpp	Fri Oct 14 13:38:48 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-#include "mbed.h"
-/*
- * HAL_TIM_Encoder_MspInit()
- * Overrides the __weak function stub in stm32f4xx_hal_tim.h
- *
- * Edit the below for your preferred pin wiring & pullup/down
- * I have encoder common at 3V3, using GPIO_PULLDOWN on inputs.
- * Encoder A&B outputs connected directly to GPIOs.
- *
- */
-
-#ifdef TARGET_STM32L0
-void HAL_TIM_Encoder_MspInit(TIM_HandleTypeDef *htim)
-{
-    GPIO_InitTypeDef GPIO_InitStruct;
-
-    if (htim->Instance == TIM2) { //PA0 PA1 = Nucleo A0 A1
-        __TIM2_CLK_ENABLE();
-        __GPIOA_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF1_TIM2;
-        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-    }
-}
-#endif
\ No newline at end of file

diff -r 11dea4c204ba -r cd502aeab71a EncoderMspInitL1.cpp
--- a/EncoderMspInitL1.cpp	Fri Oct 14 13:38:48 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-#include "mbed.h"
-/*
- * HAL_TIM_Encoder_MspInit()
- * Overrides the __weak function stub in stm32l4xx_hal_tim.h
- *
- * Edit the below for your preferred pin wiring & pullup/down
- * I have encoder common at 3V3, using GPIO_PULLDOWN on inputs.
- * Encoder A&B outputs connected directly to GPIOs.
- *
- * http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00098321.pdf
- * Table 9 has GPIO alternate function pinout mappings.
- *
- * TIM2_CH1: AF1 @ PA_0, PA_5, PA_15, PE_9
- * TIM2_CH2: AF1 @ PA_1, PB_3, PE_10
- *
- * TIM3_CH1: AF2 @ PA_6, PB_4, PC_6, PE_3
- * TIM3_CH2: AF2 @ PA_7, PB_5, PC_7, PE_4
- *
- * TIM4_CH1: AF2 @ PB_6, PD_12
- * TIM4_CH2: AF2 @ PB_7, PD_13
- *
- * TIM5_CH1: AF2 @ PA_0*    *TIM5 used by mbed system ticker so unavailable
- * TIM5_CH2: AF2 @ PA_1*
- *
- */
-
-#ifdef TARGET_STM32L1
-void HAL_TIM_Encoder_MspInit(TIM_HandleTypeDef *htim)
-{
-    GPIO_InitTypeDef GPIO_InitStruct;
-
-    if (htim->Instance == TIM2) { //PA0 PA1 = Nucleo A0 A1
-        __TIM2_CLK_ENABLE();
-        __GPIOA_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF1_TIM2;
-        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-    }
-    else if (htim->Instance == TIM3) { //PB4 PB5 = Nucleo D5 D4
-        __TIM3_CLK_ENABLE();
-        __GPIOB_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_4 | GPIO_PIN_5;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF2_TIM3;
-        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-    }
-    else if (htim->Instance == TIM4) { // PB6 PB7 = Nucleo D10 MORPHO_PB7
-        __TIM4_CLK_ENABLE();
-        __GPIOB_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_6 | GPIO_PIN_7;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF2_TIM4;
-        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-    }
-}
-#endif
\ No newline at end of file

diff -r 11dea4c204ba -r cd502aeab71a EncoderMspInitL4.cpp
--- a/EncoderMspInitL4.cpp	Fri Oct 14 13:38:48 2016 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-#include "mbed.h"
-/*
- * HAL_TIM_Encoder_MspInit()
- * Overrides the __weak function stub in stm32f4xx_hal_tim.h
- *
- * Edit the below for your preferred pin wiring & pullup/down
- * I have encoder common at 3V3, using GPIO_PULLDOWN on inputs.
- * Encoder A&B outputs connected directly to GPIOs.
- *
- * http://www.st.com/st-web-ui/static/active/en/resource/technical/document/datasheet/DM00108832.pdf
- * Table 15 has GPIOx AFx pinouts
- *
- * TIM1_CH1: AF1 @ PA8, PE9
- * TIM1_CH2: AF1 @ PA9, PE11
- *
- * TIM2_CH1: AF1 @ PA0, PA5, PA15
- * TIM2_CH2: AF1 @ PA1, PB3
- *
- * TIM3_CH1: AF2 @ PA6, PB4, PC6, PE3
- * TIM3_CH2: AF2 @ PA7, PB5, PC7, PE4
- *
- * TIM4_CH1: AF2 @ PB6, PD12
- * TIM4_CH2: AF2 @ PB7, PD13
- *
- * TIM5_CH1: AF2 @ PA0, PF6
- * TIM5_CH2: AF2 @ PA1, PF7
- *
- */
-
-#ifdef TARGET_STM32L4
-void HAL_TIM_Encoder_MspInit(TIM_HandleTypeDef *htim)
-{
-    GPIO_InitTypeDef GPIO_InitStruct;
-
-    if (htim->Instance == TIM1) {       //PA8 PA9 = Nucleo D7 D8
-        __TIM1_CLK_ENABLE();
-        __GPIOA_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_8 | GPIO_PIN_9;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF1_TIM1;
-        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-    }
-    else if (htim->Instance == TIM2) {  //PA0 PA1 = Nucleo A0 A1
-        __TIM2_CLK_ENABLE();
-        __GPIOA_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF1_TIM2;
-        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-    }
-    else if (htim->Instance == TIM3) {  //PB4 PB5 = Nucleo D5 D4
-        __TIM3_CLK_ENABLE();
-        __GPIOB_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_4 | GPIO_PIN_5;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF2_TIM3;
-        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-    }
-    else if (htim->Instance == TIM4) { // PB6 PB7 = Nucleo D10 MORPHO_PB7
-        __TIM4_CLK_ENABLE();
-        __GPIOB_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_6 | GPIO_PIN_7;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF2_TIM4;
-        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
-    }
-    else if (htim->Instance == TIM5) { // here for completeness, mbed sytem timer uses this
-        __TIM5_CLK_ENABLE();
-        __GPIOA_CLK_ENABLE();
-        GPIO_InitStruct.Pin = GPIO_PIN_0 | GPIO_PIN_1;
-        GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
-        GPIO_InitStruct.Pull = GPIO_PULLDOWN;
-        GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
-        GPIO_InitStruct.Alternate = GPIO_AF2_TIM5;
-        HAL_GPIO_Init(GPIOA, &GPIO_InitStruct);
-    }
-}
-#endif
\ No newline at end of file