Merge branch 'master' into core-ble

Author: oclyke

docs/CHANGELOG.md

@@ -5,6 +5,10 @@ This is a record of the major changes between versions of the SparkFun Arduino A
 
 Each log entry will use the version number of the release that contains the changes listed. Newest version at the top of the file (just below this line)
 
+1.0.13
+===================
+- merged PR #61
+
 1.0.12
 ===================
 - fixed redefinition of ADC symbols in redboard_artemis_nano

libraries/EEPROM/examples/Example2_AllFunctions/Example2_AllFunctions.ino

@@ -16,6 +16,11 @@
 
 #include <EEPROM.h>
 
+// Give a default if the variant does not define one.
+#ifndef A0
+#define A0 0
+#endif
+
 void setup()
 {
   Serial.begin(9600);
@@ -39,7 +44,7 @@ void setup()
   Serial.println("8 bit tests");
   byte myValue1 = 200;
   byte myValue2 = 23;
-  randomLocation = random(0, FLASH_EEPROM_SIZE);
+  randomLocation = random(0, AP3_FLASH_EEPROM_SIZE);
 
   startTime = millis();
   EEPROM.write(randomLocation, myValue1); //(location, data)
@@ -61,7 +66,7 @@ void setup()
   //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   uint16_t myValue3 = 3411;
   int16_t myValue4 = -366;
-  randomLocation = random(0, FLASH_EEPROM_SIZE);
+  randomLocation = random(0, AP3_FLASH_EEPROM_SIZE);
 
   EEPROM.put(randomLocation, myValue3);
   EEPROM.put(randomLocation + 2, myValue4);
@@ -82,7 +87,7 @@ void setup()
   Serial.printf("Size of int: %d\n", sizeof(int));
   int myValue5 = -245000;
   unsigned int myValue6 = 400123;
-  randomLocation = random(0, FLASH_EEPROM_SIZE);
+  randomLocation = random(0, AP3_FLASH_EEPROM_SIZE);
 
   EEPROM.put(randomLocation, myValue5);
   EEPROM.put(randomLocation + 4, myValue6);
@@ -99,7 +104,7 @@ void setup()
   //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
   int32_t myValue7 = -341002;
   uint32_t myValue8 = 241544;
-  randomLocation = random(0, FLASH_EEPROM_SIZE);
+  randomLocation = random(0, AP3_FLASH_EEPROM_SIZE);
 
   EEPROM.update(randomLocation, myValue7);
   EEPROM.update(randomLocation + 4, myValue8);
@@ -117,7 +122,7 @@ void setup()
   Serial.printf("Size of float: %d\n", sizeof(float));
   float myValue9 = -7.35;
   float myValue10 = 5.22;
-  randomLocation = random(0, FLASH_EEPROM_SIZE);
+  randomLocation = random(0, AP3_FLASH_EEPROM_SIZE);
 
   EEPROM.update(randomLocation, myValue9);
   EEPROM.update(randomLocation + 4, myValue10);
@@ -138,7 +143,7 @@ void setup()
   Serial.printf("Size of double: %d\n", sizeof(double));
   double myValue11 = -290.3485723409857;
   double myValue12 = 384.95734987;
-  randomLocation = random(0, FLASH_EEPROM_SIZE);
+  randomLocation = random(0, AP3_FLASH_EEPROM_SIZE);
 
   EEPROM.update(randomLocation, myValue11);
   EEPROM.update(randomLocation + 8, myValue12);
@@ -157,7 +162,7 @@ void setup()
   {
     if (x % 32 == 0)
       Serial.println();
-    Serial.printf("0x%08X ", *(uint32_t *)(FLASH_EEPROM_START + x));
+    Serial.printf("0x%08X ", *(uint32_t *)(AP3_FLASH_EEPROM_START + x));
   }
   Serial.println();
 }

libraries/EEPROM/src/EEPROM.cpp

@@ -113,8 +113,8 @@ void ap3_EEPROM::get(uint16_t eepromLocation, double &dataToGet)
     double lf;
     uint32_t b[2];
   } temp;
-  temp.b[1] = *(uint32_t *)(AP3_FLASH_EEPROM_START + eepromLocation);           //LSB;
-  temp.b[0] = *(uint32_t *)(AP3_FLASH_EEPROM_START + eepromLocation + 4) << 32; //MSB;
+  temp.b[1] = *(uint32_t *)(AP3_FLASH_EEPROM_START + eepromLocation);     //LSB;
+  temp.b[0] = *(uint32_t *)(AP3_FLASH_EEPROM_START + eepromLocation + 4); //MSB;
   dataToGet = temp.lf;
 }
 

libraries/RTC/examples/Example1_getTime/Example1_getTime.ino

@@ -0,0 +1,46 @@
+/* Author: Nathan Seidle
+  Created: Septempter 27th, 2019
+  License: MIT. See SparkFun Arduino Apollo3 Project for more information
+
+  This example demonstrates how to initialize and read from the on board RTC.
+  Most SparkFun Artemis boards have the necessary external 32kHz crystal to
+  enable the RTC. If you are using the Artemis module bare you will either
+  need an external 32kHz xtal or use the internal LFRC. Read the datasheet
+  section 12.1 for more information.
+
+  This example is based on the Ambiq SDK EVB2 RTC example.
+*/
+
+#include "RTC.h" //Include RTC library included with the Aruino_Apollo3 core
+APM3_RTC myRTC; //Create instance of RTC class
+
+void setup()
+{
+  Serial.begin(115200);
+  Serial.println("SparkFun RTC Example");
+
+  myRTC.setToCompilerTime(); //Easily set RTC using the system __DATE__ and __TIME__ macros from compiler
+  //myRTC.setTime(7, 28, 51, 0, 21, 10, 15); //Manually set RTC back to the future: Oct 21st, 2015 at 7:28.51 AM
+}
+
+void loop()
+{
+  myRTC.getTime();
+
+  Serial.printf("It is now ");
+  Serial.printf("%d:", myRTC.hour);
+  Serial.printf("%02d:", myRTC.minute);
+  Serial.printf("%02d.", myRTC.seconds);
+  Serial.printf("%02d", myRTC.hundredths);
+
+  Serial.printf(" %02d/", myRTC.month);
+  Serial.printf("%02d/", myRTC.dayOfMonth);
+  Serial.printf("%02d", myRTC.year);
+
+  Serial.printf(" Day of week: %d =", myRTC.weekday);
+  Serial.printf(" %s", myRTC.textWeekday);
+
+  Serial.println();
+
+  delay(1000);
+}

libraries/RTC/examples/Example2_RTCwithSleep/Example2_RTCwithSleep.ino

@@ -0,0 +1,81 @@
+/* Author: Nathan Seidle
+  Created: Septempter 27th, 2019
+  License: MIT. See SparkFun Arduino Apollo3 Project for more information
+
+  This example demonstrates how to put the core to sleep for a number of
+  milliseconds before waking and printing the current time/date. This
+  is helpful for checking power consumption of the core while RTC+CT6 are running.
+*/
+
+#include "RTC.h" //Include RTC library included with the Aruino_Apollo3 core
+APM3_RTC myRTC; //Create instance of RTC class
+
+uint32_t msToSleep = 2000; //This is the user editable number of ms to sleep between RTC checks
+#define TIMER_FREQ 3000000L //Counter/Timer 6 will use the HFRC oscillator of 3MHz
+uint32_t sysTicksToSleep = msToSleep * (TIMER_FREQ / 1000);
+
+void setup()
+{
+  Serial.begin(115200);
+  Serial.println("SparkFun RTC Example");
+
+  myRTC.setToCompilerTime(); //Easily set RTC using the system __DATE__ and __TIME__ macros from compiler
+  //myRTC.setTime(7, 28, 51, 0, 21, 10, 15); //Manually set RTC back to the future: Oct 21st, 2015 at 7:28.51 AM
+
+  setupWakeTimer();
+}
+
+void loop()
+{
+  myRTC.getTime();
+
+  Serial.printf("It is now ");
+  Serial.printf("%d:", myRTC.hour);
+  Serial.printf("%02d:", myRTC.minute);
+  Serial.printf("%02d.", myRTC.seconds);
+  Serial.printf("%02d", myRTC.hundredths);
+
+  Serial.printf(" %02d/", myRTC.month);
+  Serial.printf("%02d/", myRTC.dayOfMonth);
+  Serial.printf("%02d", myRTC.year);
+
+  Serial.printf(" Day of week: %d =", myRTC.weekday);
+  Serial.printf(" %s", myRTC.textWeekday);
+
+  Serial.println();
+
+  am_hal_sysctrl_sleep(AM_HAL_SYSCTRL_SLEEP_DEEP); //Sleepy time
+}
+
+//We use counter/timer 6 for this example but 0 to 7 are available
+//CT 7 is used for Software Serial. All CTs are used for Servo.
+void setupWakeTimer()
+{
+  //Clear compare interrupt
+  am_hal_stimer_int_clear(AM_HAL_STIMER_INT_COMPAREG); //Use CT6
+
+  am_hal_stimer_int_enable(AM_HAL_STIMER_INT_COMPAREG); // Enable C/T G=6
+
+  //Don't change from 3MHz system timer, but enable G timer
+  am_hal_stimer_config(AM_HAL_STIMER_CFG_CLEAR | AM_HAL_STIMER_CFG_FREEZE);
+  am_hal_stimer_config(AM_HAL_STIMER_HFRC_3MHZ | AM_HAL_STIMER_CFG_COMPARE_G_ENABLE);
+
+  //Setup ISR to trigger when the number of ms have elapsed
+  am_hal_stimer_compare_delta_set(6, sysTicksToSleep);
+
+  //Enable the timer interrupt in the NVIC.
+  NVIC_EnableIRQ(STIMER_CMPR6_IRQn);
+}
+
+//Called once number of milliseconds has passed
+extern "C" void am_stimer_cmpr6_isr(void)
+{
+  uint32_t ui32Status = am_hal_stimer_int_status_get(false);
+  if (ui32Status & AM_HAL_STIMER_INT_COMPAREG)
+  {
+    am_hal_stimer_int_clear(AM_HAL_STIMER_INT_COMPAREG);
+
+    //Reset compare value. ISR will trigger when the number of ms have elapsed
+    am_hal_stimer_compare_delta_set(6, sysTicksToSleep);
+  }
+}

libraries/RTC/keywords.txt

@@ -0,0 +1,21 @@
+#######################################
+# Syntax Coloring Map
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+RTC	KEYWORD1
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+getTime	KEYWORD2
+setTime	KEYWORD2
+setTimeToCompiler	KEYWORD2
+
+#######################################
+# Constants (LITERAL1)
+#######################################

libraries/RTC/library.properties

@@ -0,0 +1,9 @@
+name=RTC
+version=1.0
+author=SparkFun Electronics
+maintainer=SparkFun Electronics <sparkfun.com>
+sentence=Real Time Clock (RTC)) library for the SparkFun Artemis
+paragraph=Enables the setting and reading of the RTC hardware built into Apollo based modules like the Artemis. Many SparkFun Artemis carrier boards have a built in 32kHz crystals. This library enables the reading of the current date and time.
+category=Timing
+url=
+architectures=apollo3

libraries/RTC/src/RTC.cpp

@@ -0,0 +1,124 @@
+/*
+  This example is based on the Ambiq SDK EVB2 RTC example.
+*/
+
+#include "RTC.h"
+
+am_hal_rtc_time_t hal_time;
+
+// String arrays to index Days and Months with the values returned by the RTC.
+char const *pcWeekday[] =
+    {
+        "Sunday",
+        "Monday",
+        "Tuesday",
+        "Wednesday",
+        "Thursday",
+        "Friday",
+        "Saturday",
+        "Invalid day"};
+
+char const *pcMonth[] =
+    {
+        "January",
+        "February",
+        "March",
+        "April",
+        "May",
+        "June",
+        "July",
+        "August",
+        "September",
+        "October",
+        "November",
+        "December",
+        "Invalid month"};
+
+//Constructor
+APM3_RTC::APM3_RTC()
+{
+  // Enable the XT for the RTC.
+  am_hal_clkgen_control(AM_HAL_CLKGEN_CONTROL_XTAL_START, 0);
+
+  // Select XT for RTC clock source
+  am_hal_rtc_osc_select(AM_HAL_RTC_OSC_XT);
+
+  // Enable the RTC.
+  am_hal_rtc_osc_enable();
+}
+
+void APM3_RTC::setTime(uint8_t hour, uint8_t min, uint8_t sec, uint8_t hund, uint8_t dayOfMonth, uint8_t month, uint16_t year)
+{
+  hal_time.ui32Hour = hour;
+  hal_time.ui32Minute = min;
+  hal_time.ui32Second = sec;
+  hal_time.ui32Hundredths = hund;
+
+  hal_time.ui32DayOfMonth = dayOfMonth;
+  hal_time.ui32Month = month - 1; //HAL is expecting 0 to 11 months
+  hal_time.ui32Year = year;
+  hal_time.ui32Century = 0;
+
+  hal_time.ui32Weekday = am_util_time_computeDayofWeek(2000 + year, month + 1, dayOfMonth);
+
+  am_hal_rtc_time_set(&hal_time); //Initialize the RTC with this date/time
+}
+
+//Takes the time from the last build and uses it as the current time
+//Works well as an arduino sketch
+void APM3_RTC::setToCompilerTime()
+{
+  //Get the current date/time from the compiler
+  //Alternatively, you can set these values manually
+  hal_time.ui32Hour = toVal(&__TIME__[0]);
+  hal_time.ui32Minute = toVal(&__TIME__[3]);
+  hal_time.ui32Second = toVal(&__TIME__[6]);
+  hal_time.ui32Hundredths = 00;
+  hal_time.ui32Weekday = am_util_time_computeDayofWeek(2000 + toVal(&__DATE__[9]), mthToIndex(&__DATE__[0]) + 1, toVal(&__DATE__[4]));
+  hal_time.ui32DayOfMonth = toVal(&__DATE__[4]);
+  hal_time.ui32Month = mthToIndex(&__DATE__[0]);
+  hal_time.ui32Year = toVal(&__DATE__[9]);
+  hal_time.ui32Century = 0;
+
+  am_hal_rtc_time_set(&hal_time); //Initialize the RTC with this date/time
+}
+
+void APM3_RTC::getTime()
+{
+  am_hal_rtc_time_get(&hal_time);
+
+  hour = hal_time.ui32Hour;
+  minute = hal_time.ui32Minute;
+  seconds = hal_time.ui32Second;
+  hundredths = hal_time.ui32Hundredths;
+
+  month = hal_time.ui32Month + 1; //Convert from 0-11 to 1-12
+  dayOfMonth = hal_time.ui32DayOfMonth;
+  year = hal_time.ui32Year;
+
+  weekday = hal_time.ui32Weekday;
+  textWeekday = pcWeekday[hal_time.ui32Weekday]; //Given a number (day of week) return the string that represents the name
+}
+
+// mthToIndex() converts a string indicating a month to an index value.
+// The return value is a value 0-12, with 0-11 indicating the month given
+// by the string, and 12 indicating that the string is not a month.
+int APM3_RTC::mthToIndex(char const *pcMon)
+{
+  int idx;
+  for (idx = 0; idx < 12; idx++)
+  {
+    if (am_util_string_strnicmp(pcMonth[idx], pcMon, 3) == 0)
+      return idx;
+  }
+  return 12; //Error
+}
+
+// toVal() converts a string to an ASCII value.
+int APM3_RTC::toVal(char const *pcAsciiStr)
+{
+  int iRetVal = 0;
+  iRetVal += pcAsciiStr[1] - '0';
+  iRetVal += pcAsciiStr[0] == ' ' ? 0 : (pcAsciiStr[0] - '0') * 10;
+  return iRetVal;
+}