Revision 4:9de90bc0f5b5, committed 2014-11-10

Comitter:

mega64

Date:

Mon Nov 10 23:56:41 2014 +0000

Parent:

3:ba038a3a65ec

Child:

5:83447a6b3b11

Commit message:

to tests;

Changed in this revision

--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/PeripheralNames.h	Mon Nov 10 05:43:20 2014 +0000
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/PeripheralNames.h	Mon Nov 10 23:56:41 2014 +0000
@@ -48,7 +48,7 @@
 
 #define STDIO_UART_TX  PA_2
 #define STDIO_UART_RX  PA_3
-#define STDIO_UART     UART_2
+#define STDIO_UART     UART_1
 
 typedef enum {
     SPI_1 = (int)SPI1_BASE,

--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/PinNames.h	Mon Nov 10 05:43:20 2014 +0000
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/PinNames.h	Mon Nov 10 23:56:41 2014 +0000
@@ -157,18 +157,18 @@
     LED2        = PA_5,
     LED3        = PA_5,
     LED4        = PA_5,
-    USER_BUTTON = PC_13,
+    USER_BUTTON = PA_0,//F4
     SERIAL_TX   = PA_2,
     SERIAL_RX   = PA_3,
     USBTX       = PA_2,
     USBRX       = PA_3,
-    I2C_SCL     = PB_8,
-    I2C_SDA     = PB_9,
+    I2C_SCL     = PA_9,//F4
+    I2C_SDA     = PA_10,//F4
     SPI_MOSI    = PA_7,
     SPI_MISO    = PA_6,
     SPI_SCK     = PA_5,
-    SPI_CS      = PB_6,
-    PWM_OUT     = PC_7,
+    SPI_CS      = PA_4,//F4
+    PWM_OUT     = PB_1,//F4
 
     // Not connected
     NC = (int)0xFFFFFFFF

--- a/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c	Mon Nov 10 05:43:20 2014 +0000
+++ b/targets/hal/TARGET_STM/TARGET_NUCLEO_F030R8/analogin_api.c	Mon Nov 10 23:56:41 2014 +0000
@@ -34,6 +34,8 @@
 #include "cmsis.h"
 #include "pinmap.h"
 
+
+/* STM32F030R8 - Nucleo
 static const PinMap PinMap_ADC[] = {
     {PA_0, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN0
     {PA_1, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN1
@@ -53,6 +55,25 @@
     {PC_5, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN15
     {NC,   NC,    0}
 };
+*/
+
+
+// STM32F030F4
+static const PinMap PinMap_ADC[] = {
+    {PA_0, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN0
+    {PA_1, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN1
+    {PA_2, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN2
+    {PA_3, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN3
+    {PA_4, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN4
+    {PA_5, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN5
+    {PA_6, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN6
+    {PA_7, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN7
+    {PB_1, ADC_1, STM_PIN_DATA(STM_MODE_ANALOG, GPIO_NOPULL, 0)}, // ADC1_IN9
+    {NC,   NC,    0}
+};
+//
+
+
 
 ADC_HandleTypeDef AdcHandle;
 
@@ -107,6 +128,7 @@
     sConfig.Rank         = ADC_RANK_CHANNEL_NUMBER;
     sConfig.SamplingTime = ADC_SAMPLETIME_7CYCLES_5;
 
+/* STM32F030R8 - Nucleo
     switch (obj->pin) {
         case PA_0:
             sConfig.Channel = ADC_CHANNEL_0;
@@ -158,6 +180,45 @@
             break;
         default:
             return 0;
+*/
+
+
+// STM32F030F4
+    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_1:
+            sConfig.Channel = ADC_CHANNEL_9;
+            break;
+        default:
+            return 0;
+//
+
+
+
+
     }
 
     // Clear all channels as it is not done in HAL_ADC_ConfigChannel()