Merge branch 'master' of https://github.com/sparkfun/Arduino_Apollo3

Author: oclyke

cores/arduino/ard_sup/analog/ap3_analog.cpp

@@ -27,9 +27,9 @@ SOFTWARE.
 
 #include "ap3_analog.h"
 
-// Define the clock source and frequency to use for 
-// PWM generation. 
-// Chose 12 MHz to allow maximal resolution with a 
+// Define the clock source and frequency to use for
+// PWM generation.
+// Chose 12 MHz to allow maximal resolution with a
 // target maximum width of 2ms (for RC servos)
 // 1/12MHz = 0.083 uS per LSB.
 // 2ms/0.083us = 24000 LSB for 2 ms wide pulse
@@ -41,14 +41,14 @@ SOFTWARE.
     instead or maybe we can even go ahead and support the Servo library
 */
 
-#define AP3_ANALOG_CLK              
-#define AP3_ANALOG_FREQ             12000000           
-#define AP3_ANALOG_FRAME_PERIOD     24000       
+#define AP3_ANALOG_CLK
+#define AP3_ANALOG_FREQ 12000000
+#define AP3_ANALOG_FRAME_PERIOD 24000
 
 //*****************************************************************************
 //
 //  Tables copied from am_hal_ctimer.c because they are declared as static within
-//  that file, but they would be useful here too. 
+//  that file, but they would be useful here too.
 //
 //  Lookup tables used by am_hal_ctimer_output_config().
 //
@@ -65,63 +65,63 @@ SOFTWARE.
 //  OUTCFG 7 = A7OUT2.
 //
 //*****************************************************************************
-#define CTXPADNUM(ctx)  ((CTx_tbl[ctx] >> 0) & 0x3f)
-#define CTXPADFNC(ctx)  ((CTx_tbl[ctx] >> 8) & 0x7)
-#define CTX(pad, fn)    ((fn << 8) | (pad << 0))
+#define CTXPADNUM(ctx) ((CTx_tbl[ctx] >> 0) & 0x3f)
+#define CTXPADFNC(ctx) ((CTx_tbl[ctx] >> 8) & 0x7)
+#define CTX(pad, fn) ((fn << 8) | (pad << 0))
 static const uint16_t CTx_tbl[32] =
-{
-    CTX(12,2), CTX(25,2), CTX(13,2), CTX(26,2), CTX(18,2),      // 0 - 4
-    CTX(27,2), CTX(19,2), CTX(28,2), CTX( 5,7), CTX(29,2),      // 5 - 9
-    CTX( 6,5), CTX(30,2), CTX(22,2), CTX(31,2), CTX(23,2),      // 10 - 14
-    CTX(32,2), CTX(42,2), CTX( 4,6), CTX(43,2), CTX( 7,7),      // 15 - 19
-    CTX(44,2), CTX(24,5), CTX(45,2), CTX(33,6), CTX(46,2),      // 20 - 24
-    CTX(39,2), CTX(47,2), CTX(35,5), CTX(48,2), CTX(37,7),      // 25 - 29
-    CTX(49,2), CTX(11,2)                                        // 30 - 31
+    {
+        CTX(12, 2), CTX(25, 2), CTX(13, 2), CTX(26, 2), CTX(18, 2), // 0 - 4
+        CTX(27, 2), CTX(19, 2), CTX(28, 2), CTX(5, 7), CTX(29, 2),  // 5 - 9
+        CTX(6, 5), CTX(30, 2), CTX(22, 2), CTX(31, 2), CTX(23, 2),  // 10 - 14
+        CTX(32, 2), CTX(42, 2), CTX(4, 6), CTX(43, 2), CTX(7, 7),   // 15 - 19
+        CTX(44, 2), CTX(24, 5), CTX(45, 2), CTX(33, 6), CTX(46, 2), // 20 - 24
+        CTX(39, 2), CTX(47, 2), CTX(35, 5), CTX(48, 2), CTX(37, 7), // 25 - 29
+        CTX(49, 2), CTX(11, 2)                                      // 30 - 31
 };
 
-#define OUTC(timB,timN,N2)      ((N2 << 4) | (timB << 3) | (timN << 0))
-#define OUTCTIMN(ctx,n)         (outcfg_tbl[ctx][n] & (0x7 << 0))
-#define OUTCTIMB(ctx,n)         (outcfg_tbl[ctx][n] & (0x1 << 3))
-#define OUTCO2(ctx,n)           (outcfg_tbl[ctx][n] & (0x1 << 4))
+#define OUTC(timB, timN, N2) ((N2 << 4) | (timB << 3) | (timN << 0))
+#define OUTCTIMN(ctx, n) (outcfg_tbl[ctx][n] & (0x7 << 0))
+#define OUTCTIMB(ctx, n) (outcfg_tbl[ctx][n] & (0x1 << 3))
+#define OUTCO2(ctx, n) (outcfg_tbl[ctx][n] & (0x1 << 4))
 static const uint8_t outcfg_tbl[32][4] =
-{
-    {OUTC(0,0,0), OUTC(1,2,1), OUTC(0,5,1), OUTC(0,6,0)},     // CTX0:  A0OUT,  B2OUT2, A5OUT2, A6OUT
-    {OUTC(0,0,1), OUTC(0,0,0), OUTC(0,5,0), OUTC(1,7,1)},     // CTX1:  A0OUT2, A0OUT,  A5OUT,  B7OUT2
-    {OUTC(1,0,0), OUTC(1,1,1), OUTC(1,6,1), OUTC(0,7,0)},     // CTX2:  B0OUT,  B1OUT2, B6OUT2, A7OUT
-    {OUTC(1,0,1), OUTC(1,0,0), OUTC(0,1,0), OUTC(0,6,0)},     // CTX3:  B0OUT2, B0OUT,  A1OUT,  A6OUT
-    {OUTC(0,1,0), OUTC(0,2,1), OUTC(0,5,1), OUTC(1,5,0)},     // CTX4:  A1OUT,  A2OUT2, A5OUT2, B5OUT
-    {OUTC(0,1,1), OUTC(0,1,0), OUTC(1,6,0), OUTC(0,7,0)},     // CTX5:  A1OUT2, A1OUT,  B6OUT,  A7OUT
-    {OUTC(1,1,0), OUTC(0,1,0), OUTC(1,5,1), OUTC(1,7,0)},     // CTX6:  B1OUT,  A1OUT,  B5OUT2, B7OUT
-    {OUTC(1,1,1), OUTC(1,1,0), OUTC(1,5,0), OUTC(0,7,0)},     // CTX7:  B1OUT2, B1OUT,  B5OUT,  A7OUT
-    {OUTC(0,2,0), OUTC(0,3,1), OUTC(0,4,1), OUTC(1,6,0)},     // CTX8:  A2OUT,  A3OUT2, A4OUT2, B6OUT
-    {OUTC(0,2,1), OUTC(0,2,0), OUTC(0,4,0), OUTC(1,0,0)},     // CTX9:  A2OUT2, A2OUT,  A4OUT,  B0OUT
-    {OUTC(1,2,0), OUTC(1,3,1), OUTC(1,4,1), OUTC(0,6,0)},     // CTX10: B2OUT,  B3OUT2, B4OUT2, A6OUT
-    {OUTC(1,2,1), OUTC(1,2,0), OUTC(1,4,0), OUTC(1,5,1)},     // CTX11: B2OUT2, B2OUT,  B4OUT,  B5OUT2
-    {OUTC(0,3,0), OUTC(1,1,0), OUTC(1,0,1), OUTC(1,6,1)},     // CTX12: A3OUT,  B1OUT,  B0OUT2, B6OUT2
-    {OUTC(0,3,1), OUTC(0,3,0), OUTC(0,6,0), OUTC(1,4,1)},     // CTX13: A3OUT2, A3OUT,  A6OUT,  B4OUT2
-    {OUTC(1,3,0), OUTC(1,1,0), OUTC(1,7,1), OUTC(0,7,0)},     // CTX14: B3OUT,  B1OUT,  B7OUT2, A7OUT
-    {OUTC(1,3,1), OUTC(1,3,0), OUTC(0,7,0), OUTC(0,4,1)},     // CTX15: B3OUT2, B3OUT,  A7OUT,  A4OUT2
-    {OUTC(0,4,0), OUTC(0,0,0), OUTC(0,0,1), OUTC(1,3,1)},     // CTX16: A4OUT,  A0OUT,  A0OUT2, B3OUT2
-    {OUTC(0,4,1), OUTC(1,7,0), OUTC(0,4,0), OUTC(0,1,1)},     // CTX17: A4OUT2, B7OUT,  A4OUT,  A1OUT2
-    {OUTC(1,4,0), OUTC(1,0,0), OUTC(0,0,0), OUTC(0,3,1)},     // CTX18: B4OUT,  B0OUT,  A0OUT,  A3OUT2
-    {OUTC(1,4,1), OUTC(0,2,0), OUTC(1,4,0), OUTC(1,1,1)},     // CTX19: B4OUT2, A2OUT,  B4OUT,  B1OUT2
-    {OUTC(0,5,0), OUTC(0,1,0), OUTC(0,1,1), OUTC(1,2,1)},     // CTX20: A5OUT,  A1OUT,  A1OUT2, B2OUT2
-    {OUTC(0,5,1), OUTC(0,1,0), OUTC(1,5,0), OUTC(0,0,1)},     // CTX21: A5OUT2, A1OUT,  B5OUT,  A0OUT2
-    {OUTC(1,5,0), OUTC(0,6,0), OUTC(0,1,0), OUTC(0,2,1)},     // CTX22: B5OUT,  A6OUT,  A1OUT,  A2OUT2
-    {OUTC(1,5,1), OUTC(0,7,0), OUTC(0,5,0), OUTC(1,0,1)},     // CTX23: B5OUT2, A7OUT,  A5OUT,  B0OUT2
-    {OUTC(0,6,0), OUTC(0,2,0), OUTC(0,1,0), OUTC(1,1,1)},     // CTX24: A6OUT,  A2OUT,  A1OUT,  B1OUT2
-    {OUTC(1,4,1), OUTC(1,2,0), OUTC(0,6,0), OUTC(0,2,1)},     // CTX25: B4OUT2, B2OUT,  A6OUT,  A2OUT2
-    {OUTC(1,6,0), OUTC(1,2,0), OUTC(0,5,0), OUTC(0,1,1)},     // CTX26: B6OUT,  B2OUT,  A5OUT,  A1OUT2
-    {OUTC(1,6,1), OUTC(0,1,0), OUTC(1,6,0), OUTC(1,2,1)},     // CTX27: B6OUT2, A1OUT,  B6OUT,  B2OUT2
-    {OUTC(0,7,0), OUTC(0,3,0), OUTC(0,5,1), OUTC(1,0,1)},     // CTX28: A7OUT,  A3OUT,  A5OUT2, B0OUT2
-    {OUTC(1,5,1), OUTC(0,1,0), OUTC(0,7,0), OUTC(0,3,1)},     // CTX29: B5OUT2, A1OUT,  A7OUT,  A3OUT2
-    {OUTC(1,7,0), OUTC(1,3,0), OUTC(0,4,1), OUTC(0,0,1)},     // CTX30: B7OUT,  B3OUT,  A4OUT2, A0OUT2
-    {OUTC(1,7,1), OUTC(0,6,0), OUTC(1,7,0), OUTC(1,3,1)},     // CTX31: B7OUT2, A6OUT,  B7OUT,  B3OUT2
+    {
+        {OUTC(0, 0, 0), OUTC(1, 2, 1), OUTC(0, 5, 1), OUTC(0, 6, 0)}, // CTX0:  A0OUT,  B2OUT2, A5OUT2, A6OUT
+        {OUTC(0, 0, 1), OUTC(0, 0, 0), OUTC(0, 5, 0), OUTC(1, 7, 1)}, // CTX1:  A0OUT2, A0OUT,  A5OUT,  B7OUT2
+        {OUTC(1, 0, 0), OUTC(1, 1, 1), OUTC(1, 6, 1), OUTC(0, 7, 0)}, // CTX2:  B0OUT,  B1OUT2, B6OUT2, A7OUT
+        {OUTC(1, 0, 1), OUTC(1, 0, 0), OUTC(0, 1, 0), OUTC(0, 6, 0)}, // CTX3:  B0OUT2, B0OUT,  A1OUT,  A6OUT
+        {OUTC(0, 1, 0), OUTC(0, 2, 1), OUTC(0, 5, 1), OUTC(1, 5, 0)}, // CTX4:  A1OUT,  A2OUT2, A5OUT2, B5OUT
+        {OUTC(0, 1, 1), OUTC(0, 1, 0), OUTC(1, 6, 0), OUTC(0, 7, 0)}, // CTX5:  A1OUT2, A1OUT,  B6OUT,  A7OUT
+        {OUTC(1, 1, 0), OUTC(0, 1, 0), OUTC(1, 5, 1), OUTC(1, 7, 0)}, // CTX6:  B1OUT,  A1OUT,  B5OUT2, B7OUT
+        {OUTC(1, 1, 1), OUTC(1, 1, 0), OUTC(1, 5, 0), OUTC(0, 7, 0)}, // CTX7:  B1OUT2, B1OUT,  B5OUT,  A7OUT
+        {OUTC(0, 2, 0), OUTC(0, 3, 1), OUTC(0, 4, 1), OUTC(1, 6, 0)}, // CTX8:  A2OUT,  A3OUT2, A4OUT2, B6OUT
+        {OUTC(0, 2, 1), OUTC(0, 2, 0), OUTC(0, 4, 0), OUTC(1, 0, 0)}, // CTX9:  A2OUT2, A2OUT,  A4OUT,  B0OUT
+        {OUTC(1, 2, 0), OUTC(1, 3, 1), OUTC(1, 4, 1), OUTC(0, 6, 0)}, // CTX10: B2OUT,  B3OUT2, B4OUT2, A6OUT
+        {OUTC(1, 2, 1), OUTC(1, 2, 0), OUTC(1, 4, 0), OUTC(1, 5, 1)}, // CTX11: B2OUT2, B2OUT,  B4OUT,  B5OUT2
+        {OUTC(0, 3, 0), OUTC(1, 1, 0), OUTC(1, 0, 1), OUTC(1, 6, 1)}, // CTX12: A3OUT,  B1OUT,  B0OUT2, B6OUT2
+        {OUTC(0, 3, 1), OUTC(0, 3, 0), OUTC(0, 6, 0), OUTC(1, 4, 1)}, // CTX13: A3OUT2, A3OUT,  A6OUT,  B4OUT2
+        {OUTC(1, 3, 0), OUTC(1, 1, 0), OUTC(1, 7, 1), OUTC(0, 7, 0)}, // CTX14: B3OUT,  B1OUT,  B7OUT2, A7OUT
+        {OUTC(1, 3, 1), OUTC(1, 3, 0), OUTC(0, 7, 0), OUTC(0, 4, 1)}, // CTX15: B3OUT2, B3OUT,  A7OUT,  A4OUT2
+        {OUTC(0, 4, 0), OUTC(0, 0, 0), OUTC(0, 0, 1), OUTC(1, 3, 1)}, // CTX16: A4OUT,  A0OUT,  A0OUT2, B3OUT2
+        {OUTC(0, 4, 1), OUTC(1, 7, 0), OUTC(0, 4, 0), OUTC(0, 1, 1)}, // CTX17: A4OUT2, B7OUT,  A4OUT,  A1OUT2
+        {OUTC(1, 4, 0), OUTC(1, 0, 0), OUTC(0, 0, 0), OUTC(0, 3, 1)}, // CTX18: B4OUT,  B0OUT,  A0OUT,  A3OUT2
+        {OUTC(1, 4, 1), OUTC(0, 2, 0), OUTC(1, 4, 0), OUTC(1, 1, 1)}, // CTX19: B4OUT2, A2OUT,  B4OUT,  B1OUT2
+        {OUTC(0, 5, 0), OUTC(0, 1, 0), OUTC(0, 1, 1), OUTC(1, 2, 1)}, // CTX20: A5OUT,  A1OUT,  A1OUT2, B2OUT2
+        {OUTC(0, 5, 1), OUTC(0, 1, 0), OUTC(1, 5, 0), OUTC(0, 0, 1)}, // CTX21: A5OUT2, A1OUT,  B5OUT,  A0OUT2
+        {OUTC(1, 5, 0), OUTC(0, 6, 0), OUTC(0, 1, 0), OUTC(0, 2, 1)}, // CTX22: B5OUT,  A6OUT,  A1OUT,  A2OUT2
+        {OUTC(1, 5, 1), OUTC(0, 7, 0), OUTC(0, 5, 0), OUTC(1, 0, 1)}, // CTX23: B5OUT2, A7OUT,  A5OUT,  B0OUT2
+        {OUTC(0, 6, 0), OUTC(0, 2, 0), OUTC(0, 1, 0), OUTC(1, 1, 1)}, // CTX24: A6OUT,  A2OUT,  A1OUT,  B1OUT2
+        {OUTC(1, 4, 1), OUTC(1, 2, 0), OUTC(0, 6, 0), OUTC(0, 2, 1)}, // CTX25: B4OUT2, B2OUT,  A6OUT,  A2OUT2
+        {OUTC(1, 6, 0), OUTC(1, 2, 0), OUTC(0, 5, 0), OUTC(0, 1, 1)}, // CTX26: B6OUT,  B2OUT,  A5OUT,  A1OUT2
+        {OUTC(1, 6, 1), OUTC(0, 1, 0), OUTC(1, 6, 0), OUTC(1, 2, 1)}, // CTX27: B6OUT2, A1OUT,  B6OUT,  B2OUT2
+        {OUTC(0, 7, 0), OUTC(0, 3, 0), OUTC(0, 5, 1), OUTC(1, 0, 1)}, // CTX28: A7OUT,  A3OUT,  A5OUT2, B0OUT2
+        {OUTC(1, 5, 1), OUTC(0, 1, 0), OUTC(0, 7, 0), OUTC(0, 3, 1)}, // CTX29: B5OUT2, A1OUT,  A7OUT,  A3OUT2
+        {OUTC(1, 7, 0), OUTC(1, 3, 0), OUTC(0, 4, 1), OUTC(0, 0, 1)}, // CTX30: B7OUT,  B3OUT,  A4OUT2, A0OUT2
+        {OUTC(1, 7, 1), OUTC(0, 6, 0), OUTC(1, 7, 0), OUTC(1, 3, 1)}, // CTX31: B7OUT2, A6OUT,  B7OUT,  B3OUT2
 };
 
-uint16_t _analogBits = 10; //10-bit by default
-uint8_t     _analogWriteBits = 8; // 8-bit by default for writes
-uint8_t     _servoWriteBits = 8; // 8-bit by default for writes
+uint16_t _analogBits = 10;    //10-bit by default
+uint8_t _analogWriteBits = 8; // 8-bit by default for writes
+uint8_t _servoWriteBits = 8;  // 8-bit by default for writes
 
 uint16_t analogRead(uint8_t pinNumber)
 {
@@ -202,6 +202,34 @@ uint16_t analogRead(uint8_t pinNumber)
     }
 }
 
+//Power down ADC. Comes from adc_lpmode2.c example from Ambiq SDK
+bool power_adc_disable()
+{
+    // Disable the ADC.
+    if (AM_HAL_STATUS_SUCCESS != am_hal_adc_disable(g_ADCHandle))
+    {
+        //am_util_stdio_printf("Error - disable ADC failed.\n");
+        return (false);
+    }
+
+    // Enable the ADC power domain.
+    if (AM_HAL_STATUS_SUCCESS != am_hal_pwrctrl_periph_disable(AM_HAL_PWRCTRL_PERIPH_ADC))
+    {
+        //am_util_stdio_printf("Error - disabling the ADC power domain failed.\n");
+        return (false);
+    }
+
+    // Deinitialize the ADC
+    if (AM_HAL_STATUS_SUCCESS != am_hal_adc_deinitialize(g_ADCHandle))
+    {
+        //am_util_stdio_printf("Error - return of the ADC instance failed.\n");
+        return (false);
+    }
+
+    g_ADCHandle = NULL;
+    return (true);
+}
+
 //Apollo3 is capapble of 14-bit ADC but Arduino defaults to 10-bit
 //This modifies the global var that controls what is returned from analogRead()
 void analogReadResolution(uint8_t bits)
@@ -325,92 +353,102 @@ ap3_err_t ap3_change_channel(uint8_t padNumber)
     }
 }
 
-
-
-
-
-
-
-
-
-
-ap3_err_t ap3_pwm_output( uint8_t pin, uint32_t th, uint32_t fw, uint32_t clk ){
+ap3_err_t ap3_pwm_output(uint8_t pin, uint32_t th, uint32_t fw, uint32_t clk)
+{
     // handle configuration, if necessary
     ap3_err_t retval = AP3_OK;
 
     ap3_gpio_pad_t pad = ap3_gpio_pin2pad(pin);
-    if(( pad == AP3_GPIO_PAD_UNUSED) || ( pad >= AP3_GPIO_MAX_PADS )){ return AP3_INVALID_ARG; }
+    if ((pad == AP3_GPIO_PAD_UNUSED) || (pad >= AP3_GPIO_MAX_PADS))
+    {
+        return AP3_INVALID_ARG;
+    }
 
     uint32_t timer = 0;
     uint32_t segment = AM_HAL_CTIMER_TIMERA;
     uint32_t output = AM_HAL_CTIMER_OUTPUT_NORMAL;
 
     uint8_t ctx = 0;
-    for(ctx = 0; ctx < 32; ctx++){
-        if( CTXPADNUM(ctx) == pad ){
+    for (ctx = 0; ctx < 32; ctx++)
+    {
+        if (CTXPADNUM(ctx) == pad)
+        {
             break;
         }
     }
-    if( ctx >= 32 ){
+    if (ctx >= 32)
+    {
         return AP3_ERR; // could not find pad in CTx table
     }
     // Now use CTx index to get configuration information
 
     // Now, for the given pad, determine the above values
-    if( (pad == 39) || (pad == 37) ){
+    if ((pad == 39) || (pad == 37))
+    {
         // pads 39 and 37 must be handled differently to avoid conflicting with other pins
-        if(pad == 39){
+        if (pad == 39)
+        {
             // 39
             timer = 6;
             segment = AM_HAL_CTIMER_TIMERA;
             output = AM_HAL_CTIMER_OUTPUT_SECONDARY;
-        }else{
+        }
+        else
+        {
             // 37
             timer = 7;
             segment = AM_HAL_CTIMER_TIMERA;
             output = AM_HAL_CTIMER_OUTPUT_NORMAL;
         }
-    }else{
-        const uint8_t n = 0;    // use the zeroeth index into the options for any pd except 37 and 39
+    }
+    else
+    {
+        const uint8_t n = 0; // use the zeroeth index into the options for any pd except 37 and 39
 
         timer = OUTCTIMN(ctx, 0);
-        if( OUTCTIMB(ctx, 0) ){
+        if (OUTCTIMB(ctx, 0))
+        {
             segment = AM_HAL_CTIMER_TIMERB;
         }
-        if( OUTCO2(ctx, 0) ){
+        if (OUTCO2(ctx, 0))
+        {
             output = AM_HAL_CTIMER_OUTPUT_SECONDARY;
         }
     }
 
     // Configure the pin
-    am_hal_ctimer_output_config(timer,                      
-                                segment,                     
-                                pad,                       
-                                output,            
-                                AM_HAL_GPIO_PIN_DRIVESTRENGTH_12MA);    //
+    am_hal_ctimer_output_config(timer,
+                                segment,
+                                pad,
+                                output,
+                                AM_HAL_GPIO_PIN_DRIVESTRENGTH_12MA); //
 
     // Configure the repeated pulse mode with our clock source
     am_hal_ctimer_config_single(timer,
-                                segment,    
+                                segment,
                                 // (AM_HAL_CTIMER_FN_PWM_REPEAT | AP3_ANALOG_CLK | AM_HAL_CTIMER_INT_ENABLE) );
-                                (AM_HAL_CTIMER_FN_PWM_REPEAT | clk) );
+                                (AM_HAL_CTIMER_FN_PWM_REPEAT | clk));
 
     // If this pad uses secondary output:
-    if( output == AM_HAL_CTIMER_OUTPUT_SECONDARY ){
+    if (output == AM_HAL_CTIMER_OUTPUT_SECONDARY)
+    {
         // Need to explicitly enable compare registers 2/3
-        uint32_t* pui32ConfigReg = NULL;
-        pui32ConfigReg = (uint32_t*)CTIMERADDRn(CTIMER, timer, AUX0);
+        uint32_t *pui32ConfigReg = NULL;
+        pui32ConfigReg = (uint32_t *)CTIMERADDRn(CTIMER, timer, AUX0);
         uint32_t ui32WriteVal = AM_REGVAL(pui32ConfigReg);
-        uint32_t ui32ConfigVal = (1 << CTIMER_AUX0_TMRA0EN23_Pos ); // using CTIMER_AUX0_TMRA0EN23_Pos because for now this number is common to all CTimer instances
-        if ( segment == AM_HAL_CTIMER_TIMERB ){
+        uint32_t ui32ConfigVal = (1 << CTIMER_AUX0_TMRA0EN23_Pos); // using CTIMER_AUX0_TMRA0EN23_Pos because for now this number is common to all CTimer instances
+        if (segment == AM_HAL_CTIMER_TIMERB)
+        {
             ui32ConfigVal = ((ui32ConfigVal & 0xFFFF) << 16);
         }
         ui32WriteVal = (ui32WriteVal & ~(segment)) | ui32ConfigVal;
         AM_REGVAL(pui32ConfigReg) = ui32WriteVal;
 
         // then set the duty cycle with the 'aux' function
-        am_hal_ctimer_aux_period_set( timer, segment, fw, th);
-    }else{
+        am_hal_ctimer_aux_period_set(timer, segment, fw, th);
+    }
+    else
+    {
         // Otherwise simply set the primary duty cycle
         am_hal_ctimer_period_set(timer, segment, fw, th);
     }
@@ -423,58 +461,58 @@ ap3_err_t ap3_pwm_output( uint8_t pin, uint32_t th, uint32_t fw, uint32_t clk ){
     return AP3_OK;
 }
 
-
-ap3_err_t analogWriteResolution( uint8_t res ){
-    if( res > 15 ){
+ap3_err_t analogWriteResolution(uint8_t res)
+{
+    if (res > 15)
+    {
         _analogWriteBits = 15; // max out the resolution when this happens
         return AP3_ERR;
     }
     _analogWriteBits = res;
     return AP3_OK;
 }
 
-ap3_err_t analogWrite( uint8_t pin, uint32_t val ){
+ap3_err_t analogWrite(uint8_t pin, uint32_t val)
+{
     // Determine the high time based on input value and the current resolution setting
-    uint32_t fsv = (0x01 << _analogWriteBits);    // full scale value for the current resolution setting
-    val = val % fsv;                                // prevent excess
-    uint32_t clk = AM_HAL_CTIMER_HFRC_12MHZ;        // Use an Ambiq HAL provided value to select which clock    
+    uint32_t fsv = (0x01 << _analogWriteBits); // full scale value for the current resolution setting
+    val = val % fsv;                           // prevent excess
+    uint32_t clk = AM_HAL_CTIMER_HFRC_12MHZ;   // Use an Ambiq HAL provided value to select which clock
     //uint32_t fw = 32768;                            // Choose the frame width in clock periods (32768 -> ~ 350 Hz)
     // uint32_t th = (uint32_t)( (fw * val) / fsv );
 
-    if(val == 0){
-        val = 1;         // todo: change this so that when val==0 we set the mode to "force output low"
+    if (val == 0)
+    {
+        val = 1; // todo: change this so that when val==0 we set the mode to "force output low"
     }
-    if( val == fsv ){
-        val -= 1;        // todo: change this so that when val==fsv we just set the mode to "force output high"
+    if (val == fsv)
+    {
+        val -= 1; // todo: change this so that when val==fsv we just set the mode to "force output high"
     }
-    return ap3_pwm_output( pin, val, fsv, clk );
+    return ap3_pwm_output(pin, val, fsv, clk);
 }
 
-ap3_err_t servoWriteResolution( uint8_t res ){
-    if( res > 15 ){
+ap3_err_t servoWriteResolution(uint8_t res)
+{
+    if (res > 15)
+    {
         _servoWriteBits = 15; // max out the resolution when this happens
         return AP3_ERR;
     }
     _servoWriteBits = res;
     return AP3_OK;
 }
 
-ap3_err_t servoWrite( uint8_t pin, uint32_t val ){
+ap3_err_t servoWrite(uint8_t pin, uint32_t val)
+{
     // Determine the high time based on input value and the current resolution setting
-    uint32_t fsv = (0x01 << _servoWriteBits);     // full scale value for the current resolution setting
-    val = val % fsv;                                // prevent excess
-    uint32_t clk = AM_HAL_CTIMER_HFRC_3MHZ;         // Using 3 MHz to get fine-grained control up to 20 ms wide  
-    uint32_t fw = 60000;                            // 20 ms wide frame
-    uint32_t max = 6000;                            // max width of RC pwm pulse is 2 ms or 6000 counts
-    uint32_t min = 3000;                            // min width of RC pwm pulse is 1 ms or 3000 counts
-    uint32_t th = (uint32_t)( ((max - min) * val) / fsv ) + min;
-
-    return ap3_pwm_output( pin, th, fw, clk );
+    uint32_t fsv = (0x01 << _servoWriteBits); // full scale value for the current resolution setting
+    val = val % fsv;                          // prevent excess
+    uint32_t clk = AM_HAL_CTIMER_HFRC_3MHZ;   // Using 3 MHz to get fine-grained control up to 20 ms wide
+    uint32_t fw = 60000;                      // 20 ms wide frame
+    uint32_t max = 6000;                      // max width of RC pwm pulse is 2 ms or 6000 counts
+    uint32_t min = 3000;                      // min width of RC pwm pulse is 1 ms or 3000 counts
+    uint32_t th = (uint32_t)(((max - min) * val) / fsv) + min;
+
+    return ap3_pwm_output(pin, th, fw, clk);
 }
-
-
-
-
-
-
-

cores/arduino/ard_sup/ap3_analog.h

@@ -41,13 +41,13 @@ ap3_err_t ap3_set_pin_to_analog(uint8_t pinNumber);
 ap3_err_t ap3_analog_pad_funcsel(ap3_gpio_pad_t padNumber, uint8_t *funcsel);
 ap3_err_t ap3_change_channel(ap3_gpio_pad_t padNumber);
 
+bool power_adc_disable();
 uint16_t analogRead(uint8_t pinNumber);
 void analogReadResolution(uint8_t bits);
 
-ap3_err_t analogWriteResolution( uint8_t res );
-ap3_err_t analogWrite( uint8_t pin, uint32_t val );
-ap3_err_t servoWriteResolution( uint8_t res );
-ap3_err_t servoWrite( uint8_t pin, uint32_t val );
-
+ap3_err_t analogWriteResolution(uint8_t res);
+ap3_err_t analogWrite(uint8_t pin, uint32_t val);
+ap3_err_t servoWriteResolution(uint8_t res);
+ap3_err_t servoWrite(uint8_t pin, uint32_t val);
 
 #endif // _AP3_ANALOG_H_

cores/arduino/ard_sup/uart/ap3_uart.cpp

@@ -67,7 +67,20 @@ void Uart::begin(unsigned long baudrate, am_hal_uart_config_t config)
 
 void Uart::end()
 {
-    // todo:
+    if (_handle != NULL)
+    {
+        flush();
+
+        // Power down the UART, and surrender the handle.
+        am_hal_uart_power_control(_handle, AM_HAL_SYSCTRL_DEEPSLEEP, false);
+        am_hal_uart_deinitialize(_handle);
+
+        // Disable the UART pins.
+        am_hal_gpio_pinconfig(_pinTX, g_AM_HAL_GPIO_DISABLE);
+        am_hal_gpio_pinconfig(_pinRX, g_AM_HAL_GPIO_DISABLE);
+
+        _handle = NULL;
+    }
 }
 
 int Uart::available()
@@ -93,7 +106,8 @@ int Uart::read()
 
 void Uart::flush()
 {
-    // todo:
+    // Make sure the UART has finished sending everything it's going to send.
+    am_hal_uart_tx_flush(_handle);
 }
 
 size_t Uart::write(const uint8_t data)