Skip to content

Commit

Permalink
WiFi S6B changes #21 - remove SSID writes and add S6B restart
Browse files Browse the repository at this point in the history
  • Loading branch information
neilh20.gitk authored and neilh20.gitk committed Oct 7, 2021
1 parent 80186cc commit e86fda1
Show file tree
Hide file tree
Showing 10 changed files with 372 additions and 75 deletions.
1 change: 0 additions & 1 deletion a/tu_xx01/lib/SDI-12nh
Submodule SDI-12nh deleted from 1234e7
1 change: 1 addition & 0 deletions a/tu_xx01/lib/TinyGSMnh
Submodule TinyGSMnh added at b2696a
29 changes: 15 additions & 14 deletions a/tu_xx01/platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@ default_envs = mayfly
; Ignore these folders or PlatformIO will double count all the dependencies
; Development: ModularSensors Release1: src ?
; ?? .pioenvs, .piolibdeps, .vscode, include, doc, examples, sensor_tests, compile_tests, pioScripts
lib_ignore = .git, doc, examples, arduino_update, sensor_tests, ModularSensors
lib_ignore = .git, doc, examples, arduino_update, sensor_tests,
ModularSensors
EnviroDIY_DS3231
Arduino-SDI-12
TinyGSM ;see below
;Arduino-SDI-12

lib_cmn_deps =
; These are latest beyond EnviroDIY releases
Expand Down Expand Up @@ -60,9 +61,9 @@ lib_cmn_deps =
;https://github.com/PaulStoffregen/OneWire
;https://github.com/knolleary/pubsubclient.git
;bug https://github.com/EnviroDIY/TinyGSM.git ; bug EnviroDIY/ModularSensors/issues 311
https://github.com/neilh10/TinyGSM.git ;Bug fixes over Envirodiy
;https://github.com/neilh10/TinyGSM.git ;Bug fixes over Envirodiy
;https://github.com/EnviroDIY/YosemitechModbus
;https://github.com/neilh10/Arduino-SDI-12#release1
https://github.com/neilh10/Arduino-SDI-12#release1
;https://github.com/EnviroDIY/Arduino-SDI-12.git bug with extraWakeTime=10
;https://github.com/EnviroDIY/Tally_Library.git#Dev_I2C
;
Expand All @@ -87,37 +88,38 @@ cmn_build_flags =
-DMQTT_MAX_PACKET_SIZE=240
-DTINY_GSM_YIELD_MS=2
;-DTINY_GSM_RX_BUFFER=64 ;is this needed?
-DNO_FIRST_SYNC_WITH_NIST
;-DNO_FIRST_SYNC_WITH_NIST
-DNIST_SYNC_HOURLY
;-DMS_TU_XX_DEBUG
;-DMS_TU_XX_DEBUG_DEEP
;-DSTREAMDEBUGGER_DBG
-DSTREAMDEBUGGER_DBG
;-DMS_DUMP_FREE_RAM
;-DMS_TTY_USER_INPUT
-DSerialCommand_inFlash ;requires MS_TTY_USER_INPUT
;-DMS_TTY_INPUT_COUNT ;only if no MS_TTY_USER_INPUT
;-DSERIALCOMMAND_DEBUG
;-DMS_LOGGERBASE_POSTS
;-DMS_LOGGERBASE_SLEEP_DEBUG ;Need or below
;-DMS_LOGGERBASE_DEBUG
-DMS_LOGGERBASE_DEBUG
;-DMS_LOGGERBASE_DEEP_DEBUG
;-DMS_LOGGERMODEM_DEBUG
;-DMS_LOGGERMODEM_DEBUG_DEEP
-DMS_LOGGERMODEM_DEBUG_DEEP
;-DMS_SENSORBASE_DEBUG
;-DMS_VARIABLEARRAY_DEBUG
;-DMS_VARIABLEARRAY_DEBUG_DEEP
;-DMS_VARIABLEBASE_DEBUG
;-DMS_VARIABLEBASE_DEBUG_DEEP
;-DMS_DATAPUBLISHERBASE_DEBUG
;-DMS_ENVIRODIYPUBLISHER_DEBUG
-DMS_ENVIRODIYPUBLISHER_DEBUG
;-DMS_THINGSPEAKPUBLISHER_DEBUG
;-DMS_UBIDOTSPUBLISHER_DEBUG
;-DMS_DIGIXBEEWIFI_DEBUG
-DDIGIXBEEWIFI_NO_IP_SAV
-DMS_DIGIXBEEWIFI_DEBUG
;-DMS_DIGIXBEEWIFI_DEBUG_DEEP
;-DMS_DIGIXBEECELLULARTRANSPARENT_DEBUG
;-DMS_DIGIXBEECELLULARTRANSPARENT_DEBUG_DEEP
;-DMS_DIGIXBEE_DEBUG
;-DTINY_GSM_DEBUG=Serial
-DTINY_GSM_DEBUG=Serial
;-DTinyGsmClientXbee_DBG=Serial
;-DMS_STSTC3100SENSOR_DEBUG
;-DSTC3100DM_DEBUG ; device manager
Expand All @@ -134,13 +136,12 @@ cmn_build_flags =
;-DMS_MODBUS_DEBUG
;-DMS_ANALOGELECCONDUCTIVITY_DEBUG
;-DMS_ANALOGELECCONDUCTIVITY_DEBUG_DEEP
-DMS_SDI12SENSORS_DEBUG ;LT500 sometimes responding
-DMS_SDI12SENSORS_DEBUG_DEEP
;-DMS_SDI12SENSORS_DEBUG ;LT500 sometimes responding
;-DMS_SDI12SENSORS_DEBUG_DEEP
;For -DMS_SDI12 options: NONE or MS_SDI12_SINGLE_LINE_RESPONSE OR MS_SDI12_NON_CONCURRENT not BOTH
;-DMS_SDI12_SINGLE_LINE_RESPONSE
;-DMS_SDI12_NON_CONCURRENT
;-DENVIRODIY_SDI12_USE_CRC
-DMS_SDI12_USE_CRC
;-DMS_ENVIRODIYPUBLISHER_DEBUG
;-DMS_ENVIRODIYPUBLISHER_DEBUG_DEEP
-DSodaq_DS3231_DEBUG
Expand Down
19 changes: 9 additions & 10 deletions a/tu_xx01/src/ms_cfg.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
/*****************************************************************************
ms_cfg.h_LT5_wifi - ModularSensors Configuration - tgt _LT5 Acculevel / WiFi
Status 210326: 0.28.3 updated cc, not tested
ms_cfg.h_LT5_lte - ModularSensors Configuration - tgt _LT5 /WiFi
Written By: Neil Hancock www.envirodiy.org/members/neilh20/
Development Environment: PlatformIO
Hardware Platform(s): EnviroDIY Mayfly Arduino Datalogger+RS485 Wingboard
Expand Down Expand Up @@ -31,8 +30,8 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
// MAYFLY_BAT_DIGI Digi Modem LTE with onboard battery measurement
// Choices applied to define MAYFLY_BAT_xx 1) Stc3100 2) ExternVolage_ACT 3) Digi Mode 4) MAYFLY_BAT_A6

//#define MAYFLY_BAT_A6 4
#define MAYFLY_BAT_AA0 2
#define MAYFLY_BAT_A6 4
//#define MAYFLY_BAT_AA0 2
//FUT #define MAYFLY_BAT_DIGI 3


Expand All @@ -46,9 +45,9 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
//#define USE_STC3100_DD 1
#define MAYFLY_BAT_STC3100 1
// Only one of NOT both KellerAcculevel and KellerNanolevel as share same ADDR
#define KellerAcculevel_ACT 1
//#define KellerAcculevel_ACT 1
// KellerAcculevel units can be 1 (meter) 2 (feet)
#define KellerAcculevel_DepthUnits 2
//#define KellerAcculevel_DepthUnits 2

//#define KellerNanolevel_ACT 1
#endif //WINGBOARD_KNH002
Expand All @@ -62,7 +61,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
//#define ASONG_AM23XX_UUID 1

//Two heavy sensors with power useage
#define BM_PWR_SENSOR_CONFIG_BUILD_SPECIFIC BM_PWR_MEDIUM_REQ
#define BM_PWR_SENSOR_CONFIG_BUILD_SPECIFIC BM_PWR_LOW_REQ

// Mayfly configuration
// Carrier board for Digi XBEE LTE CAT-M1 and jumper from battery
Expand All @@ -72,7 +71,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
#define MFName_DEF "Mayfly"
#define HwVersion_DEF MFVersion_DEF
#define HwName_DEF MFName_DEF
#define CONFIGURATION_DESCRIPTION_STR "tu_LT5KA_wifi LT500,Acculevel"
#define CONFIGURATION_DESCRIPTION_STR "tu_LT5_wifi LT500"

#define USE_MS_SD_INI 1
#define USE_PS_EEPROM 1
Expand Down Expand Up @@ -147,7 +146,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.
#define WIFIID_CDEF "xxx"
// NULL for none, or password for connecting to WiFi,
#define WIFIPWD_CDEF "yyy"
#define MMW_TIMER_POST_TIMEOUT_MS_DEF 7000L
#define MMW_TIMER_POST_TIMEOUT_MS_DEF 9000L
//POST PACING ms 0-15000
#define MMW_TIMER_POST_PACING_MS_DEF 100L
//Post MAX Num - is num of MAX num at one go. 0 no limit
Expand Down Expand Up @@ -251,7 +250,7 @@ THIS CODE IS PROVIDED "AS IS" - NO WARRANTY IS GIVEN.

#if defined UseModem_Module
// This seems to be de-stabilizing Digi S6B
//#define DIGI_RSSI_UUID "DIGI_RSSI_UUID"
#define DIGI_RSSI_UUID "DIGI_RSSI_UUID"
//#define Modem_SignalPercent_UUID "SignalPercent_UUID"
#endif // UseModem_Module

Expand Down
Loading

0 comments on commit e86fda1

Please sign in to comment.