Change analog pin configiration struct from PinDescription to boolean

Author: danieleff

cores/arduino/wiring_analog.c

@@ -24,8 +24,8 @@ extern "C" {
 
 
 //This is the list of the digital IOs configured
-PinDescription g_anInputPinConfigured[MAX_ANALOG_IOS];
-PinDescription g_anOutputPinConfigured[MAX_DIGITAL_IOS];
+boolean g_anInputPinConfigured[MAX_DIGITAL_IOS];
+boolean g_anOutputPinConfigured[MAX_DIGITAL_IOS];
 
 
 static int _readResolution = 10;
@@ -60,9 +60,6 @@ uint32_t analogRead(uint32_t ulPin)
   uint32_t ulValue = 0;
   uint8_t do_init = 0;
 
-  //put mask only to have the lower digits
-  uint32_t apin = ulPin&0x0000000F;
-
   if(ulPin>MAX_DIGITAL_IOS) {
     return 0;
   }
@@ -71,17 +68,15 @@ uint32_t analogRead(uint32_t ulPin)
     ulPin = analogPinConvert(ulPin);
   }
 
-  if((ulPin<0) && (apin < MAX_ANALOG_IOS))
+  if(ulPin<0)
     return 0;
 
-  g_anInputPinConfigured[apin] = g_APinDescription[ulPin];
-
-  if(g_anInputPinConfigured[apin].configured == false) {
+  if(g_anInputPinConfigured[ulPin] == false) {
     do_init = 1;
-    g_anInputPinConfigured[apin].configured = true;
+    g_anInputPinConfigured[ulPin] = true;
   }
 
-  ulValue = adc_read_value(g_anInputPinConfigured[apin].ulPort, g_anInputPinConfigured[apin].ulPin, do_init);
+  ulValue = adc_read_value(g_APinDescription[ulPin].ulPort, g_APinDescription[ulPin].ulPin, do_init);
 
   ulValue = mapResolution(ulValue, ADC_RESOLUTION, _readResolution);
 
@@ -98,39 +93,35 @@ void analogOutputInit(void) {
 // to digital output.
 void analogWrite(uint32_t ulPin, uint32_t ulValue) {
 
-  //put mask only to have the lower digits
-  uint32_t apin = ulPin&0x0000000F;
   uint32_t attr = 0;
   uint8_t do_init = 0;
 
   if(ulPin>MAX_DIGITAL_IOS) {
     return;
   }
 
-  if((ulPin<0) && (apin < MAX_DIGITAL_IOS))
+  if(ulPin<0)
     return;
 
-  g_anOutputPinConfigured[apin] = g_APinDescription[ulPin];
-
-  if(g_anOutputPinConfigured[apin].configured == false) {
+  if(g_anOutputPinConfigured[ulPin] == false) {
     do_init = 1;
-    g_anOutputPinConfigured[apin].configured = true;
+    g_anOutputPinConfigured[ulPin] = true;
   }
 
-  attr = g_anOutputPinConfigured[apin].mode;
+  attr = g_APinDescription[ulPin].mode;
 
   if((attr & GPIO_PIN_DAC) == GPIO_PIN_DAC) {
 
     ulValue = mapResolution(ulValue, _writeResolution, DACC_RESOLUTION);
-    dac_write_value(g_anOutputPinConfigured[apin].ulPort,
-                    g_anOutputPinConfigured[apin].ulPin,
+    dac_write_value(g_APinDescription[ulPin].ulPort,
+                    g_APinDescription[ulPin].ulPin,
                     ulValue, do_init);
 
   } else if((attr & GPIO_PIN_PWM) == GPIO_PIN_PWM) {
 
     ulValue = mapResolution(ulValue, _writeResolution, PWM_RESOLUTION);
-    pwm_start(g_anOutputPinConfigured[apin].ulPort,
-                    g_anOutputPinConfigured[apin].ulPin,
+    pwm_start(g_APinDescription[ulPin].ulPort,
+                    g_APinDescription[ulPin].ulPin,
                     PWM_FREQUENCY*PWM_MAX_DUTY_CYCLE,
                     PWM_MAX_DUTY_CYCLE,
                     ulValue, do_init);