Merge branch 'master' of https://github.com/Extentsoftware/FarmSensors

Author: Marcus Poulton

src/hubs/CubeCell/CubeCellReceiver/platformio.ini

@@ -20,8 +20,8 @@ board_build.arduino.lorawan.adr = OFF
 board_build.arduino.lorawan.debug_level = FREQ_AND_DIO
 framework = arduino
 monitor_speed = 115200
-monitor_port = COM8
-upload_port = COM8
+monitor_port = COM6
+upload_port = COM6
 upload_speed = 921600
 build_flags = 
 	${common_env_data.build_flags}

src/hubs/CubeCell/CubeCellReceiver/src/main.cpp

@@ -39,6 +39,26 @@ bool isDebug()
     return debug;
 }
 
+void setupWire()
+{
+    bool ok=false;
+
+    for (int i=0; i<3;i++)
+    {
+        Serial.printf("Start I2\n");
+        if (Wire.begin())
+        {
+            Serial.printf("I2C started, clock %d\n", Wire.getClock());
+            break;
+        }
+        else
+        {
+            Wire.end();
+            Serial.printf("I2C failed to start\n");
+        }
+    }
+}
+
 void flash(uint32_t color,uint32_t time)
 {
     pinMode(USER_KEY, INPUT);
@@ -67,8 +87,7 @@ void setup() {
                                 LORA_CRC, LORA_FREQ_HOP, LORA_HOP_PERIOD, LORA_IQ_INVERSION_ON, true );
 
     Radio.Rx( 0 );
-    if (Wire.begin())
-        Serial.printf("I2C started, clock %d\n", Wire.getClock());
+    setupWire();
 }
 
 void loop() 
@@ -92,6 +111,8 @@ void OnRxDone( unsigned char* payload, unsigned short size, short rssi, signed c
     Wire.beginTransmission(CHANNEL);          // transmit to device #9
     Wire.write(rxpacket, size);
     uint8_t err = Wire.endTransmission();    // stop transmitting
-    Serial.printf("I2C ERROR %d %s\n", err);
+    Serial.printf("I2C ERROR %d %s\n", err, Wire.getErrorText(err));
+    if (err!=0)
+        setupWire();
 }
 

src/hubs/TTGO-BEAM/platformio.ini

@@ -21,8 +21,8 @@ platform = espressif32
 board = ttgo-t-beam
 framework = arduino
 monitor_speed = 115200
-monitor_port = COM3
-upload_port = COM3
+monitor_port = COM7
+upload_port = COM7
 upload_speed = 921600
 build_flags = 
     ${common_env_data.build_flags}

src/hubs/TTGO-BEAM/src/main.cpp

@@ -30,8 +30,8 @@ MessageBuffer messageBuffer(128);
 
 #define MQTT_HOST         DEFAULT_BROKER
 #define MQTT_PORT         1883
-#define WIFI_SSID         "Poulton"
-#define WIFI_PASSWORD     "12345678"
+#define WIFI_SSID         "poulton"
+#define WIFI_PASSWORD     "9scvfpkKcygt"
 
 AsyncMqttClient mqttClient;
 TimerHandle_t mqttReconnectTimer;

src/hubs/hubHeltecWS/platformio.ini

@@ -1,3 +1,13 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
 [platformio]
 default_envs = heltec_wifi_kit_32_V3
 
@@ -6,28 +16,26 @@ build_flags =
 	-I ../common
 	-D VERSION=1.0
 	-D MQTT_MAX_PACKET_SIZE=512
-    -D ENV_WIFI_SSID="\"${sysenv.ENV_WIFI_SSID}\""
-    -D ENV_WIFI_PASSWORD="\"${sysenv.ENV_WIFI_PASSWORD}\""
-
+	-D ENV_WIFI_SSID="\"${sysenv.ENV_WIFI_SSID}\""
+	-D ENV_WIFI_PASSWORD="\"${sysenv.ENV_WIFI_PASSWORD}\""
 lib_deps = 
 	densaugeo/base64@^1.2.1
-	PubSubClient
+#	PubSubClient
 	ArduinoJson
-	AsyncMqttClient
 	Wire
-
+	
 [env:heltec_wifi_kit_32_V3]
 platform = espressif32
 board = heltec_wifi_kit_32_V3
-board_packages=heltec_wifi_kit_32_V3@https://resource.heltec.cn/download/package_heltec_esp32_index.json
 framework = arduino
 monitor_speed = 115200
-monitor_port = COM6
-upload_port = COM6
+monitor_port = COM9
+upload_port = COM9
 upload_speed = 921600
 build_flags = 
 	${common_env_data.build_flags}
 	-D WIFI_Kit_32
 lib_deps = 
 	${common_env_data.lib_deps}
-	heltecautomation/Heltec ESP32 Dev-Boards
+	256dpi/MQTT@^2.5.2
+	thingpulse/ESP8266 and ESP32 OLED driver for SSD1306 displays@^4.6.1