adopt for MacOS, new SW version of Board and Libraries

.gitignore

@@ -1 +1,5 @@
 mini-beieli-provision-cubecell
+appkey
+calibrate
+MiniBeieliNodeSketch/build
+cyacd

MiniBeieliNodeSketch/MiniBeieliNodeSketch.ino

@@ -12,19 +12,16 @@ BME280 bme280;
 /******************************************************************************/
 /* Firmware Version                                                           */
 /******************************************************************************/
-static const int32_t fwVersion = 20210205;
+static const int32_t fwVersion = 20211228;
 
 /******************************************************************************/
 /* LoraWAN Settings                                                           */
 /******************************************************************************/
 
 /* OTAA para*/
-//uint8_t devEui[] = { 0x22, 0x32, 0x33, 0x00, 0x00, 0x88, 0x88, 0x02 };
-//uint8_t appEui[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-//uint8_t appKey[] = { 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x88, 0x66, 0x01 };
-uint8_t devEui[] = { 0x00, 0x00, 0xd3, 0xa6, 0x59, 0x83, 0x3b, 0x25 };
-uint8_t appEui[] = { 0x70, 0xb3, 0xd5, 0x7e, 0xd0, 0x02, 0xe5, 0xab };
-uint8_t appKey[] = { 0x00, 0x00, 0xd3, 0xa6, 0x59, 0x83, 0x3b, 0x25, 0x00, 0x00, 0xd3, 0xa6, 0x59, 0x83, 0x3b, 0x25 };
+uint8_t devEui[8];
+uint8_t appEui[8];
+uint8_t appKey[16];
 
 /* ABP para*/
 uint8_t nwkSKey[] = { 0x15, 0xb1, 0xd0, 0xef, 0xa4, 0x63, 0xdf, 0xbe, 0x3d, 0x11, 0x18, 0x1e, 0x1e, 0xc7, 0xda, 0x85 };
@@ -170,6 +167,9 @@ typedef struct {
   float cal_a_factor;                               // 4 Bytes, Kalibrationsfaktor Waegezelle 1
   float cal_b_factor;                               // 4 Bytes, Kalibrationsfaktor Waegezelle 2
   byte debug_level;                                 // 0 => no debugging, no led, 1 => infos, no led, 2 => infos, 3 => error, 4 => highest level
+  uint8_t devEui[8];                                // keep OTAA settings so that new fw-updates does not overwrite it
+  uint8_t appEui[8];                                // dito
+  uint8_t appKey[16];                               // dito
 } __attribute__((packed)) CONFIG_data;
 
 typedef struct {
@@ -655,6 +655,19 @@ bool checkUserAt(char *cmd, char *content)
     return true;
   }
 
+  if (strcmp(cmd, "SAVE_OTAA_CONFIG") == 0)
+  {
+    if (content[0] == '1')
+    {
+      memcpy(config_data.devEui, devEui, sizeof(devEui));
+      memcpy(config_data.appEui, appEui, sizeof(appEui));
+      memcpy(config_data.appKey, appKey, sizeof(appKey));
+      WriteConfigDataToFlash();
+      Serial.printf("saved OTAA configuration to flash\n");
+    }
+    return true;
+  }
+
   if (strcmp(cmd, "READ_SENSORS") == 0)
   {
     if (content[0] == '?')
@@ -667,7 +680,7 @@ bool checkUserAt(char *cmd, char *content)
       Serial.printf("  \"temperature\": \"%d\",\n", sensor_data.temperature);
       Serial.printf("  \"humidity\": \"%d\",\n", sensor_data.humidity);
       Serial.printf("  \"pressure\": \"%d\",\n", sensor_data.pressure);
-      Serial.printf("  \"vbat\": \"%d\",\n", sensor_data.vbat);
+      Serial.printf("  \"vbat\": \"%d\"\n", sensor_data.vbat);
       Serial.printf("}\n");
     }
     return true;
@@ -763,6 +776,10 @@ void setup_platform(void)
 
   // read config_data from flash...
   ReadConfigDataFromFlash();
+  memcpy(devEui, config_data.devEui, sizeof(config_data.devEui));
+  memcpy(appEui, config_data.appEui, sizeof(config_data.appEui));
+  memcpy(appKey, config_data.appKey, sizeof(config_data.appKey));
+
   if (config_data.debug_level > 0) {
     Serial.printf("Setup_platform, this is the configuration\n");
     Serial.printf("cal_a_0: %d\n", config_data.cal_a_0);
@@ -833,12 +850,14 @@ void AddSensorDataToLoraData()
     timer_pos0 = millis();
   }
   my_position++;
-
-  last_sensor_reading = sensor_data;
 }
 
 bool TooBigWeightChange()
 {
+  // on first position there cannot be a difference 
+  if (my_position == 1) {
+     return false;
+  }
   bool big_difference = (abs(last_sensor_reading.weight - sensor_data.weight) > SEND_DIFF_THRESHOLD_5GRAMS);
   if (big_difference) {
     lora_data.weight_last = sensor_data.weight;
@@ -890,7 +909,8 @@ bool ReadSensors(bool read_only)
   if (!read_only) {
     AddSensorDataToLoraData();
     send_data = (TooBigWeightChange()) || (my_position >= MAX_VALUES_TO_SEND) || (iteration <= INIT_PACKETS) || (iteration % INIT_PACKAGE_INTERVAL == 0);
-
+    last_sensor_reading = sensor_data;
+ 
     if (config_data.debug_level > 0) {
       if (send_data) {
         Serial.printf("Iteration: %d, we send the data...\n", iteration);

README.md

@@ -20,10 +20,63 @@ Autor: Joerg Lehmann, nbit Informatik GmbH
 
 Das sind die verwendeten Libraries [1]:
 
-| URL | Commit | Commit Date |
-| --- | -----  | ----------- |
-| https://github.com/HelTecAutomation/ASR650x-Arduino.git  | 9856523 | Thu, 4 Feb 2021 18:02:48 +0800  |
+| URL | Branch | Commit | Commit Date |
+| --- | ------ | -----  | ----------- |
+| https://github.com/HelTecAutomation/ASR650x-Arduino.git  | e15d5fd | Mon, 25 Oct 2021 11:49:55 +0800  |
 | https://github.com/sparkfun/SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.git  | 688f255 | Fri, 3 Jan 2020 12:35:22 -0700  |
 | https://github.com/sparkfun/SparkFun_BME280_Arduino_Library.git  | 0b5eabf | Wed, 30 Dec 2020 20:44:27 -0700  |
 
+`
 [1]: echo "| $(git remote -v |grep fetch |awk '{print $2}' |tr '\n' ' ') | $(git log --pretty=format:'%h | %cD ' -n 1) |"
+`
+
+## Wir verwenden arduino-cli
+
+Installation:
+`
+$ brew install arduino-cli
+$ arduino-cli version
+arduino-cli  Version: 0.20.2 Commit: 13783819 Date: 2021-12-07T16:41:50Z
+
+$ arduino-cli sketch new MiniBeieliNodeSketch
+
+Install Board aus Git
+
+mkdir -p ~/Documents/Arduino/hardware/CubeCell
+cd ~/Documents/Arduino/hardware/CubeCell
+git clone https://github.com/HelTecAutomation/ASR650x-Arduino.git CubeCell
+cd CubeCell/tools
+python get.py
+
+Install Libraries (from Git...):
+
+$ cd ~/Documents/Arduino/libraries
+$ git clone https://github.com/sparkfun/SparkFun_Qwiic_Scale_NAU7802_Arduino_Library.git
+$ git clone https://github.com/sparkfun/SparkFun_BME280_Arduino_Library.git
+
+Set FQBN:
+$ FQBN="CubeCell:CubeCell:CubeCell-Board:LORAWAN_REGION=6,LORAWAN_CLASS=0,LORAWAN_DEVEUI=0,LORAWAN_NETMODE=0,LORAWAN_ADR=0,LORAWAN_UPLINKMODE=1,LORAWAN_Net_Reserve=0,LORAWAN_AT_SUPPORT=0,LORAWAN_RGB=0,LORAWAN_DebugLevel=0"
+
+Compile:
+$ arduino-cli compile --export-binaries --clean --fqbn ${FQBN} MiniBeieliNodeSketch
+
+Upload:
+$ arduino-cli upload --verbose --fqbn ${FQBN} -p /dev/tty.usbserial-0001 MiniBeieliNodeSketch
+
+*.cyacd-File kann kopiert werden nach cyacd-Directory:
+Beispiel:
+
+joerg@z240 mini-beieli-node-cubecell % arduino-cli upload --verbose --fqbn ${FQBN} -p /dev/tty.usbserial-0001 MiniBeieliNodeSketch
+"/Users/joerg/Documents/Arduino/hardware/CubeCell/CubeCell/tools/CubeCellflash/CubeCellflash" -serial "/dev/tty.usbserial-0001" "/private/var/folders/n6/jjw6yp4s2dz0sd76rz3k7mzm0000gn/T/arduino-sketch-97CDDDDD36F10A320334F076837B4C34/CubeCell_Board_REGION_EU868_RGB_0.cyacd"
+
+$ mkdir -p cyacd/20211228
+$ cp /private/var/folders/n6/jjw6yp4s2dz0sd76rz3k7mzm0000gn/T/arduino-sketch-97CDDDDD36F10A320334F076837B4C34/CubeCell_Board_REGION_EU868_RGB_0.cyacd cyacd/20211228
+
+Alternative zum Upload der Firmware:
+$ /Users/joerg/Documents/Arduino/hardware/CubeCell/CubeCell/tools/CubeCellflash/CubeCellflash -serial /dev/tty.usbserial-0001 cyacd/20211228/CubeCell_Board_REGION_EU868_RGB_0.cyacd
+
+USB-Device kann am einfachsten wie folgt bestimmt werden:
+
+joerg@mbp mini-beieli-node-cubecell % ls -l /dev/tty.usbserial*
+crw-rw-rw-  1 root  wheel  0x9000004 28 Dez 19:38 /dev/tty.usbserial-0001
+`

appkey.go

@@ -0,0 +1,62 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+)
+
+func getAppKey(deveui string) string {
+	if len(deveui) == 16 {
+		appkey := fmt.Sprintf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
+			deveui[10],
+			deveui[3],
+			deveui[4],
+			deveui[7],
+			deveui[15],
+			deveui[9],
+			deveui[11],
+			deveui[2],
+			deveui[0],
+			deveui[8],
+			deveui[1],
+			deveui[6],
+			deveui[5],
+			deveui[12],
+			deveui[14],
+			deveui[13],
+			deveui[3],
+			deveui[6],
+			deveui[12],
+			deveui[7],
+			deveui[15],
+			deveui[1],
+			deveui[9],
+			deveui[11],
+			deveui[2],
+			deveui[10],
+			deveui[0],
+			deveui[8],
+			deveui[5],
+			deveui[14],
+			deveui[4],
+			deveui[13])
+
+		return appkey
+
+	} else {
+		fmt.Printf("devEui has wrong length: %s\n", deveui)
+		return ""
+	}
+}
+
+func main() {
+	if len(os.Args) != 2 {
+		fmt.Println("usage: " + filepath.Base(os.Args[0]) + " <DevEui>")
+		os.Exit(1)
+	}
+
+	devEui := os.Args[1]
+	appKey := getAppKey(devEui)
+	fmt.Printf("%s\n", appKey)
+}

calibrate.go

@@ -0,0 +1,152 @@
+package main
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"github.com/tarm/serial"
+	"log"
+	"os"
+	"path/filepath"
+	"strconv"
+	"strings"
+	"time"
+)
+
+type SensorData struct {
+	WeightARaw string `json:"weight_a_raw"`
+	WeightBRaw string `json:"weight_b_raw"`
+}
+
+// returns last line of output
+func sendCommand(p *serial.Port, command string) string {
+	fmt.Printf("%s\n", command)
+	var last_line string = ""
+	p.Flush()
+	_, err := p.Write([]byte(command))
+	if err != nil {
+		log.Fatal(err)
+	}
+	buf := make([]byte, 1024)
+
+	time.Sleep(500 * time.Millisecond)
+
+	n, _ := p.Read(buf)
+	if n > 0 {
+		last_line_arr := strings.Split(string(buf[:n]), "\n")
+		//fmt.Printf("AAA: %+q\n", last_line_arr)
+		last_line = last_line_arr[len(last_line_arr)-2]
+
+		fmt.Print(string(buf[:n]))
+	}
+	return last_line
+}
+
+// returns output
+func sendCommandJSON(p *serial.Port, command string) string {
+	fmt.Printf("%s\n", command)
+	var res string = ""
+	p.Flush()
+	_, err := p.Write([]byte(command))
+	if err != nil {
+		log.Fatal(err)
+	}
+	buf := make([]byte, 1024)
+
+	time.Sleep(3000 * time.Millisecond)
+
+	n, _ := p.Read(buf)
+	if n > 0 {
+		res = string(buf[:n-1])
+	}
+	return res
+}
+
+func getDevEui(p *serial.Port) string {
+	var reply = sendCommand(p, "AT+ChipID=?")
+	//fmt.Printf("XXX%sYYY\n",reply)
+	if len(reply) >= 20 {
+		return "0000" + reply[8:20]
+	} else {
+		return ""
+	}
+}
+
+func ReadSensorData(p *serial.Port) SensorData {
+	var reply = sendCommandJSON(p, "AT+READ_SENSORS=?")
+	fmt.Printf("XXX%sYYY\n", reply)
+
+	var data SensorData
+	json.Unmarshal([]byte(reply), &data)
+	//fmt.Printf("%v \n", data)
+
+	//fmt.Printf("weight_a_raw: %s\n", data.WeightARaw)
+	//fmt.Printf("weight_b_raw: %s\n", data.WeightBRaw)
+
+	return data
+}
+
+func readSerial(p *serial.Port) {
+	p.Flush()
+	buf := make([]byte, 32)
+
+	time.Sleep(200 * time.Millisecond)
+	n, _ := p.Read(buf)
+	for n > 0 {
+		// ignoring error as EOF raises error on Linux
+		reply := string(buf[:n])
+		fmt.Print(reply)
+		n, _ = p.Read(buf)
+	}
+}
+
+func main() {
+	if len(os.Args) != 3 {
+		fmt.Println("usage: " + filepath.Base(os.Args[0]) + " <SerialDevice> <calibration_weight_in_gram>")
+		os.Exit(1)
+	}
+
+	serialdev := os.Args[1]
+	calWeightS := os.Args[2]
+	calWeight, _ := strconv.Atoi(calWeightS)
+
+	c := &serial.Config{Name: serialdev, Baud: 115200, ReadTimeout: time.Second * 1}
+	s, err := serial.OpenPort(c)
+	if err != nil {
+		log.Fatal("Problem mit Serial Interface")
+	}
+
+	sendCommand(s, "AT+XXX")
+	devEui := getDevEui(s)
+	reader := bufio.NewReader(os.Stdin)
+	if devEui != "" {
+		fmt.Println("Hit Return when no weight is on scale (neither on A not on B)")
+		reader.ReadString('\n')
+		sendCommand(s, "AT+XXX")
+		sensorData := ReadSensorData(s)
+		fmt.Printf("%v\n", sensorData)
+		a0, _ := strconv.Atoi(sensorData.WeightARaw)
+		b0, _ := strconv.Atoi(sensorData.WeightBRaw)
+		sendCommand(s, "AT+CAL_A_0="+sensorData.WeightARaw)
+		sendCommand(s, "AT+CAL_B_0="+sensorData.WeightBRaw)
+		fmt.Println("Put Weight on Scale A, then hit Return")
+		reader.ReadString('\n')
+		sendCommand(s, "AT+XXX")
+		sensorData = ReadSensorData(s)
+		aW, _ := strconv.Atoi(sensorData.WeightARaw)
+		fmt.Println("Put Weight on Scale B, then hit Return")
+		reader.ReadString('\n')
+		sendCommand(s, "AT+XXX")
+		sensorData = ReadSensorData(s)
+		bW, _ := strconv.Atoi(sensorData.WeightBRaw)
+		calA := float64(aW-a0) / float64(calWeight)
+		calB := float64(bW-b0) / float64(calWeight)
+		sendCommand(s, "AT+CAL_A_FACTOR="+fmt.Sprintf("%f", calA))
+		sendCommand(s, "AT+CAL_B_FACTOR="+fmt.Sprintf("%f", calB))
+		sendCommand(s, "AT+READ_CONFIG=?")
+		sendCommand(s, "AT+RESET=1")
+		readSerial(s)
+	} else {
+		log.Fatal("Could not get devEui (that is: ChipID)")
+	}
+}

mini-beieli-provision-cubecell.go

@@ -58,6 +58,51 @@ func readSerial(p *serial.Port) {
 	}
 }
 
+func getAppKey(deveui string) string {
+	if len(deveui) == 16 {
+		appkey := fmt.Sprintf("%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c%c",
+			deveui[10],
+			deveui[3],
+			deveui[4],
+			deveui[7],
+			deveui[15],
+			deveui[9],
+			deveui[11],
+			deveui[2],
+			deveui[0],
+			deveui[8],
+			deveui[1],
+			deveui[6],
+			deveui[5],
+			deveui[12],
+			deveui[14],
+			deveui[13],
+			deveui[3],
+			deveui[6],
+			deveui[12],
+			deveui[7],
+			deveui[15],
+			deveui[1],
+			deveui[9],
+			deveui[11],
+			deveui[2],
+			deveui[10],
+			deveui[0],
+			deveui[8],
+			deveui[5],
+			deveui[14],
+			deveui[4],
+			deveui[13])
+
+		fmt.Printf("calculated AppKey: %s\n", appkey)
+		return appkey
+
+	} else {
+		fmt.Printf("devEui has wrong length: %s\n", deveui)
+		return ""
+	}
+}
+
 func main() {
 	if len(os.Args) != 3 {
 		fmt.Println("usage: " + filepath.Base(os.Args[0]) + " <SerialDevice> <appEui>")
@@ -75,10 +120,12 @@ func main() {
 
 	sendCommand(s, "AT+XXX")
 	devEui := getDevEui(s)
+	appKey := getAppKey(devEui)
 	if devEui != "" {
 		sendCommand(s, "AT+DevEui="+devEui)
 		sendCommand(s, "AT+AppEui="+appEui)
-		sendCommand(s, "AT+AppKey="+devEui+devEui)
+		sendCommand(s, "AT+AppKey="+appKey)
+		sendCommand(s, "AT+SAVE_OTAA_CONFIG=1")
 		sendCommand(s, "AT+RESET=1")
 		readSerial(s)
 	} else {