Merge branch 'master' into PDM

Author: Nathan Seidle

boards.txt

@@ -221,39 +221,39 @@ edge.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scripts
 
 ###############################################################
 
-edgeV2.name=SparkFun Edge V2
-edgeV2.build.variant=SparkFun_Edge_V2
-edgeV2.build.board=SFE_EDGE_V2
-edgeV2.upload.maximum_size=960000
-edgeV2.upload.sbl_baud=115200
-edgeV2.build.arch=APOLLO3
-edgeV2.build.mcu=cortex-m4
-edgeV2.build.f_cpu=48000000L
-edgeV2.build.core=arduino
-edgeV2.build.includes=-I{build.variant.path}/config
-edgeV2.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 
-edgeV2.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
-edgeV2.build.defs=
-edgeV2.build.libs=
-edgeV2.menu.svl_baud.921600=921600
-edgeV2.menu.svl_baud.460800=460800
-edgeV2.menu.svl_baud.230400=230400
-edgeV2.menu.svl_baud.115200=115200
-edgeV2.menu.svl_baud.57600=57600
-edgeV2.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended)
-edgeV2.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced)
-
-edgeV2.menu.svl_baud.57600.upload.svl_baud=57600
-edgeV2.menu.svl_baud.115200.upload.svl_baud=115200
-edgeV2.menu.svl_baud.230400.upload.svl_baud=230400
-edgeV2.menu.svl_baud.460800.upload.svl_baud=460800
-edgeV2.menu.svl_baud.921600.upload.svl_baud=921600
-
-edgeV2.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
-edgeV2.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
-
-edgeV2.menu.loader.sparkfun_svl.upload.tool=artemis_svl
-edgeV2.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
+edge2.name=SparkFun Edge2
+edge2.build.variant=SparkFun_Edge2
+edge2.build.board=SFE_EDGE2
+edge2.upload.maximum_size=960000
+edge2.upload.sbl_baud=115200
+edge2.build.arch=APOLLO3
+edge2.build.mcu=cortex-m4
+edge2.build.f_cpu=48000000L
+edge2.build.core=arduino
+edge2.build.includes=-I{build.variant.path}/config
+edge2.build.extra_flags=-DPART_apollo3 -DAM_PACKAGE_BGA -DAM_PART_APOLLO3 
+edge2.build.ldscript={build.variant.path}/linker_scripts/gcc/flash_with_bootloader.ld
+edge2.build.defs=
+edge2.build.libs=
+edge2.menu.svl_baud.921600=921600
+edge2.menu.svl_baud.460800=460800
+edge2.menu.svl_baud.230400=230400
+edge2.menu.svl_baud.115200=115200
+edge2.menu.svl_baud.57600=57600
+edge2.menu.loader.sparkfun_svl=SparkFun Variable Loader (Recommended)
+edge2.menu.loader.ambiq_sbl=Ambiq Secure Bootloader (Advanced)
+
+edge2.menu.svl_baud.57600.upload.svl_baud=57600
+edge2.menu.svl_baud.115200.upload.svl_baud=115200
+edge2.menu.svl_baud.230400.upload.svl_baud=230400
+edge2.menu.svl_baud.460800.upload.svl_baud=460800
+edge2.menu.svl_baud.921600.upload.svl_baud=921600
+
+edge2.menu.loader.ambiq_sbl.upload.tool=ambiq_bin2board
+edge2.menu.loader.ambiq_sbl.build.ldscript={build.variant.path}/linker_scripts/gcc/ambiq_sbl_app.ld
+
+edge2.menu.loader.sparkfun_svl.upload.tool=artemis_svl
+edge2.menu.loader.sparkfun_svl.build.ldscript={build.variant.path}/linker_scripts/gcc/artemis_sbl_svl_app.ld
 
 ###############################################################
 

cores/arduino/ard_sup/analog/ap3_analog.cpp

@@ -415,11 +415,13 @@ void ap3_pwm_wait_for_pulse(uint32_t timer, uint32_t segment, uint32_t output, u
 
         // Get the compare value
         cmpr0 = ((uint32_t)(*(pui32CompareReg)) & 0x0000FFFF);
-        
-        // Wait for the timer value to be less than the compare value so that it is safe to change
-        ctimer_val = am_hal_ctimer_read( timer, segment);
-        while( (ctimer_val + 0) > cmpr0 ){
+
+        if( cmpr0 ){ // Only wait when cmpr0 is greater than 0 to avoid an infinite while loop
+            // Wait for the timer value to be less than the compare value so that it is safe to change
             ctimer_val = am_hal_ctimer_read( timer, segment);
+            while( (ctimer_val + 0) >= cmpr0 ){
+                ctimer_val = am_hal_ctimer_read( timer, segment);
+            }
         }
     }
 }
@@ -526,13 +528,16 @@ ap3_err_t ap3_pwm_output(uint8_t pin, uint32_t th, uint32_t fw, uint32_t clk)
     }
 
     // Test for AM_HAL_CTIMER_OUTPUT_FORCE0 or AM_HAL_CTIMER_OUTPUT_FORCE1
+    bool set_periods = true;
     if ((th == 0) || (fw == 0))
     {
         output = AM_HAL_CTIMER_OUTPUT_FORCE0;
+        set_periods = false;                    // disable setting periods when going into a forced mode
     }
     else if (th == fw)
     {
         output = AM_HAL_CTIMER_OUTPUT_FORCE1;
+        set_periods = false;                    // disable setting periods when going into a forced mode
     }
 
     // Wait until after high pulse to change the state (avoids inversion)
@@ -551,31 +556,33 @@ ap3_err_t ap3_pwm_output(uint8_t pin, uint32_t th, uint32_t fw, uint32_t clk)
                                 // (AM_HAL_CTIMER_FN_PWM_REPEAT | AP3_ANALOG_CLK | AM_HAL_CTIMER_INT_ENABLE) );
                                 (AM_HAL_CTIMER_FN_PWM_REPEAT | clk));
 
-    // If this pad uses secondary output:
-    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 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)
+    if(set_periods){
+        // If this pad uses secondary output:
+        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 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)
+            {
+                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
         {
-            ui32ConfigVal = ((ui32ConfigVal & 0xFFFF) << 16);
+            // Otherwise simply set the primary duty cycle
+            am_hal_ctimer_period_set(timer, segment, fw, th);
         }
-        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);
+        am_hal_ctimer_start(timer, segment); // Start the timer only when there are periods to compare to
     }
-    else
-    {
-        // Otherwise simply set the primary duty cycle
-        am_hal_ctimer_period_set(timer, segment, fw, th);
-    }
-
-    am_hal_ctimer_start(timer, segment);
 
     return AP3_OK;
 }
@@ -594,17 +601,17 @@ ap3_err_t analogWriteResolution(uint8_t res)
 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 fw = 0xFFFF; // Choose the frame width in clock periods (32767 -> ~ 180 Hz)
-    if (val == ((0x01 << _analogWriteBits) - 1))
+    uint32_t clk = AM_HAL_CTIMER_HFRC_12MHZ;        // Use an Ambiq HAL provided value to select which clock
+    uint32_t fw = 0xFFFF;                           // Choose the frame width in clock periods (32767 -> ~ 180 Hz)
+    if (val >= ((0x01 << _analogWriteBits) - 1))
     {
         val = fw; // Enable FORCE1
     }
     else
     {
-        val <<= (16 - _analogWriteBits); // Shift over the value to fill available resolution
+        val <<= (16 - _analogWriteBits);            // Shift over the value to fill available resolution
     }
-    uint32_t clk = AM_HAL_CTIMER_HFRC_12MHZ; // Use an Ambiq HAL provided value to select which clock
-
+    
     return ap3_pwm_output(pin, val, fw, clk);
 }
 

variants/SparkFun_Edge_V2/bsp/README.md renamed to variants/SparkFun_Edge2/bsp/README.md

@@ -28,53 +28,53 @@ const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS] = {
     AP3_GPIO_PAD_UNUSED,
     AP3_GPIO_PAD_UNUSED,
     AP3_GPIO_PAD_UNUSED,
-    4,
     AP3_GPIO_PAD_UNUSED,
-    6,
-    7,
+    5, //Camera D5
+    6, //Camera D4
+    7, //Camera PCLK
+    8, //Camera SCL
+    9, //Camera SDA
     AP3_GPIO_PAD_UNUSED,
+    11, //Camera D1
+    12, //Mic CLK
+    13, //Camera Trig
+    14, //Camera D0
+    15, //Camera VSync
+    16, //GPIO 16
+    17, //LED Green
+    18, //LED Blue
+    19, //LED Red
+    20, //SWDCK
+    21, //SWDIO
     AP3_GPIO_PAD_UNUSED,
+    23, //Camera INT
     AP3_GPIO_PAD_UNUSED,
-    11,
-    12,
-    13,
-    14,
-    15,
-    16,
-    17,
-    18,
-    19,
-    20,
-    21,
-    22,
-    23,
-    24,
-    25,
-    26,
-    27,
-    28,
-    29,
+    25, //Camera D2
+    26, //Camera MCLK
+    27, //Camera HSync
+    28, //Camera D7
+    29, //Mic DATA
     AP3_GPIO_PAD_UNUSED,
-    31,
-    32,
-    33,
-    34,
-    35,
+    31, //GPIO 31
+    32, //Camera 1.8V Enable
+    33, //GPIO 33
+    34, //Camera D3
+    35, //Camera D6
     AP3_GPIO_PAD_UNUSED,
-    37,
+    37, //LED Yellow
     AP3_GPIO_PAD_UNUSED,
-    39,
-    40,
+    39, //Qwiic SCL
+    40, //Qwiic SDA
     AP3_GPIO_PAD_UNUSED,
-    42,
-    43,
-    44,
-    45,
+    42, //Accel SCL
+    43, //Accel SDA
+    44, //GPIO 44
+    45, //GPIO 45
     AP3_GPIO_PAD_UNUSED,
     AP3_GPIO_PAD_UNUSED,
-    48,
-    49,
+    48, //Boot TX
+    49, //Boot RX
 };
 
 // Uart Definitions
-Uart Serial(0, 49, 48);// declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on pin 49 and TX on pin 48 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)
+Uart Serial(0, 49, 48); // declares a Uart object called Serial using instance 0 of Apollo3 UART peripherals with RX on pin 49 and TX on pin 48 (note, you specify *pins* not Apollo3 pads. This uses the variant's pin map to determine the Apollo3 pad)

variants/SparkFun_Edge_V2/config/variant.cpp renamed to variants/SparkFun_Edge2/config/variant.cpp

@@ -30,25 +30,31 @@ SOFTWARE.
 extern const ap3_gpio_pad_t ap3_variant_pinmap[AP3_VARIANT_NUM_PINS];
 
 // Uart declarations
-class Uart;         // Forward declaration of Uart
+class Uart; // Forward declaration of Uart
 extern Uart Serial;
 
 // Wire defines
 #define WIRE_INTERFACES_COUNT 3
 
-#define WireQwiic Wire  // Giving Wire an alias of "WireQwiic" in case people want to use it
-#define AP3_Wire_IOM 4  // Secify that Wire uses IOMaster instance 4
+#define WireQwiic Wire // Giving Wire an alias of "WireQwiic" in case people want to use it
+#define AP3_Wire_IOM 4 // Secify that Wire uses IOMaster instance 4
 
 #define WireAccel Wire1
 #define AP3_Wire1_IOM 3
 
 #define WireCamera Wire2
-#define AP3_Wire1_IOM 2
+#define AP3_Wire2_IOM 1
 
 // SPI Defines
-#define SPI_INTERFACES_COUNT 0          //Edge V2 doesn't have any fully-exposed SPI ports
-
+#define SPI_INTERFACES_COUNT 0 //Edge V2 doesn't have any fully-exposed SPI ports
 
 #define LED_BUILTIN 19
+#define LED_GREEN 17
+#define LED_BLUE 18
+#define LED_RED 19
+#define LED_YELLOW 37
+
+#define MIC_DATA 29
+#define MIC_CLOCK 12
 
 #endif // _AP3_VARIANT_H_