SDK release 3 June 2022

.gitignore

@@ -3,3 +3,5 @@
 *.elf
 *.map
 *.hex
+
+.DS_Store

LICENSE-apache-2.0.txt

@@ -0,0 +1,165 @@
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction, and
+distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the copyright
+owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other entities
+that control, are controlled by, or are under common control with that entity.
+For the purposes of this definition, "control" means (i) the power, direct or
+indirect, to cause the direction or management of such entity, whether by
+contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
+outstanding shares, or (iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications, including
+but not limited to software source code, documentation source, and configuration
+files.
+
+"Object" form shall mean any form resulting from mechanical transformation or
+translation of a Source form, including but not limited to compiled object code,
+generated documentation, and conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object form, made
+available under the License, as indicated by a copyright notice that is included
+in or attached to the work (an example is provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object form, that
+is based on (or derived from) the Work and for which the editorial revisions,
+annotations, elaborations, or other modifications represent, as a whole, an
+original work of authorship. For the purposes of this License, Derivative Works
+shall not include works that remain separable from, or merely link (or bind by
+name) to the interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the original version
+of the Work and any modifications or additions to that Work or Derivative Works
+thereof, that is intentionally submitted to Licensor for inclusion in the Work
+by the copyright owner or by an individual or Legal Entity authorized to submit
+on behalf of the copyright owner. For the purposes of this definition,
+"submitted" means any form of electronic, verbal, or written communication sent
+to the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control systems, and
+issue tracking systems that are managed by, or on behalf of, the Licensor for
+the purpose of discussing and improving the Work, but excluding communication
+that is conspicuously marked or otherwise designated in writing by the copyright
+owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
+of whom a Contribution has been received by Licensor and subsequently
+incorporated within the Work.
+
+2. Grant of Copyright License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable copyright license to reproduce, prepare Derivative Works of,
+publicly display, publicly perform, sublicense, and distribute the Work and such
+Derivative Works in Source or Object form.
+
+3. Grant of Patent License.
+
+Subject to the terms and conditions of this License, each Contributor hereby
+grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
+irrevocable (except as stated in this section) patent license to make, have
+made, use, offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such Contributor
+that are necessarily infringed by their Contribution(s) alone or by combination
+of their Contribution(s) with the Work to which such Contribution(s) was
+submitted. If You institute patent litigation against any entity (including a
+cross-claim or counterclaim in a lawsuit) alleging that the Work or a
+Contribution incorporated within the Work constitutes direct or contributory
+patent infringement, then any patent licenses granted to You under this License
+for that Work shall terminate as of the date such litigation is filed.
+
+4. Redistribution.
+
+You may reproduce and distribute copies of the Work or Derivative Works thereof
+in any medium, with or without modifications, and in Source or Object form,
+provided that You meet the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a copy of
+this License; and
+You must cause any modified files to carry prominent notices stating that You
+changed the files; and
+You must retain, in the Source form of any Derivative Works that You distribute,
+all copyright, patent, trademark, and attribution notices from the Source form
+of the Work, excluding those notices that do not pertain to any part of the
+Derivative Works; and
+If the Work includes a "NOTICE" text file as part of its distribution, then any
+Derivative Works that You distribute must include a readable copy of the
+attribution notices contained within such NOTICE file, excluding those notices
+that do not pertain to any part of the Derivative Works, in at least one of the
+following places: within a NOTICE text file distributed as part of the
+Derivative Works; within the Source form or documentation, if provided along
+with the Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The contents of
+the NOTICE file are for informational purposes only and do not modify the
+License. You may add Your own attribution notices within Derivative Works that
+You distribute, alongside or as an addendum to the NOTICE text from the Work,
+provided that such additional attribution notices cannot be construed as
+modifying the License.
+You may add Your own copyright statement to Your modifications and may provide
+additional or different license terms and conditions for use, reproduction, or
+distribution of Your modifications, or for any such Derivative Works as a whole,
+provided Your use, reproduction, and distribution of the Work otherwise complies
+with the conditions stated in this License.
+
+5. Submission of Contributions.
+
+Unless You explicitly state otherwise, any Contribution intentionally submitted
+for inclusion in the Work by You to the Licensor shall be under the terms and
+conditions of this License, without any additional terms or conditions.
+Notwithstanding the above, nothing herein shall supersede or modify the terms of
+any separate license agreement you may have executed with Licensor regarding
+such Contributions.
+
+6. Trademarks.
+
+This License does not grant permission to use the trade names, trademarks,
+service marks, or product names of the Licensor, except as required for
+reasonable and customary use in describing the origin of the Work and
+reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty.
+
+Unless required by applicable law or agreed to in writing, Licensor provides the
+Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
+including, without limitation, any warranties or conditions of TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
+solely responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your exercise of
+permissions under this License.
+
+8. Limitation of Liability.
+
+In no event and under no legal theory, whether in tort (including negligence),
+contract, or otherwise, unless required by applicable law (such as deliberate
+and grossly negligent acts) or agreed to in writing, shall any Contributor be
+liable to You for damages, including any direct, indirect, special, incidental,
+or consequential damages of any character arising as a result of this License or
+out of the use or inability to use the Work (including but not limited to
+damages for loss of goodwill, work stoppage, computer failure or malfunction, or
+any and all other commercial damages or losses), even if such Contributor has
+been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability.
+
+While redistributing the Work or Derivative Works thereof, You may choose to
+offer, and charge a fee for, acceptance of support, warranty, indemnity, or
+other liability obligations and/or rights consistent with this License. However,
+in accepting such obligations, You may act only on Your own behalf and on Your
+sole responsibility, not on behalf of any other Contributor, and only if You
+agree to indemnify, defend, and hold each Contributor harmless for any liability
+incurred by, or claims asserted against, such Contributor by reason of your
+accepting any such warranty or additional liability.

README.md

@@ -8,30 +8,48 @@ This project uses the `arduino-cli` compiler to build & flash new firmware. Wind
 The script will verify if all needed libraries and the samd core is installed and install them if needed. If you prefer to do this 
 step manually, follow the step in the next chapter.
 
-For building the project use:
+For building the project:
 
+* For audio support, use:
 ```
 ./arduino-build.sh --build
 ```
 
+* For IMU sensor support, use:
+```
+./arduino-build.sh --build --with-imu
+```
+
+
 For flashing use:
 
 ```
 ./arduino-build.sh --flash
 ```
 
+
 You can also do both by using:
 ```
-./arduino-build.sh --all
+./arduino-build.sh --all [--with-imu]
 ```
 
 
 ### Usage - Windows
 
 * Run `update_libraries_windows.bat` script to install Arduino libraries.
 
-* Open the `firmware-syntiant-tinyml.ino` with the Arduino IDE. Select MKRZero as board target and compile/upload.
+* For audio support:
+
+    * Open the `firmware-syntiant-tinyml.ino` with the Arduino IDE.
+    * Select MKRZero as board target and compile/upload.
 
+* For IMU sensor support:
+    * Open the `src/syntiant.cpp` file and uncomment the following line:
+    ```
+    //#define WITH_IMU
+    ```
+    * Open the `firmware-syntiant-tinyml.ino` with the Arduino IDE.
+    * Select MKRZero as board target and compile/upload.
 
 
 ## Setup Manually

arduino-build.sh

@@ -3,6 +3,8 @@
 PROJECT=firmware-syntiant-tinyml
 BOARD=arduino:samd:mkrzero
 COMMAND=$1
+# use --with-imu flag as 2nd argument to build firmware for IMU
+SENSOR=$2
 
 if [ -z "$ARDUINO_CLI" ]; then
 	ARDUINO_CLI=$(which arduino-cli || true)
@@ -203,9 +205,9 @@ if [ -z "$HAS_NDP_LIB" ]; then
     echo "Installing NDP library OK"
 fi
 
-# Check NDP_utils v1.0.0
+# Check NDP_utils v1.0.2
 has_NDP_utils_lib() {
-	$ARDUINO_CLI lib list NDP_utils | grep 1.0.0 || true
+	$ARDUINO_CLI lib list NDP_utils | grep 1.0.2 || true
 }
 HAS_NDP_UTILS_LIB="$(has_NDP_utils_lib)"
 if [ -z "$HAS_NDP_UTILS_LIB" ]; then
@@ -233,16 +235,28 @@ else
     BUILD_PROPERTIES_FLAG=--build-properties
 fi
 
-INCLUDE="-I./src/"
+INCLUDE="-DEI_SENSOR_AQ_STREAM=FILE"
+INCLUDE+=" -I./src/"
 INCLUDE+=" -I/ingestion-sdk-platform/repl/"
+INCLUDE+=" -I./src/ingestion-sdk-platform/syntiant/"
+INCLUDE+=" -I./src/sensors/"
+INCLUDE+=" -I./src/ingestion-sdk-c/"
+INCLUDE+=" -I./src/QCBOR/inc/"
+INCLUDE+=" -I./src/sensor_aq_mbedtls/"
 INCLUDE+=" -DUSE_ARDUINO_MKR_PIN_LAYOUT -D__SAMD21G18A__ "
 INCLUDE+="-DUSB_VID=0x2341 -DUSB_PID=0x804f -DUSBCON -DUSB_MANUFACTURER=\"Syntiant\" -DUSB_PRODUCT=\"TinyML\""
 
+if [ "$SENSOR" = "--with-imu" ];
+then
+    CPP_FLAGS="-DWITH_IMU"
+else
+    CPP_FLAGS=""
+fi
 
 if [ "$COMMAND" = "--build" ];
 then
 	echo "Building $PROJECT"
-	$ARDUINO_CLI compile --fqbn $BOARD $BUILD_PROPERTIES_FLAG build.extra_flags="$INCLUDE" --output-dir . &
+	$ARDUINO_CLI compile --fqbn $BOARD $BUILD_PROPERTIES_FLAG build.extra_flags="$INCLUDE" $BUILD_PROPERTIES_FLAG "compiler.cpp.extra_flags=${CPP_FLAGS}" --output-dir . &
 	pid=$! # Process Id of the previous running command
 	while kill -0 $pid 2>/dev/null
 	do
@@ -262,7 +276,7 @@ then
 	$ARDUINO_CLI upload -p $($ARDUINO_CLI board list | grep Arduino | cut -d ' ' -f1) --fqbn $BOARD --input-dir .
 elif [ "$COMMAND" = "--all" ];
 then
-	$ARDUINO_CLI compile --clean --fqbn $BOARD $BUILD_PROPERTIES_FLAG build.extra_flags="$INCLUDE" --output-dir .
+	$ARDUINO_CLI compile --clean --fqbn $BOARD $BUILD_PROPERTIES_FLAG build.extra_flags="$INCLUDE" $BUILD_PROPERTIES_FLAG "compiler.cpp.extra_flags=${CPP_FLAGS}" --output-dir .
 	status=$?
 	[ $status -eq 0 ] && $ARDUINO_CLI upload -p $($ARDUINO_CLI board list | grep Arduino | cut -d ' ' -f1) --fqbn $BOARD --input-dir .
 else

lib/NDP_utils/library.properties

@@ -1,5 +1,5 @@
 name=NDP_utils
-version=1.0.0
+version=1.0.2
 author=Martin Weetman, Jon Haley
 maintainer=
 sentence=Enables various functionality in conjunction with the Syntiant NDP library

lib/NDP_utils/src/NDP_PMU.cpp

@@ -61,50 +61,50 @@ void readFrom(int device, byte address, int num, byte buff[])
 
 void printPmu()
 {
-    Serial.print("SGM41512 Registers - ");
+    Serial2.print("SGM41512 Registers - ");
 
     byte buff[10];
     for (byte i = 0; i < 0xc; i++) { // SGM41512 has 11 registers.
         readFrom(SGM41512, i, 1, buff);
-        Serial.print(i);
-        Serial.print(" = 0x");
-        Serial.print(buff[0], HEX);
-        Serial.print(", ");
+        Serial2.print(i);
+        Serial2.print(" = 0x");
+        Serial2.print(buff[0], HEX);
+        Serial2.print(", ");
     }
-    Serial.println("");
+    Serial2.println("");
 }
 
 // Print LiPo battery voltage. Maximum (3v7) should give 0x3ff
 void printBattery()
 {
-    Serial.print("Battery = ");
-    Serial.print(100 * analogRead(ADC_BATTERY) / 0x3ff);
-    Serial.println("%");
+    Serial2.print("Battery = ");
+    Serial2.print(100 * analogRead(ADC_BATTERY) / 0x3ff);
+    Serial2.println("%");
 }
 
 // Set PMU into Boost mode. This generates 5v on the PMU PMD pin
 void pmuBoost()
 {
-    //Serial.println("Reseting PMU Registers");
+    //Serial2.println("Reseting PMU Registers");
 
     // reset PMU registers
     writeTo(SGM41512, RESET_AND_VERSION_REG, 0xAC);
 
-    Serial.println("Enabling boost mode");
+    Serial2.println("Enabling boost mode");
 
     // Set PMU_OTG pin high to enable boost mode
     digitalWrite(PMU_OTG, HIGH);
     digitalWrite(ENABLE_5V, HIGH);
 
     if (!PMIC.begin()) {
-        Serial.println("Failed to initialize PMIC!");
+        Serial2.println("Failed to initialize PMIC!");
         return;
     }
 
     // Enable boost mode, this mode allow to use the board as host and
     // connect guest device like keyboard
     if (!PMIC.enableBoostMode())  {
-        Serial.println("Error enabling boost mode");
+        Serial2.println("Error enabling boost mode");
     }
 
     // disable watchdog
@@ -117,7 +117,7 @@ void pmuCharge()
     // reset PMU registers
     writeTo(SGM41512, RESET_AND_VERSION_REG, 0xAC);
 
-    Serial.println("Enabling battery charging mode");
+    Serial2.println("Enabling battery charging mode");
 
     // Set OTB low (no boost mode). Disable 5v out
     //digitalWrite(PMU_OTG, HIGH);
@@ -130,7 +130,7 @@ void pmuCharge()
     writeTo(SGM41512, CHARGE_CURRENT_CTL_REG, 0x83);
     // Enable the Charger
     if (!PMIC.enableCharge()) {
-        Serial.println("Error enabling battery charging mode");
+        Serial2.println("Error enabling battery charging mode");
     }
     // disable watchdog
     PMIC.disableWatchdog();

lib/NDP_utils/src/NDP_loadModel.cpp

@@ -44,8 +44,9 @@ int loadModel(String model)
     // Initialize SD insertion sense pin
     pinMode(SD_CARD_SENSE, INPUT_PULLUP);
 
-    pinMode(ENABLE_PDM, OUTPUT);
-    digitalWrite(ENABLE_PDM, LOW); // Enable PDM clock
+    // Can cause issue with sensor if PDM enabled. Will be enabled for audio in syntiant.cpp
+    //pinMode(ENABLE_PDM, OUTPUT);
+    //digitalWrite(ENABLE_PDM, LOW); // Enable PDM clock
 
     // Bluebank board uses SST25VF016B. SD_CARD_SENSE pin is HIGH with card inserted
     // Tesolve board uses MX25R6435FSN. SD_CARD_SENSE pin is LOW with card inserted