Revision 13:ccf0ab6bbe3a, committed 2018-03-13

Comitter:

0x6d61726b

Date:

Tue Mar 13 23:05:42 2018 +0000

Parent:

12:d9df0fc380bf

Commit message:

defines changed from TARGET_LPC1768 to TARGET_LPC176X to support LPC1769 target

Changed in this revision

diff -r d9df0fc380bf -r ccf0ab6bbe3a FastAnalogIn.h
--- a/FastAnalogIn.h	Tue Mar 13 22:58:00 2018 +0000
+++ b/FastAnalogIn.h	Tue Mar 13 23:05:42 2018 +0000
@@ -11,14 +11,14 @@
     #error "Target not supported"
 #endif
 
- /** A class similar to AnalogIn, only faster, for LPC1768, LPC408X and KLxx
+ /** A class similar to AnalogIn, only faster, for LPC176X, LPC408X and KLxx
  *
  * AnalogIn does a single conversion when you read a value (actually several conversions and it takes the median of that).
  * This library runns the ADC conversion automatically in the background.
  * When read is called, it immediatly returns the last sampled value.
  *
- * LPC1768 / LPC4088
- * Using more ADC pins in continuous mode will decrease the conversion rate (LPC1768:200kHz/LPC4088:400kHz).
+ * LPC176X / LPC4088
+ * Using more ADC pins in continuous mode will decrease the conversion rate (LPC176X:200kHz/LPC4088:400kHz).
  * If you need to sample one pin very fast and sometimes also need to do AD conversions on another pin,
  * you can disable the continuous conversion on that ADC channel and still read its value.
  *
@@ -48,7 +48,7 @@
  *     }
  * }
  * @endcode
- * Example for the LPC1768 processor:
+ * Example for the LPC176X processor:
  * @code
  * // Print messages when the AnalogIn is greater than 50%
  *

diff -r d9df0fc380bf -r ccf0ab6bbe3a FastAnalogIn_LPC1768.cpp
--- a/FastAnalogIn_LPC1768.cpp	Tue Mar 13 22:58:00 2018 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-#ifdef TARGET_LPC1768
-
-#include "FastAnalogIn.h"
-static inline int div_round_up(int x, int y)
-{
-    return (x + (y - 1)) / y;
-}
-
-static const PinMap PinMap_ADC[] = {
-    P0_23, ADC0_0, 1,
-    P0_24, ADC0_1, 1,
-    P0_25, ADC0_2, 1,
-    P0_26, ADC0_3, 1,
-    P1_30, ADC0_4, 3,
-    P1_31, ADC0_5, 3,
-    P0_2,  ADC0_7, 2,
-    P0_3,  ADC0_6, 2,
-    NC,    NC,     0
-};
-
-static int channel_usage[8] = {0,0,0,0,0,0,0,0};
-
-FastAnalogIn::FastAnalogIn(PinName pin, bool enabled)
-{
-    ADCnumber = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
-    if (ADCnumber == (uint32_t)NC)
-        error("ADC pin mapping failed");
-    datareg = (uint32_t*) (&LPC_ADC->ADDR0 + ADCnumber);
-
-    // ensure power is turned on
-    LPC_SC->PCONP |= (1 << 12);
-    // set PCLK of ADC to /1
-    LPC_SC->PCLKSEL0 &= ~(0x3 << 24);
-    LPC_SC->PCLKSEL0 |= (0x1 << 24);
-    uint32_t PCLK = SystemCoreClock;
-
-    // calculate minimum clock divider
-    //  clkdiv = divider - 1
-    uint32_t MAX_ADC_CLK = 13000000;
-    uint32_t clkdiv = div_round_up(PCLK, MAX_ADC_CLK) - 1;
-    // Set the clkdiv
-    LPC_ADC->ADCR &= ~(255<<8);
-    LPC_ADC->ADCR |= clkdiv<<8;
-
-    //Enable ADC:
-    LPC_ADC->ADCR |= 1<<21;
-
-    //Enable burstmode, set start as zero
-    LPC_ADC->ADCR |= 1<<16;
-    LPC_ADC->ADCR &= ~(7<<24);
-
-    //Map pins
-    pinmap_pinout(pin, PinMap_ADC);
-
-    //Enable channel
-    running = false;
-    enable(enabled);
-
-}
-
-void FastAnalogIn::enable(bool enabled)
-{
-    //If currently not running
-    if (!running) {
-        if (enabled) {
-            //Enable the ADC channel
-            channel_usage[ADCnumber]++;
-            LPC_ADC->ADCR |= (1<<ADCnumber);
-            running = true;
-        } else
-            disable();
-    }
-}
-
-void FastAnalogIn::disable( void )
-{
-    //If currently running
-    if (running) {
-        channel_usage[ADCnumber]--;
-        
-        if (channel_usage[ADCnumber]==0)
-            LPC_ADC->ADCR &= ~(1<<ADCnumber);
-    }
-    running = false;
-}
-
-unsigned short FastAnalogIn::read_u16( void )
-{
-    volatile unsigned int retval;
-    //If object is enabled return current value of datareg
-    if (running)
-        retval = *datareg;
- 
-    //If it isn't running, enable it and wait until new value is written to datareg
-    else {
-        //Force a read to clear done bit, enable the ADC channel
-        retval = *datareg;
-        enable();
-        //Wait until it is converted
-        while(1) {
-            wait_us(1);
-            retval = *datareg;
-            if ((retval>>31) == 1)
-                break;
-        }
-        
-        //Do a second conversion since first one always fails for some reason
-        while(1) {
-            wait_us(1);
-            retval = *datareg;
-            if ((retval>>31) == 1)
-                break;
-        }
-
-        //Disable again
-        disable();
-    }
-    
-    //Do same thing as standard mbed lib, unused bit 0-3, replicate 4-7 in it
-    retval &= ~0xFFFF000F;
-    retval |= (retval >> 8) & 0x000F;
-    return retval;
-
-}
-#endif //defined TARGET_LPC1768

diff -r d9df0fc380bf -r ccf0ab6bbe3a FastAnalogIn_LPC176X.cpp
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/FastAnalogIn_LPC176X.cpp	Tue Mar 13 23:05:42 2018 +0000
@@ -0,0 +1,125 @@
+#ifdef TARGET_LPC176X
+
+#include "FastAnalogIn.h"
+static inline int div_round_up(int x, int y)
+{
+    return (x + (y - 1)) / y;
+}
+
+static const PinMap PinMap_ADC[] = {
+    P0_23, ADC0_0, 1,
+    P0_24, ADC0_1, 1,
+    P0_25, ADC0_2, 1,
+    P0_26, ADC0_3, 1,
+    P1_30, ADC0_4, 3,
+    P1_31, ADC0_5, 3,
+    P0_2,  ADC0_7, 2,
+    P0_3,  ADC0_6, 2,
+    NC,    NC,     0
+};
+
+static int channel_usage[8] = {0,0,0,0,0,0,0,0};
+
+FastAnalogIn::FastAnalogIn(PinName pin, bool enabled)
+{
+    ADCnumber = (ADCName)pinmap_peripheral(pin, PinMap_ADC);
+    if (ADCnumber == (uint32_t)NC)
+        error("ADC pin mapping failed");
+    datareg = (uint32_t*) (&LPC_ADC->ADDR0 + ADCnumber);
+
+    // ensure power is turned on
+    LPC_SC->PCONP |= (1 << 12);
+    // set PCLK of ADC to /1
+    LPC_SC->PCLKSEL0 &= ~(0x3 << 24);
+    LPC_SC->PCLKSEL0 |= (0x1 << 24);
+    uint32_t PCLK = SystemCoreClock;
+
+    // calculate minimum clock divider
+    //  clkdiv = divider - 1
+    uint32_t MAX_ADC_CLK = 13000000;
+    uint32_t clkdiv = div_round_up(PCLK, MAX_ADC_CLK) - 1;
+    // Set the clkdiv
+    LPC_ADC->ADCR &= ~(255<<8);
+    LPC_ADC->ADCR |= clkdiv<<8;
+
+    //Enable ADC:
+    LPC_ADC->ADCR |= 1<<21;
+
+    //Enable burstmode, set start as zero
+    LPC_ADC->ADCR |= 1<<16;
+    LPC_ADC->ADCR &= ~(7<<24);
+
+    //Map pins
+    pinmap_pinout(pin, PinMap_ADC);
+
+    //Enable channel
+    running = false;
+    enable(enabled);
+
+}
+
+void FastAnalogIn::enable(bool enabled)
+{
+    //If currently not running
+    if (!running) {
+        if (enabled) {
+            //Enable the ADC channel
+            channel_usage[ADCnumber]++;
+            LPC_ADC->ADCR |= (1<<ADCnumber);
+            running = true;
+        } else
+            disable();
+    }
+}
+
+void FastAnalogIn::disable( void )
+{
+    //If currently running
+    if (running) {
+        channel_usage[ADCnumber]--;
+        
+        if (channel_usage[ADCnumber]==0)
+            LPC_ADC->ADCR &= ~(1<<ADCnumber);
+    }
+    running = false;
+}
+
+unsigned short FastAnalogIn::read_u16( void )
+{
+    volatile unsigned int retval;
+    //If object is enabled return current value of datareg
+    if (running)
+        retval = *datareg;
+ 
+    //If it isn't running, enable it and wait until new value is written to datareg
+    else {
+        //Force a read to clear done bit, enable the ADC channel
+        retval = *datareg;
+        enable();
+        //Wait until it is converted
+        while(1) {
+            wait_us(1);
+            retval = *datareg;
+            if ((retval>>31) == 1)
+                break;
+        }
+        
+        //Do a second conversion since first one always fails for some reason
+        while(1) {
+            wait_us(1);
+            retval = *datareg;
+            if ((retval>>31) == 1)
+                break;
+        }
+
+        //Disable again
+        disable();
+    }
+    
+    //Do same thing as standard mbed lib, unused bit 0-3, replicate 4-7 in it
+    retval &= ~0xFFFF000F;
+    retval |= (retval >> 8) & 0x000F;
+    return retval;
+
+}
+#endif //defined TARGET_LPC176X