Compare commits

..

No commits in common. "384d262905fe75bb66d6fbbf7684af141801ac76" and "9ad28bda512e4ad4e693fc72abf490ca3a5ba381" have entirely different histories.

6 changed files with 28 additions and 55 deletions

2
.gitignore vendored
View File

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

View File

@ -12,7 +12,7 @@ BME280 bme280;
/******************************************************************************/ /******************************************************************************/
/* Firmware Version */ /* Firmware Version */
/******************************************************************************/ /******************************************************************************/
static const int32_t fwVersion = 20220930; static const int32_t fwVersion = 20210428;
/******************************************************************************/ /******************************************************************************/
/* LoraWAN Settings */ /* LoraWAN Settings */

View File

@ -22,9 +22,9 @@ Das sind die verwendeten Libraries [1]:
| URL | Branch | Commit | Commit Date | | URL | Branch | Commit | Commit Date |
| --- | ------ | ----- | ----------- | | --- | ------ | ----- | ----------- |
| https://github.com/HelTecAutomation/ASR650x-Arduino.git | 538fac1 | Wed, 28 Sep 2022 16:13:13 +0800 | | https://github.com/HelTecAutomation/CubeCell-Arduino.git | 58ed094 | Mon, 26 Apr 2021 09:48:49 +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_Qwiic_Scale_NAU7802_Arduino_Library.git | master | 688f255 | Fri, 3 Jan 2020 12:35:22 -0700 |
| https://github.com/sparkfun/SparkFun_BME280_Arduino_Library.git | 56e7ff4 | Mon, 9 May 2022 08:15:59 -0600 | | https://github.com/sparkfun/SparkFun_BME280_Arduino_Library.git | master | 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) |" [1]: echo "| $(git remote -v |grep fetch |awk '{print $2}' |tr '\n' ' ') | $(git log --pretty=format:'%h | %cD ' -n 1) |"
@ -34,49 +34,38 @@ Das sind die verwendeten Libraries [1]:
Installation: Installation:
` `
$ brew install arduino-cli $ curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=~/bin sh
$ arduino-cli version $ arduino-cli version
arduino-cli Version: 0.20.2 Commit: 13783819 Date: 2021-12-07T16:41:50Z arduino-cli alpha Version: 0.18.1 Commit: b3cf8e19 Date: 2021-04-13T13:08:30Z
$ arduino-cli sketch new MiniBeieliNodeSketch $ arduino-cli sketch new MiniBeieliNodeSketch
Install Board aus Git $ arduino-cli core update-index
mkdir -p ~/Documents/Arduino/hardware/CubeCell $ arduino-cli board listall
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...): $ arduino-cli core install CubeCell:CubeCell
$ arduino-cli core list
$ 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: Compile:
$ arduino-cli compile --export-binaries --clean --fqbn ${FQBN} MiniBeieliNodeSketch $ arduino-cli compile --fqbn CubeCell:CubeCell:CubeCell-Board \
--build-property "build.band=REGION_EU868" \
--build-property "build.LORAWAN_CLASS=CLASS_A" \
--build-property "build.LORAWAN_CLASS=CLASS_A" \
--build-property "build.LORAWAN_DEVEUI_AUTO=0" \
--build-property "build.LORAWAN_NETMODE=true" \
--build-property "build.LORAWAN_ADR=true" \
--build-property "build.LORAWAN_UPLINKMODE=false" \
--build-property "build.LORAWAN_Net_Reserve=false" \
--build-property "build.LORAWAN_AT_SUPPORT=1" \
--build-property "build.RGB=0" \
--build-property "build.LORAWAN_DebugLevel=0" \
MiniBeieliNodeSketch
Output ist in /tmp/arduino-sketch-XXXXXXXXXXXXXXXXXXXXXXXXX und kann kopiert werden:
$ mkdir ~/arduino-builds-saved/20210423/
$ cp /tmp/arduino-sketch-0870BAA82DFEB3C4E076C8FBBDEB25B4/CubeCell_Board_REGION_EU868_RGB_0.cyacd ~/arduino-builds-saved/20210423/
Upload: Upload:
$ arduino-cli upload --verbose --fqbn ${FQBN} -p /dev/tty.usbserial-0001 MiniBeieliNodeSketch /home/joerg/Arduino/hardware/CubeCell/CubeCell/tools/CubeCellflash/CubeCellflash -serial /dev/ttyUSB0 /home/joerg/arduino-builds-saved/latest/CubeCell_Board_REGION_EU868_RGB_0.cyacd
*.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/20220930/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
` `

View File

@ -122,7 +122,6 @@ func main() {
if devEui != "" { if devEui != "" {
fmt.Println("Hit Return when no weight is on scale (neither on A not on B)") fmt.Println("Hit Return when no weight is on scale (neither on A not on B)")
reader.ReadString('\n') reader.ReadString('\n')
sendCommand(s, "AT+XXX")
sensorData := ReadSensorData(s) sensorData := ReadSensorData(s)
fmt.Printf("%v\n", sensorData) fmt.Printf("%v\n", sensorData)
a0, _ := strconv.Atoi(sensorData.WeightARaw) a0, _ := strconv.Atoi(sensorData.WeightARaw)
@ -131,12 +130,10 @@ func main() {
sendCommand(s, "AT+CAL_B_0="+sensorData.WeightBRaw) sendCommand(s, "AT+CAL_B_0="+sensorData.WeightBRaw)
fmt.Println("Put Weight on Scale A, then hit Return") fmt.Println("Put Weight on Scale A, then hit Return")
reader.ReadString('\n') reader.ReadString('\n')
sendCommand(s, "AT+XXX")
sensorData = ReadSensorData(s) sensorData = ReadSensorData(s)
aW, _ := strconv.Atoi(sensorData.WeightARaw) aW, _ := strconv.Atoi(sensorData.WeightARaw)
fmt.Println("Put Weight on Scale B, then hit Return") fmt.Println("Put Weight on Scale B, then hit Return")
reader.ReadString('\n') reader.ReadString('\n')
sendCommand(s, "AT+XXX")
sensorData = ReadSensorData(s) sensorData = ReadSensorData(s)
bW, _ := strconv.Atoi(sensorData.WeightBRaw) bW, _ := strconv.Atoi(sensorData.WeightBRaw)
calA := float64(aW-a0) / float64(calWeight) calA := float64(aW-a0) / float64(calWeight)

7
go.mod
View File

@ -1,7 +0,0 @@
module gitlab.com/mini-beieli-node-cubecell/v2
go 1.17
require github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07
require golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect

4
go.sum
View File

@ -1,4 +0,0 @@
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07 h1:UyzmZLoiDWMRywV4DUYb9Fbt8uiOSooupjTq10vpvnU=
github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM=
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=