commit a308cde4d3c79bad62f5f1306a4bffc6499859e6
parent 1a31190c36c5b7acfaf811a2c4477a03fd4dbd7d
Author: Friedel Schön <[email protected]>
Date: Thu, 9 Jun 2022 22:38:51 +0200
reorganize 5g-code
Diffstat:
5 files changed, 177 insertions(+), 139 deletions(-)
diff --git a/.vscode/arduino.json b/.vscode/arduino.json
@@ -1,5 +1,5 @@
{
"sketch": "5g-client/5g-board.ino",
"board": "SODAQ:samd:sodaq_sara",
- "port": "/dev/tty.usbmodem14201"
+ "port": "/dev/tty.usbmodem1D11101"
}
\ No newline at end of file
diff --git a/5g-client/5g-board.ino b/5g-client/5g-board.ino
@@ -1,123 +1,5 @@
-// -*- utilities -*-
-#define usbSerial SerialUSB
-#define modemSerial Serial1
-#define powerPin SARA_ENABLE
-#define enablePin SARA_TX_ENABLE
-#define voltagePin SARA_R4XX_TOGGLE
-
-
-// -*- settings -*-
-#define baud 115200 // baut-rate of modem-/usb-serial
-#define lineBuffer 256 // buffer-size (bytes) to use to store lines
-#define commandTimeout 5.0 // seconds to cancel a command
-#define commandDelay 0.1 // delay after every command
-#define commandDebug true // send debug information about command requests
-#define eventHandling false // handle '+'-events different
-#define eventDebug true // print '+'-events
-#define lineDebug true // print each line to debug
-
-
-// -*- enums -*-
-enum command_status {
- COMMAND_OK,
- COMMAND_ERROR,
- COMMAND_TIMEOUT
-};
-
-#define SIM_PIN "0000"
-//#define APN_DOMAIN "live.vodafone.com"
-#define APN_DOMAIN "nb.inetd.gdsp"
-
-// -*- helper functions -*-
-
-/** command_status sendCommand(const char* requst, char* response)
- * sends `request` to 5G and stores its response in `response` (may be NULL'ed)
- *
- * if the command succeed, COMMAND_OK will be returned
- * if the command failed, COMMAND_ERROR will be returned
- * if the command timed out, COMMAND_TIMEOUT will be returned (took longer than `commandTimeout`)
- */
-command_status sendCommand(const char* request, char* response, bool silent = false) {
- char line[lineBuffer];
- size_t lineLen;
- char buf;
-
- if (response)
- response[0] = '\0';
-
- unsigned long start = millis(),
- now;
-
- modemSerial.write(request);
- modemSerial.write("\r\n");
- modemSerial.flush();
-
- for (;;) {
- lineLen = 0;
- for (;;) {
- while (!modemSerial.available()) {
- now = millis();
- if (now - start > commandTimeout * 1000) {
- if (commandDebug && !silent) {
- usbSerial.print("[WARN] command '");
- usbSerial.print(request);
- usbSerial.println("' timed out");
- }
- return COMMAND_TIMEOUT;
- }
- }
- buf = modemSerial.read();
- if (buf == '\r')
- continue;
- if (buf == '\n')
- break;
- line[lineLen++] = buf;
- }
- line[lineLen] = '\0';
-
- if (String(line) == "OK") {
- if (commandDebug && !silent) {
- usbSerial.print("[DBUG] command '");
- usbSerial.print(request);
- usbSerial.println("' succeed");
- }
- return COMMAND_OK;
- } else if (strstr(line, "ERROR")) {
- if (commandDebug && !silent) {
- usbSerial.print("[WARN] command '");
- usbSerial.print(request);
- usbSerial.println("' failed");
- }
- return COMMAND_ERROR;
- } else if (eventHandling && line[0] == '+') { // additional info
- if (eventDebug) {
- usbSerial.print("[EVNT] event '");
- usbSerial.print(line);
- usbSerial.println(" caused'");
- }
- } else if (line[0] != '\0') {
- if (lineDebug) {
- usbSerial.print("[LINE] ");
- usbSerial.print(request);
- usbSerial.print(" -> '");
- usbSerial.print(line);
- usbSerial.println("'");
- }
-
- if (response) {
- if (response[0] != '\0') // check if not empty string
- strcat(response, "\n");
- strcat(response, line);
- }
- }
- }
- delay(commandDelay * 1000); // wait 0.1 sec
-}
-
-int sendCommand(const char* request, bool silent = false) {
- return sendCommand(request, NULL, silent);
-}
-
+#include "command.h"
+#include "config.h"
void setup() {
pinMode(powerPin, OUTPUT); // Put voltage on the nb-iot module
@@ -129,7 +11,7 @@ void setup() {
digitalWrite(enablePin, HIGH);
usbSerial.begin(baud);
- while (!usbSerial)
+ while (usbWait && !usbSerial)
;
modemSerial.begin(baud);
@@ -161,31 +43,52 @@ void setup() {
// usbSerial.println("[EROR] sim can't be unlocked, wrong PIN");
// return;
// }
- usbSerial.println("[INFO] SIM unlocked");
+ usbSerial.println("[INFO] sim successful unlocked");
sendCommand("AT+CPSMS=0"); // Disable Power Saving Mode
sendCommand("AT+CEDRXS=0"); // Disable eDRX
- usbSerial.println("[INFO] disable power safe");
+ usbSerial.println("[INFO] disabled power safe");
+
+
+ sendCommand("AT+CFUN=15", COMMAND_BLOCK); // Reset the module
+ sendCommand("AT+UMNOPROF=1", COMMAND_BLOCK); // Set MNO profile (1=automatic,100=standard europe)
+ sendCommand("AT+URAT=7,8"); // Set URAT to LTE-M/NB-IOT
+ sendCommand("AT+CEREG=3", COMMAND_BLOCK); // Enable URCs
+ sendCommand("AT+CGDCONT=1,\"IP\",\"" simAPN "\"", COMMAND_BLOCK); // Set the APN
+ sendCommand("AT+COPS=0,2"); // Autoselect the operator
+
+ usbSerial.print("[INFO] waiting for connection");
+
+ char response[100];
+
+ // Check Siganl strenght, repeat till you have a valid CSQ (99,99 means no signal)
+ while (sendCommand("AT+CSQ", response, COMMAND_SILENT) == COMMAND_OK && !strcmp(response, "+CSQ: 99,99")) {
+ delay(1000);
+ usbSerial.print(".");
+ }
+
+ // Wait for attach, 1 = attached
+ while (sendCommand("AT+CGATT?", response, COMMAND_SILENT) == COMMAND_OK && strcmp(response, "+CGATT: 1")) {
+ delay(1000);
+ usbSerial.print(".");
+ }
+ usbSerial.println();
+
+ usbSerial.println("[INFO] connected!");
+
+ /*
+AT+UHTTP=0,0,"86.92.67.21"
+AT+UHTTP=0,5,80
- sendCommand("AT+CFUN=15"); // Reset the module
- sendCommand("AT+UMNOPROF=1"); // Set MNO profile (1=automatic,100=standard europe)
- sendCommand("AT+URAT=7"); // Set URAT to LTE-M
- sendCommand("AT+CEREG=3"); // Enable URCs
- sendCommand("AT+CGDCONT=1,\"IP\",\"" APN_DOMAIN "\""); // Set the APN
- sendCommand("AT+COPS=0,2"); // Autoselect the operator
+AT+UHTTPC=0,5,"/api/search_connect","","TEST!",1
- // usbSerial.println("[INFO] waiting for connection...");
+ */
- /* char response[100];
- while (sendCommand("AT+CSQ", response, true) == COMMAND_OK && strcmp(response, "+CSQ: 99,99"))
- ;
- // Check Siganl strenght, repeat till you have a valid CSQ (99,99 means no signal)
- while (sendCommand("AT+CGATT?", response, true) == COMMAND_OK && !strcmp(response, "+CGATT: 1"))
- ;
- // Check Siganl strenght, repeat till you have a valid CSQ (99,99 means no signal)
+ sendCommand("AT+UHTTP=0,0,\"86.92.67.21\"");
+ sendCommand("AT+UHTTP=0,5,80");
+ sendCommand("AT+UHTTPC=0,5,\"/api/search_connect\",\"\",\"TEST!\",1");
- usbSerial.println("Connected!");*/
usbSerial.println("[INFO] initiation completed, starting passthrough:");
}
diff --git a/5g-client/command.h b/5g-client/command.h
@@ -0,0 +1,17 @@
+#pragma once
+
+enum command_status {
+ COMMAND_OK = 0, // command succeed
+ COMMAND_ERROR = 1, // command returned an error
+ COMMAND_TIMEOUT = 2 // command timed out
+};
+
+enum command_flags {
+ COMMAND_NONE, // none of them underneath
+ COMMAND_SILENT = 1 << 0, // no debug messages (for looped commands)
+ COMMAND_BLOCK = 1 << 1, // no time-out (for waiting commands)
+ COMMAND_EVENT = 1 << 2, // handle '+'-responses as event
+};
+
+command_status sendCommand(const char* request, char* response, command_flags flags = COMMAND_NONE);
+command_status sendCommand(const char* request, command_flags flags = COMMAND_NONE);
+\ No newline at end of file
diff --git a/5g-client/command.ino b/5g-client/command.ino
@@ -0,0 +1,93 @@
+#include "command.h"
+#include "config.h"
+
+command_status sendCommand(const char* request, char* response, command_flags flags) {
+ char line[lineBuffer];
+ size_t lineLen;
+ char buf;
+
+ bool silent = flags & COMMAND_SILENT,
+ block = flags & COMMAND_BLOCK,
+ event_handle = flags & COMMAND_EVENT;
+
+ if (response)
+ response[0] = '\0';
+
+ unsigned long start = millis(),
+ now;
+
+ modemSerial.write(request);
+ modemSerial.write("\r\n");
+ modemSerial.flush();
+
+ if (blockDebug && block && !silent) {
+ usbSerial.print("[DBUG] command '");
+ usbSerial.print(request);
+ usbSerial.println("' is blocking");
+ }
+
+ for (;;) {
+ lineLen = 0;
+ for (;;) {
+ while (!modemSerial.available()) {
+ now = millis();
+ if (!block && now - start > commandTimeout * 1000) {
+ if (commandDebug && !silent) {
+ usbSerial.print("[WARN] command '");
+ usbSerial.print(request);
+ usbSerial.println("' timed out");
+ }
+ return COMMAND_TIMEOUT;
+ }
+ }
+ buf = modemSerial.read();
+ if (buf == '\r')
+ continue;
+ if (buf == '\n')
+ break;
+ line[lineLen++] = buf;
+ }
+ line[lineLen] = '\0';
+
+ if (String(line) == "OK") {
+ if (commandDebug && !silent) {
+ usbSerial.print("[DBUG] command '");
+ usbSerial.print(request);
+ usbSerial.println("' succeed");
+ }
+ return COMMAND_OK;
+ } else if (strstr(line, "ERROR")) {
+ if (commandDebug && !silent) {
+ usbSerial.print("[WARN] command '");
+ usbSerial.print(request);
+ usbSerial.println("' failed");
+ }
+ return COMMAND_ERROR;
+ } else if (event_handle && line[0] == '+') {
+ if (eventDebug && !silent) {
+ usbSerial.print("[EVNT] event '");
+ usbSerial.print(line);
+ usbSerial.println(" caused'");
+ }
+ } else if (line[0] != '\0' && strcmp(request, line)) {
+ if (lineDebug && !silent) {
+ usbSerial.print("[LINE] ");
+ usbSerial.print(request);
+ usbSerial.print(" -> '");
+ usbSerial.print(line);
+ usbSerial.println("'");
+ }
+
+ if (response) {
+ if (response[0] != '\0') // check if not empty string
+ strcat(response, "\n");
+ strcat(response, line);
+ }
+ }
+ }
+ delay(commandDelay * 1000); // wait 0.1 sec
+}
+
+command_status sendCommand(const char* request, command_flags flags) {
+ return sendCommand(request, NULL, flags);
+}
diff --git a/5g-client/config.h b/5g-client/config.h
@@ -0,0 +1,24 @@
+#pragma once
+
+// -*- hardware stuff -*-
+#define usbSerial SerialUSB
+#define modemSerial Serial1
+#define powerPin SARA_ENABLE
+#define enablePin SARA_TX_ENABLE
+#define voltagePin SARA_R4XX_TOGGLE
+
+
+// -*- behaviour settings -*-
+#define baud 115200 // baut-rate of modem-/usb-serial
+#define lineBuffer 256 // buffer-size (bytes) to use to store lines
+#define commandTimeout 10.0 // seconds to cancel a command
+#define commandDelay 0.1 // delay after every command
+#define commandDebug true // send debug information about command requests
+#define eventDebug true // print '+'-events
+#define lineDebug false // print each line to debug
+#define blockDebug true // print if command is blocking
+#define usbWait true // wait for a usb-connection
+
+// -*- sim settings -*-
+#define simPin "0000" // PIN of the sim
+#define simAPN "lpwa.vodafone.iot" // APN-network of the sim
