Michel2/ESPEasy
1
0
Fork 0
mirror of https://github.com/letscontrolit/ESPEasy.git synced 2026-07-27 19:57:38 +00:00
Code Issues Releases Activity

Merge branch 'mega' into bugfix/WiFi_state_machine

Browse Source
This commit is contained in:
TD-er
2025-04-19 22:52:02 +02:00
parent 02e2f92e29 c41865ac57
commit 7c9cd48a44
8 changed files with 95 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ESPEasySerial/Port_ESPEasySerial_USBCDC.cpp
+2 -1
View File
@@ -163,7 +163,8 @@ int Port_ESPEasySerial_USBCDC_t::available(void)
int Port_ESPEasySerial_USBCDC_t::availableForWrite(void)
{
if (_serial != nullptr) {
return _serial->availableForWrite();
const int res = _serial->availableForWrite();
return res > 64 ? 64 : res;
}
return 0;
}
lib/ESPEasySerial/Port_ESPEasySerial_USB_HWCDC.cpp
+2 -1
View File
@@ -112,7 +112,8 @@ int Port_ESPEasySerial_USB_HWCDC_t::available(void)
int Port_ESPEasySerial_USB_HWCDC_t::availableForWrite(void)
{
if (_hwcdc_serial != nullptr) {
return _hwcdc_serial->availableForWrite();
const int res = _hwcdc_serial->availableForWrite();
return res > 64 ? 64 : res;
}
return 0;
}
lib/ImprovWiFi/src/ImprovWiFiLibrary.cpp
+13
View File
@@ -233,7 +233,20 @@ bool ImprovWiFi::tryConnectToWifi(const char *ssid, const char *password)
void ImprovWiFi::getAvailableWifiNetworks()
{
#ifdef ESP32
const uint32_t start = millis();
int networkNum = WiFi.scanNetworks();
if (networkNum < 0) {
int32_t timePassed{};
do {
timePassed = (int32_t) (millis() - start);
networkNum = WiFi.scanComplete();
}
while (networkNum < 0 && timePassed < 60000);
}
#else
const int networkNum = WiFi.scanNetworks();
#endif
for (int id = 0; id < networkNum; ++id)
{
platformio_core_defs.ini
+2 -5
View File
@@ -197,11 +197,8 @@ lib_extra_dirs =
; ESP_IDF 5.3.1
[core_esp32_IDF5_3_2__3_1_0_LittleFS]
;platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54
;platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3443/framework-arduinoespressif32-all-release_v5.4-eb786b90.zip
platform = https://github.com/Jason2866/platform-espressif32.git
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3506/framework-arduinoespressif32-all-release_v5.3-2952ac93.zip
platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF54
platform_packages = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/3523/framework-arduinoespressif32-all-release_v5.4-2abf0b9a.zip
build_flags = -DESP32_STAGE
-DESP_IDF_VERSION_MAJOR=5
-DLIBRARIES_NO_LOG=1
src/_P004_Dallas.ino
+2 -2
View File
@@ -158,6 +158,7 @@ boolean Plugin_004(uint8_t function, struct EventStruct *event, String& string)
resultsOptions, resultsOptionValues);
selector.addFormSelector(F("Error State Value"), F("err"), P004_ERROR_STATE_OUTPUT);
}
#ifndef LIMIT_BUILD_SIZE
addFormNote(F("External pull up resistor is needed, see docs!"));
{
@@ -166,7 +167,6 @@ boolean Plugin_004(uint8_t function, struct EventStruct *event, String& string)
if (nullptr != P004_data) {
addFormSubHeader(F("Statistics"));
addRowLabel(F("Data pin Rise Time"));
const int riseTime = P004_data->measure_rise_time();
if (riseTime == 0) {
@@ -183,13 +183,13 @@ boolean Plugin_004(uint8_t function, struct EventStruct *event, String& string)
addEnabled(false);
addHtml(F("&nbsp;Too Slow! Reduce pull-up resistance"));
}
for (uint8_t i = 0; i < valueCount; ++i) {
addFormSeparator(2);
Dallas_show_sensor_stats_webform_load(P004_data->get_sensor_data(i));
}
}
}
#endif
}
success = true;
break;
src/src/ESPEasyCore/ESPEasy_Console_Port.cpp
+2 -3
View File
@@ -120,9 +120,8 @@ void EspEasy_Console_Port::addNewlineToSerialBuffer()
bool EspEasy_Console_Port::process_serialWriteBuffer()
{
if (_serial != nullptr) {
int snip = _serial->availableForWrite();
if (snip > 64) { snip = 64; }
const int snip = _serial->availableForWrite();
if (snip > 0) {
return _serialWriteBuffer.write(*_serial, snip) != 0;
}
src/src/Helpers/Dallas1WireHelper.cpp
+60 -41
View File
@@ -50,12 +50,13 @@ void DALLAS_IRAM_ATTR Dallas_pinModeInput(uint32_t gpio_pin_rx, uint32_t gpio_pi
{
if (gpio_pin_rx == gpio_pin_tx) {
// let pin float, pull up will raise level
#ifdef ESP8266
# ifdef ESP8266
// We're running out of IRAM on ESP8266
DIRECT_PINMODE_INPUT(gpio_pin_rx);
#else
# else // ifdef ESP8266
DIRECT_PINMODE_INPUT_ISR(gpio_pin_rx);
#endif
# endif // ifdef ESP8266
} else {
DIRECT_pinWrite_ISR(gpio_pin_tx, 1);
}
@@ -66,12 +67,13 @@ void DALLAS_IRAM_ATTR Dallas_pinWrite(uint32_t gpio_pin_rx, uint32_t gpio_pin_tx
DIRECT_pinWrite_ISR(gpio_pin_tx, pinstate);
if (gpio_pin_rx == gpio_pin_tx) {
#ifdef ESP8266
# ifdef ESP8266
// We're running out of IRAM on ESP8266
DIRECT_PINMODE_OUTPUT(gpio_pin_rx);
#else
# else // ifdef ESP8266
DIRECT_PINMODE_OUTPUT_ISR(gpio_pin_rx);
#endif
# endif // ifdef ESP8266
}
}
@@ -82,12 +84,13 @@ int32_t DALLAS_IRAM_ATTR Dallas_measureWaitForPinState(uint32_t gpio_pin_rx, uin
do {
passed = usecPassedSince_fast(start_usec);
} while (passed < timeout_usec &&
(!DIRECT_pinRead_ISR(gpio_pin_rx) == newState)); // Using '!' to do a quick cast to bool
(!DIRECT_pinRead_ISR(gpio_pin_rx) == newState)); // Using '!' to do a quick cast to bool
if (passed > timeout_usec ||
!DIRECT_pinRead_ISR(gpio_pin_rx) == newState) {
if ((passed > timeout_usec) ||
(!DIRECT_pinRead_ISR(gpio_pin_rx) == newState)) {
return -1;
}
// N.B. we allow the situation where passed == timeout_usec
// and pin might have reached the state we're waiting for.
// This way we don't need to average for time before reading pin state and after.
@@ -249,7 +252,7 @@ void Dallas_addr_selector_webform_load(taskIndex_t TaskIndex, int8_t gpio_pin_rx
scan_res.push_back(Dallas_addr_to_uint64(tmpAddress));
bool hasFixedResolution = false;
Dallas_getResolution(tmpAddress, gpio_pin_rx, gpio_pin_tx, hasFixedResolution);
fixed_res.push_back(hasFixedResolution);
fixed_res.push_back(hasFixedResolution);
}
for (uint8_t var_index = 0; var_index < nrVariables; ++var_index) {
@@ -271,15 +274,17 @@ void Dallas_addr_selector_webform_load(taskIndex_t TaskIndex, int8_t gpio_pin_rx
uint8_t tmpAddress[8]{};
Dallas_uint64_to_addr(scan_res[index], tmpAddress);
String option;
# ifndef LIMIT_BUILD_SIZE
bool parasitePowered = false;
Dallas_is_parasite(tmpAddress, gpio_pin_rx, gpio_pin_tx, parasitePowered);
String option;
if (parasitePowered) {
option += F("[P] ");
}
# endif // ifndef LIMIT_BUILD_SIZE
option += Dallas_format_address(tmpAddress, fixed_res[index]);
auto it = addr_task_map.find(scan_res[index]);
auto it = addr_task_map.find(scan_res[index]);
if (it != addr_task_map.end()) {
option += it->second;
@@ -292,6 +297,7 @@ void Dallas_addr_selector_webform_load(taskIndex_t TaskIndex, int8_t gpio_pin_rx
}
}
# ifndef LIMIT_BUILD_SIZE
void Dallas_show_sensor_stats_webform_load(const Dallas_SensorData& sensor_data)
{
if (sensor_data.addr == 0) {
@@ -316,25 +322,27 @@ void Dallas_show_sensor_stats_webform_load(const Dallas_SensorData& sensor_data)
addHtml(F("&nbsp;Unsupported!"));
}
addRowLabel(F("Samples Read Success"));
addRowLabel(F("Read Success"));
addHtmlInt(sensor_data.read_success);
addRowLabel(F("Samples Sensor No Reply"));
addRowLabel(F("Sensor No Reply"));
addHtmlInt(sensor_data.start_read_failed);
addRowLabel(F("Samples Sensor Power Lost"));
addRowLabel(F("Sensor Power Lost"));
addHtmlInt(sensor_data.sensor_power_on_reset);
addRowLabel(F("Samples Read CRC error"));
addRowLabel(F("Read CRC error"));
addHtmlInt(sensor_data.read_CRC);
addRowLabel(F("Samples Read Retry"));
addRowLabel(F("Read Retry"));
addHtmlInt(sensor_data.read_retry);
addRowLabel(F("Samples Read Failed"));
addRowLabel(F("Read Failed"));
addHtmlInt(sensor_data.read_failed);
}
# endif // ifndef LIMIT_BUILD_SIZE
void Dallas_addr_selector_webform_save(taskIndex_t TaskIndex, int8_t gpio_pin_rx, int8_t gpio_pin_tx, uint8_t nrVariables)
{
if ((gpio_pin_rx == -1) ||
@@ -422,6 +430,7 @@ uint8_t Dallas_scan(uint8_t getDeviceROM, uint8_t *ROM, int8_t gpio_pin_rx, int8
}
// read power supply
# ifndef LIMIT_BUILD_SIZE
bool Dallas_is_parasite(const uint8_t ROM[8], int8_t gpio_pin_rx, int8_t gpio_pin_tx, bool& isParasitePowered)
{
if (!Dallas_address_ROM(ROM, gpio_pin_rx, gpio_pin_tx)) {
@@ -432,6 +441,8 @@ bool Dallas_is_parasite(const uint8_t ROM[8], int8_t gpio_pin_rx, int8_t gpio_pi
return isParasitePowered;
}
# endif // ifndef LIMIT_BUILD_SIZE
/*
void Dallas_startConversion(const uint8_t ROM[8], int8_t gpio_pin_rx, int8_t gpio_pin_tx)
{
@@ -482,6 +493,7 @@ Dallas_read_result Dallas_readTemp(const uint8_t ROM[8], float *value, int8_t gp
log += F(",ERR");
}
# ifndef LIMIT_BUILD_SIZE
bool isParasitePowered = false;
// Dallas_is_parasite(ROM, gpio_pin_rx, gpio_pin_tx, isParasitePowered);
@@ -489,6 +501,7 @@ Dallas_read_result Dallas_readTemp(const uint8_t ROM[8], float *value, int8_t gp
if (isParasitePowered) {
log += F(",P");
}
# endif // ifndef LIMIT_BUILD_SIZE
log += ',';
log += ll2String(usec_release, DEC);
log += ',';
@@ -1133,9 +1146,10 @@ uint8_t DALLAS_IRAM_ATTR Dallas_read_bit_ISR(
Dallas_pinLow;
start = micros();
//delayMicroseconds(1);
// delayMicroseconds(1);
// Make sure there is at least 5 usec 'low' level.
// Minimum state by Infineon, however other brands, like Analog,
// Minimum state by Infineon, however other brands, like Analog,
// claim lower minimum.
while (usecPassedSince_fast(start) < 4) {}
@@ -1278,29 +1292,27 @@ uint16_t Dallas_crc16(const uint8_t *input, uint16_t len, uint16_t crc)
return crc;
}
Dallas_SensorData::Dallas_SensorData() :
addr(0), value(0.0f),
start_read_failed(0), start_read_retry(0), read_success(0),
read_retry(0), read_failed(0), reinit_count(0), actual_res(0),
measurementActive(false), valueRead(false),
parasitePowered(false), lastReadError(false)
{}
void Dallas_SensorData::clear() {
addr = 0u;
value = 0.0f;
start_read_failed = 0u;
start_read_retry = 0u;
read_success = 0u;
read_retry = 0u;
read_failed = 0u;
actual_res = 0u;
addr = 0u;
value = 0.0f;
start_read_failed = 0u;
start_read_retry = 0u;
read_success = 0u;
sensor_power_on_reset = 0u;
read_CRC = 0u;
read_retry = 0u;
read_failed = 0u;
reinit_count = 0u;
actual_res = 0u;
measurementActive = false;
valueRead = false;
parasitePowered = false;
lastReadError = false;
fixed_resolution = false;
# ifndef LIMIT_BUILD_SIZE
parasitePowered = false;
# endif // ifndef LIMIT_BUILD_SIZE
}
void Dallas_SensorData::set_measurement_inactive() {
@@ -1324,10 +1336,12 @@ bool Dallas_SensorData::initiate_read(int8_t gpio_rx, int8_t gpio_tx, int8_t res
if (!Dallas_address_ROM(tmpaddr, gpio_rx, gpio_tx)) {
++start_read_retry;
# ifndef LIMIT_BUILD_SIZE
if (!parasitePowered) {
// Dallas_is_parasite(tmpaddr, gpio_rx, gpio_tx, parasitePowered);
}
# endif // ifndef LIMIT_BUILD_SIZE
if (!Dallas_address_ROM(tmpaddr, gpio_rx, gpio_tx)) {
++start_read_failed;
@@ -1345,9 +1359,11 @@ bool Dallas_SensorData::collect_value(int8_t gpio_rx, int8_t gpio_tx) {
Dallas_uint64_to_addr(addr, tmpaddr);
uint8_t nrRetries = 2;
while (nrRetries) {
--nrRetries;
Dallas_read_result res = Dallas_readTemp(tmpaddr, &value, gpio_rx, gpio_tx);
switch (res) {
case Dallas_read_result::OK:
++read_success;
@@ -1367,13 +1383,14 @@ bool Dallas_SensorData::collect_value(int8_t gpio_rx, int8_t gpio_tx) {
// No need to retry, sensor not found
nrRetries = 0;
++start_read_failed;
break;
break;
}
# ifndef LIMIT_BUILD_SIZE
if (!parasitePowered) {
Dallas_is_parasite(tmpaddr, gpio_rx, gpio_tx, parasitePowered);
}
# endif // ifndef LIMIT_BUILD_SIZE
}
}
valueRead = false;
@@ -1398,10 +1415,12 @@ bool Dallas_SensorData::check_sensor(int8_t gpio_rx, int8_t gpio_tx, int8_t res)
fixed_resolution = false; // reset
Dallas_uint64_to_addr(addr, tmpaddr);
# ifndef LIMIT_BUILD_SIZE
if (!parasitePowered) {
Dallas_is_parasite(tmpaddr, gpio_rx, gpio_tx, parasitePowered);
}
# endif // ifndef LIMIT_BUILD_SIZE
actual_res = Dallas_getResolution(tmpaddr, gpio_rx, gpio_tx, fixed_resolution);
src/src/Helpers/Dallas1WireHelper.h
+12 -7
View File
@@ -15,7 +15,7 @@
struct Dallas_SensorData {
Dallas_SensorData();
Dallas_SensorData() = default;
void clear();
@@ -46,11 +46,13 @@ struct Dallas_SensorData {
uint32_t reinit_count{};
uint8_t actual_res{};
bool measurementActive = false;
bool valueRead = false;
bool parasitePowered = false;
bool lastReadError = false;
bool fixed_resolution = false;
bool measurementActive{};
bool valueRead{};
bool lastReadError{};
bool fixed_resolution{};
#ifndef LIMIT_BUILD_SIZE
bool parasitePowered{};
#endif
};
@@ -91,7 +93,9 @@ void Dallas_addr_selector_webform_load(taskIndex_t TaskInd
int8_t gpio_pin_tx,
uint8_t nrVariables = 1);
#ifndef LIMIT_BUILD_SIZE
void Dallas_show_sensor_stats_webform_load(const Dallas_SensorData& sensor_data);
#endif
void Dallas_addr_selector_webform_save(taskIndex_t TaskIndex,
int8_t gpio_pin_rx,
@@ -122,11 +126,12 @@ uint8_t Dallas_scan(uint8_t getDeviceROM,
int8_t gpio_pin_tx);
// read power supply
#ifndef LIMIT_BUILD_SIZE
bool Dallas_is_parasite(const uint8_t ROM[8],
int8_t gpio_pin_rx,
int8_t gpio_pin_tx,
bool & isParasitePowered);
#endif
/*
void Dallas_startConversion(const uint8_t ROM[8],
int8_t gpio_pin_rx,