fix: Update note-c (#91)

* chore: Update .gitignore

* remove note-c before re-add

* Squashed 'src/note-c/' content from commit e8007a7

git-subtree-dir: src/note-c
git-subtree-split: e8007a770122b0e2232288df04c51904ad12635d

* chore: update `note-c`

Author: zfields

.gitignore

@@ -6,6 +6,8 @@
 *.gcov
 vgcore.*
 
+.vscode/
+build/
 coverage/
 
 Doxyfile*

library.properties

@@ -1,5 +1,5 @@
 name=Blues Wireless Notecard
-version=1.3.16
+version=1.3.17
 author=Blues Wireless
 maintainer=Blues Wireless <info@blues.io>
 sentence=An easy to use Notecard Library for Arduino.

src/note-c/n_cjson_helpers.c

@@ -514,3 +514,72 @@ const char *JType(J *item)
     }
     return "invalid";
 }
+
+//**************************************************************************/
+/*!
+    @brief  Return the type of an item, as an int usable in a switch statement
+    @param   json object
+    @param   field within the json object
+    @returns The type
+*/
+/**************************************************************************/
+int JGetType(J *rsp, const char *field)
+{
+    const char *v;
+    if (rsp == NULL || field == NULL) {
+        return JTYPE_NOT_PRESENT;
+    }
+    J *item = JGetObjectItem(rsp, field);
+    if (item == NULL) {
+        return JTYPE_NOT_PRESENT;
+    }
+    switch (item->type & 0xff) {
+    case JTrue:
+        return JTYPE_BOOL_TRUE;
+    case JFalse:
+        return JTYPE_BOOL_FALSE;
+    case JNULL:
+        return JTYPE_NULL;
+    case JNumber:
+        if (item->valueint == 0 && item->valuenumber == 0) {
+            return JTYPE_NUMBER_ZERO;
+        }
+        return JTYPE_NUMBER;
+    case JRaw:
+    case JString:
+        v = item->valuestring;
+        if (v == NULL || v[0] == 0) {
+            return JTYPE_STRING_BLANK;
+        }
+        int vlen = strlen(v);
+        char *endstr;
+        JNUMBER value = JAtoN(v, &endstr);
+        if (endstr[0] == 0) {
+            if (value == 0) {
+                return JTYPE_STRING_ZERO;
+            }
+            return JTYPE_STRING_NUMBER;
+        }
+        if (vlen == 4 && (
+                    (v[0] == 't' || v[0] == 'T')
+                    && (v[1] == 'r' || v[1] == 'R')
+                    && (v[2] == 'u' || v[2] == 'U')
+                    && (v[3] == 'e' || v[3] == 'E'))) {
+            return JTYPE_STRING_BOOL_TRUE;
+        }
+        if (vlen == 5 && (
+                    (v[0] == 'f' || v[0] == 'F')
+                    && (v[1] == 'a' || v[1] == 'A')
+                    && (v[2] == 'l' || v[2] == 'L')
+                    && (v[3] == 's' || v[3] == 'S')
+                    && (v[4] == 'e' || v[4] == 'E'))) {
+            return JTYPE_STRING_BOOL_FALSE;
+        }
+        return JTYPE_STRING;
+    case JObject:
+        return JTYPE_OBJECT;
+    case JArray:
+        return JTYPE_ARRAY;
+    }
+    return JTYPE_NOT_PRESENT;
+}

src/note-c/n_edge.h

@@ -63,13 +63,26 @@ typedef struct {
     char orientation[20];
 #define MOTIONPOINT_MOTION_COUNT "motion"
     uint32_t motionCount;
+#define MOTIONPOINT_TILT_COUNT "tilt"
+    uint32_t tiltCount;
 } MotionPoint;
 
+// LogData is the data structure that we use when capturing hub.log information
+typedef struct {
+#define LOGDATA_MESSAGE "message"
+    char message[256];
+#define LOGDATA_METHOD "method"
+    char method[64];
+#define LOGDATA_ALERT "alert"
+    bool alert;
+} LogData;
+
 // Format of the edge entry which is the dequeued note body
 #define	EDGE_NOTEFILE				"_edge.qi"
 #define EDGETYPE_SCAN				"scan"
 #define EDGETYPE_TRACKPOINT			"track"
 #define EDGETYPE_MOTIONPOINT		"motion"
+#define EDGETYPE_LOG				"log"
 typedef struct {
 #define EDGE_TYPE "type"
     char edgeType[32];

src/note-c/n_i2c.c

@@ -57,27 +57,28 @@ const char *i2cNoteTransaction(char *json, char **jsonResponse)
     memcpy(transmitBuf, json, jsonLen);
     transmitBuf[jsonLen++] = '\n';
 
+    // Lock over the entire transaction
+    _LockI2C();
+
     // Transmit the request in chunks, but also in segments so as not to overwhelm the notecard's interrupt buffers
     const char *estr;
     uint8_t *chunk = transmitBuf;
     uint32_t sentInSegment = 0;
     while (jsonLen > 0) {
         int chunklen = (uint8_t) (jsonLen > (int)_I2CMax() ? (int)_I2CMax() : jsonLen);
-        _LockI2C();
         _DelayIO();
         estr = _I2CTransmit(_I2CAddress(), chunk, chunklen);
         if (estr != NULL) {
             _Free(transmitBuf);
             _I2CReset(_I2CAddress());
-            _UnlockI2C();
 #ifdef ERRDBG
             _Debug("i2c transmit: ");
             _Debug(estr);
             _Debug("\n");
 #endif
+            _UnlockI2C();
             return estr;
         }
-        _UnlockI2C();
         chunk += chunklen;
         jsonLen -= chunklen;
         sentInSegment += chunklen;
@@ -97,6 +98,7 @@ const char *i2cNoteTransaction(char *json, char **jsonResponse)
 
     // If no reply expected, we're done
     if (jsonResponse == NULL) {
+        _UnlockI2C();
         return NULL;
     }
 
@@ -110,6 +112,7 @@ const char *i2cNoteTransaction(char *json, char **jsonResponse)
 #ifdef ERRDBG
         _Debug("transaction: jsonbuf malloc failed\n");
 #endif
+        _UnlockI2C();
         return ERRSTR("insufficient memory",c_mem);
     }
 
@@ -134,6 +137,7 @@ const char *i2cNoteTransaction(char *json, char **jsonResponse)
                 _Debug("transaction: jsonbuf grow malloc failed\n");
 #endif
                 _Free(jsonbuf);
+                _UnlockI2C();
                 return ERRSTR("insufficient memory",c_mem);
             }
             memcpy(jsonbufNew, jsonbuf, jsonbufLen);
@@ -143,15 +147,14 @@ const char *i2cNoteTransaction(char *json, char **jsonResponse)
 
         // Read the chunk
         uint32_t available;
-        _LockI2C();
         _DelayIO();
         const char *err = _I2CReceive(_I2CAddress(), (uint8_t *) &jsonbuf[jsonbufLen], chunklen, &available);
-        _UnlockI2C();
         if (err != NULL) {
             _Free(jsonbuf);
 #ifdef ERRDBG
             _Debug("i2c receive error\n");
 #endif
+            _UnlockI2C();
             return err;
         }
 
@@ -184,6 +187,7 @@ const char *i2cNoteTransaction(char *json, char **jsonResponse)
 #ifdef ERRDBG
             _Debug("reply to request didn't arrive from module in time\n");
 #endif
+            _UnlockI2C();
             return ERRSTR("request or response was lost {io}",c_iotimeout);
         }
 
@@ -194,6 +198,9 @@ const char *i2cNoteTransaction(char *json, char **jsonResponse)
 
     }
 
+    // Done with the bus
+    _UnlockI2C();
+
     // Null-terminate it, using the +1 space that we'd allocated in the buffer
     jsonbuf[jsonbufLen] = '\0';
 
@@ -215,21 +222,19 @@ bool i2cNoteReset()
     // Reset the I2C subsystem and exit if failure
     _LockI2C();
     bool success = _I2CReset(_I2CAddress());
-    _UnlockI2C();
     if (!success) {
+        _UnlockI2C();
         return false;
     }
 
     // Synchronize by guaranteeing not only that I2C works, but that after we send \n that we drain
     // the remainder of any pending partial reply from a previously-aborted session.
     // If we get a failure on transmitting the \n, it means that the notecard isn't even present.
-    _LockI2C();
     _DelayIO();
     const char *transmitErr = _I2CTransmit(_I2CAddress(), (uint8_t *)"\n", 1);
     if (!cardTurboIO) {
         _DelayMs(CARD_REQUEST_I2C_SEGMENT_DELAY_MS);
     }
-    _UnlockI2C();
 
     // This outer loop does retries on I2C error, and is simply here for robustness.
     bool notecardReady = false;
@@ -245,10 +250,8 @@ bool i2cNoteReset()
             uint8_t buffer[128];
             chunklen = (chunklen > (int)sizeof(buffer)) ? (int)sizeof(buffer) : chunklen;
             chunklen = (chunklen > (int)_I2CMax()) ? (int)_I2CMax() : chunklen;
-            _LockI2C();
             _DelayIO();
             const char *err = _I2CReceive(_I2CAddress(), buffer, chunklen, &available);
-            _UnlockI2C();
             if (err) {
                 break;
             }
@@ -273,12 +276,13 @@ bool i2cNoteReset()
 
     // Reinitialize i2c if there's no response
     if (!notecardReady) {
-        _LockI2C();
         _I2CReset(_I2CAddress());
-        _UnlockI2C();
         _Debug(ERRSTR("notecard not responding\n", "no notecard\n"));
     }
 
+    // Done with the bus
+    _UnlockI2C();
+
     // Done
     return notecardReady;
 }

src/note-c/n_request.c

@@ -161,6 +161,7 @@ bool NoteRequestWithRetry(J *req, uint32_t timeoutSeconds)
             // Free error response
             if (rsp != NULL) {
                 JDelete(rsp);
+                rsp = NULL;
             }
         } else {
 
@@ -251,6 +252,7 @@ J *NoteRequestResponseWithRetry(J *req, uint32_t timeoutSeconds)
             // Free error response
             if (rsp != NULL) {
                 JDelete(rsp);
+                rsp = NULL;
             }
         } else {
 

src/note-c/n_ua.c

@@ -119,8 +119,10 @@ __attribute__((weak)) J *NoteUserAgent()
     n_cpu_name = (char *) "stm32f4";
 #elif defined(ARDUINO_ARCH_STM32G0)
     n_cpu_name = (char *) "stm32g0";
+#elif defined(ARDUINO_SWAN_R5)
+    n_cpu_name = (char *) "swan_r5";
 #elif defined(ARDUINO_ARCH_STM32L4)
-    n_cpu_name = (char *) "stm32f4";
+    n_cpu_name = (char *) "stm32l4";
 #elif defined(ARDUINO_ARCH_STM32U5)
     n_cpu_name = (char *) "stm32u5";
 #elif defined(ARDUINO_ARCH_STM32)

src/note-c/note.h

@@ -193,6 +193,22 @@ const char *JGetItemName(const J * item);
 char *JAllocString(uint8_t *buffer, uint32_t len);
 const char *JType(J *item);
 
+#define JTYPE_NOT_PRESENT		0
+#define JTYPE_BOOL_TRUE			1
+#define JTYPE_BOOL_FALSE		2
+#define JTYPE_NULL				3
+#define JTYPE_NUMBER_ZERO		4
+#define JTYPE_NUMBER			5
+#define JTYPE_STRING_BLANK		6
+#define JTYPE_STRING_ZERO		7
+#define JTYPE_STRING_NUMBER		8
+#define JTYPE_STRING_BOOL_TRUE 	9
+#define JTYPE_STRING_BOOL_FALSE	10
+#define JTYPE_STRING			11
+#define JTYPE_OBJECT			12
+#define JTYPE_ARRAY				13
+int JGetType(J *rsp, const char *field);
+
 // Helper functions for apps that wish to limit their C library dependencies
 #define JNTOA_PRECISION (16)
 #define JNTOA_MAX       (44)