review gpio adc pwm

Author: nulllab

cores/w806/Arduino.h

@@ -56,6 +56,8 @@ void yield(void);
 #define INPUT_PULLUP 0x2
 #define OUTPUT_OD 0x03
 #define INPUT_PULLDOWN 0x4
+#define ANALOG_INPUT 0x5
+#define PWM_OUT 0x6
 
 // undefine mathlib's pi if encountered
 #ifdef PI
@@ -154,7 +156,7 @@ void pinMode(uint8_t pin, uint8_t mode);
 void digitalWrite(uint8_t pin, uint8_t val);
 
 uint8_t digitalRead(uint8_t pin);
-  
+
 #define ADC8BIT 0xFF
 #define ADC16BIT 0xFFFF
 void analogReadResolution(uint8_t);

cores/w806/wiring.c

@@ -41,5 +41,7 @@ void init()
 {
     HAL_Init();
     __HAL_RCC_GPIO_CLK_ENABLE();
+    __HAL_RCC_ADC_CLK_ENABLE();
+    __HAL_RCC_PWM_CLK_ENABLE();
 }
 

cores/w806/wiring_analog.c

@@ -26,6 +26,7 @@
 
 #include "pins_arduino.h"
 #include "./include/driver/wm_adc.h"
+#include "Arduino.h"
 
 #define ADC_NORMAL (0U) /*polling mode*/
 #define ADC_IT (1U)     /*interrupt mode*/
@@ -85,9 +86,9 @@ int analogRead(uint8_t pin) /*all ADC channel range is 0-2.4V*/
     {
         channel_index = (uint16_t)g_APinDescription[pin].ulAnalogChannel >> 8; //ADC_ANA_CR_CH_0
 
-        if (g_pinStatus[pin] != PIN_ATTR_ANALOG)
+        if (g_pinStatus[pin] != ANALOG_INPUT)
         {
-            g_pinStatus[pin] = PIN_ATTR_ANALOG;
+            g_pinStatus[pin] = ANALOG_INPUT;
 
             adcPinState[channel_index].pin = pin;
             adcPinState[channel_index].hadc.Instance = ADC;
@@ -118,6 +119,29 @@ int analogRead(uint8_t pin) /*all ADC channel range is 0-2.4V*/
     return val & adcResolution;
 }
 
+
+void disable_adc(uint8_t pin) /*disable pin's ADC channel function*/
+{
+#if (ADC_MODE == ADC_IT)
+     HAL_NVIC_DisableIRQ(ADC_IRQn);
+#else
+
+   // uint8_t channel_index = 0;
+    ADC_HandleTypeDef hadc;
+    if (g_APinDescription[pin].ulPinAttribute & PIN_ATTR_ANALOG)
+    {
+       // channel_index = (uint16_t)g_APinDescription[pin].ulAnalogChannel >> 8; //ADC_ANA_CR_CH_0
+        hadc.Instance = ADC;
+        hadc.Init.channel = g_APinDescription[pin].ulAnalogChannel; //channel[ch];
+        hadc.Init.freq = 1000;
+        hadc.offset = ADC_DEFAULT_OFFSET;
+    }
+
+    HAL_ADC_Stop(&hadc);
+#endif
+}
+
+
 void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hadc)
 {
 }
@@ -148,7 +172,6 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
 {
     if (hadc->Instance == ADC)
     {
-        __HAL_RCC_ADC_CLK_ENABLE();
         // __HAL_RCC_GPIO_CLK_ENABLE();
 
         //ADC_CHANNEL_0 : PA1
@@ -184,7 +207,7 @@ void HAL_ADC_MspInit(ADC_HandleTypeDef *hadc)
             __HAL_AFIO_REMAP_ADC(GPIOA, GPIO_PIN_2);
         }
 #if (ADC_MODE == ADC_IT)
-        // 如果用到中断方式需要使能中断
+        // 如果用到中断方式需要使能中�
         HAL_NVIC_SetPriority(ADC_IRQn, 0);
         HAL_NVIC_EnableIRQ(ADC_IRQn);
 #endif
@@ -199,7 +222,7 @@ void HAL_ADC_MspDeInit(ADC_HandleTypeDef *hadc)
     {
         if (hadc->Init.channel == adcPinState[i].hadc.Init.channel)
         {
-            if (g_pinStatus[adcPinState[i].pin] == PIN_ATTR_ANALOG)
+            if (g_pinStatus[adcPinState[i].pin] == ANALOG_INPUT)
             {
                 g_pinStatus[adcPinState[i].pin] = PIN_ATTR_NONE;
                 HAL_GPIO_DeInit(GPIOA, adcPinState[i].pin);
@@ -217,13 +240,10 @@ void analogWrite(uint32_t pin, uint32_t val)
     uint8_t channel_index = 0;
     if (g_APinDescription[pin].ulPinAttribute & PIN_ATTR_PWM) /*this pin has pwm attr*/
     {
-        printf("init pin {%d}\r\n", pin);
         channel_index = (uint16_t)g_APinDescription[pin].ulPWMChannel;
-        if (g_pinStatus[pin] != PIN_ATTR_PWM) /*need init this pin first*/
+        if (g_pinStatus[pin] != PWM_OUT) /*need init this pin first*/
         {
-
-            g_pinStatus[pin] = PIN_ATTR_PWM;
-
+            g_pinStatus[pin] = PWM_OUT;
             pwmPinState[channel_index].pin = pin;
             pwmPinState[channel_index].hpwm.Instance = PWM;
             pwmPinState[channel_index].hpwm.Init.AutoReloadPreload = PWM_AUTORELOAD_PRELOAD_ENABLE;
@@ -232,8 +252,7 @@ void analogWrite(uint32_t pin, uint32_t val)
             pwmPinState[channel_index].hpwm.Init.Prescaler = 312;                    //40M / 312 = 12.8K						//分频 1M
             pwmPinState[channel_index].hpwm.Init.Period = 255;                       // 12.8K / 256 = 500HZ
             pwmPinState[channel_index].hpwm.Init.Pulse = 100;                        // (100/256)% DUTY
-            pwmPinState[channel_index].hpwm.Init.OutMode = PWM_OUT_MODE_INDEPENDENT; //通道独立输出
-
+            pwmPinState[channel_index].hpwm.Init.OutMode = PWM_OUT_MODE_INDEPENDENT;
             pwmPinState[channel_index].hpwm.Channel = channel_index;
             HAL_PWM_Init(&(pwmPinState[channel_index].hpwm));
             HAL_PWM_Start(&(pwmPinState[channel_index].hpwm), channel_index);
@@ -248,6 +267,21 @@ void analogWrite(uint32_t pin, uint32_t val)
     }
 }
 
+void disable_pwm(uint8_t pin) /*disable pin's ADC channel function*/
+{
+    uint8_t channel_index = 0;
+    PWM_HandleTypeDef hpwm;
+    if (g_APinDescription[pin].ulPinAttribute & PIN_ATTR_PWM) /*this pin has pwm attr*/
+    {
+       channel_index = (uint16_t)g_APinDescription[pin].ulPWMChannel;
+
+       hpwm.Instance = PWM;
+       hpwm.Channel = channel_index;
+    }
+    HAL_PWM_Stop(&hpwm, channel_index);
+}
+
+
 void HAL_PWM_MspInit(PWM_HandleTypeDef *hpwm)
 {
     for (int i = 0; i < PWM_COUNT; i++)
@@ -256,8 +290,6 @@ void HAL_PWM_MspInit(PWM_HandleTypeDef *hpwm)
         {
             if (g_pinStatus[pwmPinState[i].pin] == PIN_ATTR_PWM)
             {
-                __HAL_RCC_PWM_CLK_ENABLE();
-
                 if (hpwm->Channel == PWM_CH0)
                 {
                     __HAL_AFIO_REMAP_PWM0(g_APinDescription[pwmPinState[i].pin].pPort, g_APinDescription[pwmPinState[i].pin].ulPin);

cores/w806/wiring_digital.c

@@ -28,13 +28,14 @@
 #include "Arduino.h"
 #include "pins_arduino.h"
 #include "./include/driver/wm_gpio.h"
+#include "variant.h"
 
 void pinMode(uint8_t pin, uint8_t mode)
 {
     GPIO_InitTypeDef GPIO_InitStruct = {0};
     GPIO_TypeDef *port = (pin > 15)? GPIOB:GPIOA;
     if (pin > 15) { pin -= 16; }
-
+    g_pinStatus[pin] = mode;
     GPIO_InitStruct.Pin = 1<<pin;
     switch (mode)
     {
@@ -60,16 +61,28 @@ void pinMode(uint8_t pin, uint8_t mode)
 
     HAL_GPIO_Init(port, &GPIO_InitStruct);
 }
-/*
-static void __turnOffPWM(uint8_t timer)
+extern void disable_pwm(uint8_t pin);
+static void __turnOffPWM(uint8_t pin)
 {
+    disable_pwm(pin);
+}
 
+extern void disable_adc(uint8_t pin);
+static void __turnOffADC(uint8_t pin)
+{
+    disable_adc(pin);
 }
-*/
+
 void digitalWrite(uint8_t pin, uint8_t val)
 {
     GPIO_TypeDef *port = (pin > 15)? GPIOB:GPIOA;
     if (pin > 15) { pin -= 16; }
+    if (g_pinStatus[pin] == PWM_OUT) {
+        __turnOffPWM(pin);
+    } else if (g_pinStatus[pin] == ANALOG_INPUT) {
+        __turnOffADC(pin);
+    }
+    g_pinStatus[pin] = OUTPUT_OD;
     HAL_GPIO_WritePin(port, 1 << pin, (GPIO_PinState)val);
     //HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0, (GPIO_PinState)val);
 }
@@ -78,12 +91,24 @@ uint8_t digitalRead(uint8_t pin)
 {
     GPIO_TypeDef *port = (pin > 15)? GPIOB:GPIOA;
     if (pin > 15) { pin -= 16; }
+    if (g_pinStatus[pin] == PWM_OUT) {
+        __turnOffPWM(pin);
+    } else if (g_pinStatus[pin] == ANALOG_INPUT) {
+        __turnOffADC(pin);
+    }
+    g_pinStatus[pin] = INPUT;
     return HAL_GPIO_ReadPin(port, 1<<pin);
 }
 
 void digitalToggle(uint8_t pin)
 {
     GPIO_TypeDef *port = (pin > 15)? GPIOB:GPIOA;
     if (pin > 15) { pin -= 16; }
+    if (g_pinStatus[pin] == PWM_OUT) {
+        __turnOffPWM(pin);
+    } else if (g_pinStatus[pin] == ANALOG_INPUT) {
+        __turnOffADC(pin);
+    }
+    g_pinStatus[pin] = OUTPUT_OD;
     HAL_GPIO_TogglePin(port, 1<<pin);
 }