Comment-out OTA because broken..

This commit is contained in:
Patrick Balsiger
2019-03-22 09:30:00 +01:00
parent 06c836067e
commit 7083aa70f3
9 changed files with 38 additions and 22 deletions

BIN
.vscode/ipch/c0d54e76fe84c497/main.ipch vendored Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1,6 +1,6 @@
{ {
"terminal.integrated.env.linux": { "terminal.integrated.env.linux": {
"PATH": "/home/master/.platformio/penv/bin:/home/master/.platformio/penv:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl", "PATH": "/home/master/.platformio/penv/bin:/home/master/.platformio/penv:/home/master/bin:/opt/google-cloud-sdk/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/sbin:/usr/sbin",
"PLATFORMIO_CALLER": "vscode" "PLATFORMIO_CALLER": "vscode"
} }
} }

View File

@@ -1,5 +1,5 @@
;[platformio] [platformio]
;env_default = basic env_default = basic_esp01
[common] [common]
framework = arduino framework = arduino
@@ -11,7 +11,7 @@ lib_deps =
Hash Hash
TaskScheduler TaskScheduler
SPIFFS SPIFFS
ArduinoJson ArduinoJson@5.13.4
https://gitlab.com/wirelos/sprocket-lib.git#develop https://gitlab.com/wirelos/sprocket-lib.git#develop
[env:basic] [env:basic]
@@ -24,6 +24,16 @@ framework = ${common.framework}
lib_deps = ${common.lib_deps} lib_deps = ${common.lib_deps}
ESP8266mDNS ESP8266mDNS
[env:basic_esp01]
platform = ${common.platform}
board = esp01
framework = ${common.framework}
src_filter = +<*> -<examples/> +<examples/basic/>
upload_speed = ${common.upload_speed}
monitor_baud = ${common.monitor_baud}
lib_deps = ${common.lib_deps}
ESP8266mDNS
[env:basic_esp32] [env:basic_esp32]
src_filter = +<*> -<examples/> +<examples/basic/> src_filter = +<*> -<examples/> +<examples/basic/>
platform = ${common.platform} platform = ${common.platform}

View File

@@ -11,11 +11,11 @@
#define STARTUP_DELAY 3000 #define STARTUP_DELAY 3000
// network config // network config
#define SPROCKET_MODE 0 #define SPROCKET_MODE 1
#define AP_SSID "MyAP" #define AP_SSID "Th1ngs4p"
#define AP_PASSWORD "myApPwd" #define AP_PASSWORD "th3r31sn0sp00n"
#define STATION_SSID "Th1ngs4p" #define STATION_SSID "tErAx1d"
#define STATION_PASSWORD "th3r31sn0sp00n" #define STATION_PASSWORD "ramalamadingdong"
#define HOSTNAME "standalone-node" #define HOSTNAME "standalone-node"
#define CONNECT_TIMEOUT 10000 #define CONNECT_TIMEOUT 10000

View File

@@ -2,7 +2,15 @@
#include "WiFiNet.h" #include "WiFiNet.h"
#include "Sprocket.h" #include "Sprocket.h"
WiFiNet wifi( using namespace std;
using namespace std::placeholders;
WiFiNet *wifi;
Sprocket *sprocket;
void setup()
{
wifi = new WiFiNet(
SPROCKET_MODE, SPROCKET_MODE,
STATION_SSID, STATION_SSID,
STATION_PASSWORD, STATION_PASSWORD,
@@ -11,18 +19,16 @@ WiFiNet wifi(
HOSTNAME, HOSTNAME,
CONNECT_TIMEOUT); CONNECT_TIMEOUT);
Sprocket sprocket( sprocket = new Sprocket(
{STARTUP_DELAY, SERIAL_BAUD_RATE}); {STARTUP_DELAY, SERIAL_BAUD_RATE});
wifi->connect();
void setup() sprocket->activate();
{
delay(3000);
wifi.connect();
sprocket.activate();
} }
void loop() void loop()
{ {
sprocket.loop(); sprocket->loop();
yield(); yield();
} }

View File

@@ -1,7 +1,7 @@
#include "config.h" #include "config.h"
#include "WiFiNet.h" #include "WiFiNet.h"
#include "Sprocket.h" #include "Sprocket.h"
#include "OtaTcpPlugin.h" //#include "OtaTcpPlugin.h"
WiFiNet wifi( WiFiNet wifi(
SPROCKET_MODE, SPROCKET_MODE,
@@ -19,7 +19,7 @@ void setup()
{ {
delay(3000); delay(3000);
wifi.connect(); wifi.connect();
sprocket.addPlugin(new OtaTcpPlugin({8266, ""})); //sprocket.addPlugin(new OtaTcpPlugin({8266, ""}));
sprocket.activate(); sprocket.activate();
} }