Skip to content

Commit

Permalink
Update ESPAsyncTCP to 75c2513c57
Browse files Browse the repository at this point in the history
- include me-no-dev/ESPAsyncTCP#115
reworked error handling
multiple SyncClient fixes
handle low-mem lwip builds by using correct TCP_MSS value for internal buffers
- revert eb504e5 and 51703f6
- use unique_ptr for idb_client
- check if idb support builds with 2.3.0 and current git
  • Loading branch information
mcspr committed Sep 21, 2019
1 parent deb4657 commit de8c8e7
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 51 deletions.
22 changes: 14 additions & 8 deletions code/espurna/config/hardware.h
Original file line number Diff line number Diff line change
Expand Up @@ -3936,13 +3936,13 @@
#define MICS2710_SUPPORT 1
#define MICS5525_SUPPORT 1

// MAX6675 14 11 10
#ifndef MAX6675_SUPPORT
#define MAX6675_SUPPORT 1
#endif
#define MAX6675_CS_PIN 14
#define MAX6675_SO_PIN 11
#define MAX6675_SCK_PIN 10
// MAX6675 14 11 10
#define MAX6675_SUPPORT 1
#define MAX6675_CS_PIN 14
#define MAX6675_SO_PIN 11
#define MAX6675_SCK_PIN 10

#define INFLUXDB_SUPPORT 1

#elif defined(TRAVIS02)

Expand Down Expand Up @@ -4054,10 +4054,16 @@
#define PULSEMETER_SUPPORT 1

// Test non-default modules
#define MDNS_CLIENT_SUPPORT 1
#define NOFUSS_SUPPORT 1
#define UART_MQTT_SUPPORT 1
#define INFLUXDB_SUPPORT 1
#define IR_SUPPORT 1
#define RF_SUPPORT 1
#define OTA_MQTT_SUPPORT 1
#define LLMNR_SUPPORT 1
#define NETBIOS_SUPPORT 1
#define SSDP_SUPPORT 1
#define RF_SUPPORT 1

#else

Expand Down
9 changes: 4 additions & 5 deletions code/espurna/influxdb.ino
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,11 @@ Copyright (C) 2017-2019 by Xose Pérez <xose dot perez at gmail dot com>

#if INFLUXDB_SUPPORT

#include "ESPAsyncTCP.h"

#include "libs/SyncClientWrap.h"
#include <ESPAsyncTCP.h>
#include <SyncClient.h>

bool _idb_enabled = false;
SyncClientWrap * _idb_client;
std::unique_ptr<SyncClient> _idb_client = nullptr;

// -----------------------------------------------------------------------------

Expand Down Expand Up @@ -116,7 +115,7 @@ bool idbEnabled() {

void idbSetup() {

_idb_client = new SyncClientWrap();
_idb_client = std::make_unique<SyncClient>();

_idbConfigure();

Expand Down
37 changes: 0 additions & 37 deletions code/espurna/libs/SyncClientWrap.h

This file was deleted.

2 changes: 1 addition & 1 deletion code/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ lib_deps =
https://github.com/xoseperez/eeprom_rotate#0.9.2
Embedis
https://github.com/plerup/espsoftwareserial#3.4.1
https://github.com/me-no-dev/ESPAsyncTCP#7e9ed22
https://github.com/me-no-dev/ESPAsyncTCP#75c2513c
https://github.com/me-no-dev/ESPAsyncWebServer#b0c6144
https://bitbucket.org/xoseperez/fauxmoesp.git#3.1.0
https://github.com/xoseperez/hlw8012.git#1.1.0
Expand Down

0 comments on commit de8c8e7

Please sign in to comment.