DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small cleanups

Browse Source
This commit is contained in:
Klaus K Wilting 2020-07-19 16:03:15 +02:00
parent 6b785fedd7
commit 48cdb06c2c
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/mqttclient.h
View File

@ -3,11 +3,12 @@
#include "globals.h" #include "globals.h"
#include "rcommand.h" #include "rcommand.h"
#include <ETH.h>
#include <MQTT.h> #include <MQTT.h>
#include <ETH.h>
#define MQTT_INTOPIC "paxcounter/in" #define MQTT_ETHERNET 0 // set to 0 to run on Wifi
#define MQTT_OUTTOPIC "paxcounter/out" #define MQTT_INTOPIC "paxin"
#define MQTT_OUTTOPIC "paxout"
#define MQTT_PORT 1883 #define MQTT_PORT 1883
#define MQTT_SERVER "broker.shiftr.io" #define MQTT_SERVER "broker.shiftr.io"
//#define MQTT_CLIENTNAME "arduino" //#define MQTT_CLIENTNAME "arduino"

9
platformio.ini
View File

@ -19,7 +19,7 @@
;halfile = ttgov21new.h ;halfile = ttgov21new.h
;halfile = ttgofox.h ;halfile = ttgofox.h
;halfile = ttgobeam.h ;halfile = ttgobeam.h
;halfile = ttgobeam10.h halfile = ttgobeam10.h
;halfile = fipy.h ;halfile = fipy.h
;halfile = lopy.h ;halfile = lopy.h
;halfile = lopy4.h ;halfile = lopy4.h
@ -33,7 +33,7 @@
;halfile = tinypicomatrix.h ;halfile = tinypicomatrix.h
;halfile = m5core.h ;halfile = m5core.h
;halfile = m5fire.h ;halfile = m5fire.h
halfile = olimexpoeiso.h ;halfile = olimexpoeiso.h
[platformio] [platformio]
; upload firmware to board with usb cable ; upload firmware to board with usb cable
@ -61,8 +61,7 @@ display_library = ; set by build.py and taken from hal file
lib_deps_lora = lib_deps_lora =
MCCI LoRaWAN LMIC library@3.2.0 ; MCCI LMIC by Terrill Moore MCCI LoRaWAN LMIC library@3.2.0 ; MCCI LMIC by Terrill Moore
lib_deps_display = lib_deps_display =
;OneBitDisplay@>1.4.0 OneBitDisplay@1.5.0
https://github.com/bitbank2/OneBitDisplay.git
QRCode@0.0.1 QRCode@0.0.1
BitBang_I2C@2.1.1 BitBang_I2C@2.1.1
TFT_eSPI@>=2.2.8 TFT_eSPI@>=2.2.8
@ -73,7 +72,7 @@ lib_deps_rgbled =
lib_deps_gps = lib_deps_gps =
1655@>=1.0.2 ; #1655 TinyGPSPlus by Mikal Hart 1655@>=1.0.2 ; #1655 TinyGPSPlus by Mikal Hart
lib_deps_sensors = lib_deps_sensors =
Adafruit Unified Sensor@>=1.1.3 Adafruit Unified Sensor@>=1.1.4
Adafruit BME280 Library@>=2.0.2 Adafruit BME280 Library@>=2.0.2
Adafruit BMP085 Library@>=1.1.0 Adafruit BMP085 Library@>=1.1.0
BSEC Software Library@1.5.1474 BSEC Software Library@1.5.1474

1
src/lorawan.cpp
View File

@ -582,6 +582,7 @@ const char *getCrName(rps_t rps) {
#if (VERBOSE) #if (VERBOSE)
// decode LORAWAN MAC message // decode LORAWAN MAC message
// see https://github.com/mcci-catena/arduino-lmic/blob/master/doc/LoRaWAN-at-a-glance.pdf
void mac_decode(const uint8_t cmd[], const uint8_t cmdlen, bool is_down) { void mac_decode(const uint8_t cmd[], const uint8_t cmdlen, bool is_down) {
if (!cmdlen) if (!cmdlen)

4
src/mqttclient.cpp
View File

@ -16,8 +16,8 @@ esp_err_t mqtt_init(void) {
// setup network connection // setup network connection
WiFi.onEvent(NetworkEvent); WiFi.onEvent(NetworkEvent);
ETH.begin(); ETH.begin();
// WiFi.mode(WIFI_STA); //WiFi.mode(WIFI_STA);
// WiFi.begin("SSID", "PW"); //WiFi.begin("SSID", "PASSWORD");
// setup mqtt client // setup mqtt client
mqttClient.begin(MQTT_SERVER, MQTT_PORT, netClient); mqttClient.begin(MQTT_SERVER, MQTT_PORT, netClient);