Update to tiny ilib v91

Author: cvejlbo

libraries/NDP/examples/AlexaDemo/AlexaDemo.ino

@@ -44,9 +44,9 @@ void setup() {
   NDP.onMatch(ledBlueOn);
   NDP.onEvent(ledGreenOn);
   Serial.println("Loading synpackages");
-  NDP.begin("mcu_fw_120_v90.synpkg");
-  NDP.load("dsp_firmware_v90.synpkg");
-  NDP.load("alexa_334_NDP120_B0_v11_v90.synpkg");
+  NDP.begin("mcu_fw_120_v91.synpkg");
+  NDP.load("dsp_firmware_v91.synpkg");
+  NDP.load("alexa_334_NDP120_B0_v11_v91.synpkg");
   Serial.println("packages loaded");
   NDP.getInfo();
   Serial.println("Configure clock");

libraries/NDP/examples/Record_and_stream/Record_and_stream.ino

@@ -50,9 +50,9 @@ void setup() {
 
   encoder.setOutputStream(Serial);
 
-  NDP.begin("mcu_fw_120_v90.synpkg");
-  NDP.load("dsp_firmware_v90.synpkg");
-  NDP.load("alexa_334_NDP120_B0_v11_v90.synpkg");
+  NDP.begin("mcu_fw_120_v91.synpkg");
+  NDP.load("dsp_firmware_v91.synpkg");
+  NDP.load("alexa_334_NDP120_B0_v11_v91.synpkg");
   NDP.turnOnMicrophone();
   int chunk_size = NDP.getAudioChunkSize();
   if (chunk_size >= sizeof(data)) {

libraries/NDP/extra/alexa_334_NDP120_B0_v11_v90.synpkg renamed to libraries/NDP/extra/alexa_334_NDP120_B0_v11_v91.synpkg

@@ -305,7 +305,10 @@ enum {
     SYNTIANT_NDP120_GET_NN_GRAPH = 0x67,
     SYNTIANT_NDP120_GET_DEBUG_INFO = 0x68,
     SYNTIANT_NDP120_GET_NN_FLOW = 0x69,
-    SYNTIANT_NDP120_GET_AUDIO_CHUNK_SIZE = 0x6a
+    SYNTIANT_NDP120_GET_AUDIO_CHUNK_SIZE = 0x6a,
+    SYNTIANT_NDP120_INPUT_CONFIG = 0x6b,
+    SYNTIANT_NDP120_SET_SPI_DIRECT = 0x6c,
+    SYNTIANT_NDP120_SWITCH_FLOW_SET_ID = 0x6d
 };
 
 enum {
@@ -1135,33 +1138,10 @@ syntiant_ndp120_tiny_poll(struct syntiant_ndp120_tiny_device_s *ndp,
 
     *notifications = 0;
 
-retry:
-
     s = syntiant_ndp120_tiny_read(
         ndp, SYNTIANT_NDP120_SPI_OP, NDP120_SPI_INTSTS, &intsts);
     if (s) goto error;
 
-    /* this is unlikely, and is probably a result of a reset.
-       ignoring this causes false notifications that often
-       result in a host crash */
-
-    if (intsts == 0xFF) {
-        uint8_t id;
-        uint32_t timeout = 0xffffffff;
-        do {
-            s = syntiant_ndp120_tiny_read(
-                ndp, SYNTIANT_NDP120_SPI_OP, NDP120_SPI_ID0, &id);
-            if (s) goto error;
-            if (id != 0xFF) {
-                goto retry;
-            }
-            timeout--;
-        } while (timeout);
-
-        *notifications = SYNTIANT_NDP120_NOTIFICATION_ERROR;
-        goto error;
-    }
-
     if (clear) {
         s = syntiant_ndp120_tiny_write(
             ndp, SYNTIANT_NDP120_SPI_OP, NDP120_SPI_INTSTS, intsts);
@@ -1794,7 +1774,7 @@ int syntiant_ndp120_tiny_send_audio_extract(struct syntiant_ndp120_tiny_device_s
         }
     }
 
-    /* write secure cmd */
+    /* write cmd */
     s = syntiant_ndp120_tiny_write(ndp, SYNTIANT_NDP120_MCU_OP, addr, cmd);
     addr += (uint32_t) sizeof(cmd);
     if (s) goto error;
@@ -1808,11 +1788,109 @@ int syntiant_ndp120_tiny_send_audio_extract(struct syntiant_ndp120_tiny_device_s
     s = syntiant_ndp120_tiny_write_block(ndp, SYNTIANT_NDP120_MCU_OP, addr, &extract_from, sizeof(extract_from));
     if (s) goto error;
 
-    /* send secure command */
+    /* send command */
+    s = syntiant_ndp120_tiny_do_mailbox_req_no_sync(ndp,
+        SYNTIANT_NDP120_MB_MCU_CMD, NULL);
+    if (s) goto error;
+
+error:
+    if (ndp->iif->unsync) {
+        s0 = (ndp->iif->unsync)(ndp->iif->d);
+        s = s ? s : s0;
+    }
+    return s;
+}
+
+int syntiant_ndp120_tiny_spi_direct_config(struct syntiant_ndp120_tiny_device_s *ndp,
+             uint32_t threshold_bytes)
+{
+    uint8_t data_8;
+    int s0;
+    int s = SYNTIANT_NDP120_ERROR_NONE;
+    uint32_t addr = SYNTIANT_NDP120_DL_WINDOW_LOWER;
+    /*uint32_t address = SYNTIANT_NDP120_OPEN_RAM_RESULTS;*/
+    uint32_t cmd = SYNTIANT_NDP120_SET_SPI_DIRECT;
+    uint32_t length = sizeof(threshold_bytes);
+    if (ndp->iif->sync) {
+        s = (ndp->iif->sync)(ndp->iif->d);
+        if (s) {
+            SYNTIANT_NDP120_PRINTF("Error in syntiant_ndp120_tiny_spi_direct_config\n");
+            return s;
+        }
+    }
+
+    /* write cmd */
+    s = syntiant_ndp120_tiny_write(ndp, SYNTIANT_NDP120_MCU_OP, addr, cmd);
+    addr += (uint32_t) sizeof(cmd);
+    if (s) goto error;
+    /* write the length of payload */
+    s = syntiant_ndp120_tiny_write(ndp, SYNTIANT_NDP120_MCU_OP, addr, length);
+    if (s) goto error;
+
+    addr += (uint32_t) sizeof(length);
+    /* write payload */
+    s = syntiant_ndp120_tiny_write_block(ndp, SYNTIANT_NDP120_MCU_OP, addr, &threshold_bytes, sizeof(threshold_bytes));
+    if (s) goto error;
+    /* send command */
+    s = syntiant_ndp120_tiny_do_mailbox_req_no_sync(ndp,
+        SYNTIANT_NDP120_MB_MCU_CMD, NULL);
+    if (s) goto error;
+    /*enabling watermark interrupt*/
+    s = ndp_spi_read(NDP120_SPI_INTCTL, &data_8);
+    if(s) goto error;
+    data_8 = NDP120_SPI_INTCTL_WM_INTEN_INSERT(data_8, 1);
+    ndp_spi_write(NDP120_SPI_INTCTL, data_8);
+
+error:
+    if (ndp->iif->unsync) {
+        s0 = (ndp->iif->unsync)(ndp->iif->d);
+        s = s ? s : s0;
+    }
+    return s;
+}
+
+int
+syntiant_ndp120_tiny_switch_dnn_flow(struct syntiant_ndp120_tiny_device_s *ndp,
+    uint32_t flow_set_id, uint32_t *input_mode)
+{
+    uint8_t data_8;
+    int s0;
+    int s = SYNTIANT_NDP120_ERROR_NONE;
+    uint32_t addr = SYNTIANT_NDP120_DL_WINDOW_LOWER;
+    uint32_t address = SYNTIANT_NDP120_OPEN_RAM_RESULTS;
+    uint32_t cmd[3] = {SYNTIANT_NDP120_SWITCH_FLOW_SET_ID, sizeof(flow_set_id), 0};
+    if (ndp->iif->sync) {
+        s = (ndp->iif->sync)(ndp->iif->d);
+        if (s) {
+            SYNTIANT_NDP120_PRINTF("Error in syntiant_ndp120_tiny_switch_dnn_flow\n");
+            return s;
+        }
+    }
+    cmd[2] = flow_set_id;
+
+    /* write cmd, length of the payload and payload */
+    s = syntiant_ndp120_tiny_write_block(ndp, SYNTIANT_NDP120_MCU_OP, addr,
+        &cmd, sizeof(cmd));
+    if (s) goto error;
+
     s = syntiant_ndp120_tiny_do_mailbox_req_no_sync(ndp,
         SYNTIANT_NDP120_MB_MCU_CMD, NULL);
     if (s) goto error;
 
+    /* read input_mode */
+    s = syntiant_ndp120_tiny_read_block(ndp,SYNTIANT_NDP120_MCU_OP, address, input_mode,
+        sizeof(*input_mode));
+    if (s) goto error;
+
+    if (*input_mode == SYNTIANT_NDP120_TINY_INPUT_CONFIG_SPI) {
+        /*enabling watermark interrupt*/
+        s = ndp_spi_read(NDP120_SPI_INTCTL, &data_8);
+        if (s) goto error;
+        data_8 = NDP120_SPI_INTCTL_WM_INTEN_INSERT(data_8, 1);
+        s = ndp_spi_write(NDP120_SPI_INTCTL, data_8);
+        if (s) goto error;
+    }
+
 error:
     if (ndp->iif->unsync) {
         s0 = (ndp->iif->unsync)(ndp->iif->d);
@@ -1821,6 +1899,7 @@ int syntiant_ndp120_tiny_send_audio_extract(struct syntiant_ndp120_tiny_device_s
     return s;
 }
 
+
 int
 syntiant_ndp120_tiny_get_info(struct syntiant_ndp120_tiny_device_s *ndp,
     struct syntiant_ndp120_tiny_info *idata)
@@ -1834,7 +1913,7 @@ syntiant_ndp120_tiny_get_info(struct syntiant_ndp120_tiny_device_s *ndp,
     if (ndp->iif->sync) {
         s = (ndp->iif->sync)(ndp->iif->d);
         if (s) {
-            SYNTIANT_NDP120_PRINTF("Error in syntiant_ndp120_secure_get_info\n");
+            SYNTIANT_NDP120_PRINTF("Error in syntiant_ndp120_tiny_get_info\n");
             return s;
         }
     }
@@ -1986,3 +2065,60 @@ int syntiant_ndp120_tiny_get_debug(struct syntiant_ndp120_tiny_device_s *ndp,
     }
     return s;
 }
+
+int syntiant_ndp120_tiny_input_config(struct syntiant_ndp120_tiny_device_s *ndp, uint32_t input_mode)
+{
+    int s0;
+    uint8_t data_8;
+    int s = SYNTIANT_NDP120_ERROR_NONE;
+    uint32_t addr = SYNTIANT_NDP120_DL_WINDOW_LOWER;
+    uint32_t address = SYNTIANT_NDP120_OPEN_RAM_RESULTS;
+    uint32_t configured_input = SYNTIANT_NDP120_TINY_GET_INPUT_CONFIG;
+    uint32_t data[3] = {SYNTIANT_NDP120_INPUT_CONFIG, sizeof(input_mode), SYNTIANT_NDP120_TINY_GET_INPUT_CONFIG};
+    if (ndp->iif->sync) {
+        s = (ndp->iif->sync)(ndp->iif->d);
+        if (s) {
+            SYNTIANT_NDP120_PRINTF("Error in syntiant_ndp120_tiny_input_config\n");
+            return s;
+        }
+    }
+    /* write cmd, length of payload, payload */
+    s = syntiant_ndp120_tiny_write_block(ndp, SYNTIANT_NDP120_MCU_OP, addr, &data, sizeof(data));
+    if (s) goto error;
+
+    /* send command */
+    s = syntiant_ndp120_tiny_do_mailbox_req_no_sync(ndp,SYNTIANT_NDP120_MB_MCU_CMD, NULL);
+    if (s) goto error;
+
+    s = syntiant_ndp120_tiny_read_block(ndp,SYNTIANT_NDP120_MCU_OP, address, &configured_input,sizeof(configured_input));
+    if (s) goto error;
+
+    if(configured_input != input_mode) {
+        data[2] =  input_mode;
+        addr = SYNTIANT_NDP120_DL_WINDOW_LOWER;
+        /* write payload */
+        s = syntiant_ndp120_tiny_write_block(ndp, SYNTIANT_NDP120_MCU_OP, addr, &data, sizeof(data));
+        if (s) goto error;
+
+        /* send command */
+        s = syntiant_ndp120_tiny_do_mailbox_req_no_sync(ndp,SYNTIANT_NDP120_MB_MCU_CMD, NULL);
+        if (s) goto error;
+    } else {
+        s = SYNTIANT_NDP120_ERROR_CONFIG;
+        goto error;
+    }
+    if(input_mode == SYNTIANT_NDP120_TINY_INPUT_CONFIG_SPI) {
+        /*enabling watermark interrupt*/
+        s = ndp_spi_read(NDP120_SPI_INTCTL, &data_8);
+        if(s) goto error;
+        data_8 = NDP120_SPI_INTCTL_WM_INTEN_INSERT(data_8, 1);
+        s = ndp_spi_write(NDP120_SPI_INTCTL, data_8);
+        if (s) goto error;
+    }
+error:
+    if (ndp->iif->unsync) {
+        s0 = (ndp->iif->unsync)(ndp->iif->d);
+        s = s ? s : s0;
+    }
+    return s;
+}

libraries/NDP/extra/dsp_firmware_v90.synpkg renamed to libraries/NDP/extra/dsp_firmware_v91.synpkg

@@ -29,6 +29,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  */
+
 #ifndef SYNTIANT_NDP120_TINY_H
 #define SYNTIANT_NDP120_TINY_H
 
@@ -56,9 +57,9 @@ extern "C" {
 /** maximum length (in bytes) of various verison strings
  */
 #define NDP120_MCU_FW_VER_MAX_LEN       (0x20)
-#define NDP120_MCU_DSP_FW_VER_MAX_LEN   (0x3C)
-#define NDP120_MCU_PKG_VER_MAX_LEN      (0x80)
-#define NDP120_MCU_LABELS_MAX_LEN       (0x200)
+#define NDP120_MCU_DSP_FW_VER_MAX_LEN   (0x20)
+#define NDP120_MCU_PKG_VER_MAX_LEN      (0x30)
+#define NDP120_MCU_LABELS_MAX_LEN       (0x2D4)
 #define NDP120_MCU_PBI_VER_MAX_LEN      (0x10)
 
 /**
@@ -87,6 +88,10 @@ extern "C" {
 #define NDP120_SPI_MATCH_WINNER_EXTRACT(x) \
         (((x) & NDP120_SPI_MATCH_WINNER_MASK) >> NDP120_SPI_MATCH_WINNER_SHIFT)
 
+#define NDP120_SPI_INTCTL_WM_INTEN_SHIFT 6
+#define NDP120_SPI_INTCTL_WM_INTEN_INSERT(x, v) \
+        ((x) | ((v) << NDP120_SPI_INTCTL_WM_INTEN_SHIFT))
+
 /* register array ndp120_spi.maddr[4] */
 #define NDP120_SPI_MADDR(i) (0x40U + ((i) << 0))
 #define NDP120_SPI_MADDR_COUNT 4
@@ -107,6 +112,19 @@ extern "C" {
 
 #define SYNTIANT_NDP120_TINY_AUDIO_SAMPLES_PER_WORD 2
 #define SYNTIANT_NDP120_TINY_AUDIO_SAMPLE_RATE 16000
+
+#define SYNTIANT_NDP120_DEF_SPI_SPEED   (1000000)
+#define SYNTIANT_NDP120_MAX_SPI_SPEED   (8000000)
+
+/**
+ * @brief secure input config mode
+ */
+enum syntiant_ndp120_tiny_input_config_mode_e {
+    SYNTIANT_NDP120_TINY_GET_INPUT_CONFIG = 0,
+    SYNTIANT_NDP120_TINY_INPUT_CONFIG_PDM = 1,
+    SYNTIANT_NDP120_TINY_INPUT_CONFIG_SPI = 16
+};
+
 /**
  * @brief Device info structure holding data about deployed model, fimrware etc.
  */
@@ -504,6 +522,8 @@ enum syntiant_ndp_errors_e {
     /**< operation timeout */
     SYNTIANT_NDP120_ERROR_MORE = 9,
     /**< more data is expected */
+    SYNTIANT_NDP120_ERROR_CONFIG = 10,
+    /**< config error */
     SYNTIANT_NDP120_ERROR_DATA_REREAD = 13,
     /**<data has already been read before */
     SYNTIANT_NDP120_ERROR_INVALID_LENGTH  = 16,
@@ -846,6 +866,37 @@ int syntiant_ndp120_tiny_get_audio_chunk_size(struct syntiant_ndp120_tiny_device
 int syntiant_ndp120_tiny_send_audio_extract(struct syntiant_ndp120_tiny_device_s *ndp,
                         uint32_t extract_from);
 
+/**
+ * @brief NDP120 tiny spi direct config
+ *
+ * @param ndp NDP state object
+ * @param threshod_bytes indicates the threshold bytes for SPI FIFO in dsp.
+ * @return a @c SYNTIANT_NDP_ERROR_* code
+ */
+int syntiant_ndp120_tiny_spi_direct_config(struct syntiant_ndp120_tiny_device_s *ndp,
+             uint32_t threshold_bytes);
+
+/**
+ * @brief NDP120 tiny input config sets the input mode of the dsp.
+ *
+ * @param ndp NDP state object
+ * @param input_mode indicates the input mode like PDM or SPI.
+ * @return a @c SYNTIANT_NDP_ERROR_* code
+ */
+int syntiant_ndp120_tiny_input_config(struct syntiant_ndp120_tiny_device_s *ndp,
+             uint32_t input_mode);
+
+/**
+ * @brief NDP120 tiny_switch_dnn_flow changes the flow of the dsp indicated by flow_set_id.
+ *
+ * @param ndp NDP state object
+ * @param flow_set_id indicates the flow set id that is to be changed.
+ * @param input_mode gets the input mode after changing the flow.
+ * @return a @c SYNTIANT_NDP_ERROR_* code
+ */
+int syntiant_ndp120_tiny_switch_dnn_flow(struct syntiant_ndp120_tiny_device_s *ndp,
+             uint32_t flow_set_id, uint32_t *input_mode);
+
 #ifdef __cplusplus
 }
 #endif