diff --git a/lib/OneWire/OneWire.cpp b/lib/OneWire/OneWire.cpp index af1174c4e..e29112f79 100644 --- a/lib/OneWire/OneWire.cpp +++ b/lib/OneWire/OneWire.cpp @@ -192,7 +192,6 @@ uint8_t OneWire::reset(void) #endif { IO_REG_TYPE mask IO_REG_MASK_ATTR = bitmask; - volatile IO_REG_TYPE * reg IO_REG_BASE_ATTR = baseReg; uint8_t r; uint8_t retries = 125; t_noInterrupts(); @@ -228,7 +227,6 @@ void OneWire::write_bit(uint8_t v) #endif { IO_REG_TYPE mask IO_REG_MASK_ATTR = bitmask; - volatile IO_REG_TYPE * reg IO_REG_BASE_ATTR = baseReg; if (v & 1) { t_noInterrupts(); diff --git a/lib_standalone/Network.h b/lib_standalone/Network.h index 13c64df09..857ff4a0e 100644 --- a/lib_standalone/Network.h +++ b/lib_standalone/Network.h @@ -61,65 +61,51 @@ typedef enum { } wifi_auth_mode_t; typedef struct { - uint32_t status; /**< status of scanning APs */ - uint8_t number; - uint8_t scan_id; -} arduino_event_wifi_sta_scan_done_t; + uint32_t status; /**< status of scanning APs: 0 — success, 1 - failure */ + uint8_t number; /**< number of scan results */ + uint8_t scan_id; /**< scan sequence number, used for block scan */ +} wifi_event_sta_scan_done_t; +/** Argument structure for WIFI_EVENT_STA_CONNECTED event */ typedef struct { - uint8_t ssid[32]; /**< SSID of connected AP */ - uint8_t ssid_len; /**< SSID length of connected AP */ - uint8_t bssid[6]; /**< BSSID of connected AP*/ - uint8_t channel; /**< channel of connected AP*/ - wifi_auth_mode_t authmode; -} arduino_event_wifi_sta_connected_t; + uint8_t ssid[32]; /**< SSID of connected AP */ + uint8_t ssid_len; /**< SSID length of connected AP */ + uint8_t bssid[6]; /**< BSSID of connected AP*/ + uint8_t channel; /**< channel of connected AP*/ + wifi_auth_mode_t authmode;/**< authentication mode used by AP*/ +} wifi_event_sta_connected_t; +/** Argument structure for WIFI_EVENT_STA_DISCONNECTED event */ typedef struct { - uint8_t ssid[32]; /**< SSID of disconnected AP */ - uint8_t ssid_len; /**< SSID length of disconnected AP */ - uint8_t bssid[6]; /**< BSSID of disconnected AP */ - uint8_t reason; /**< reason of disconnection */ -} arduino_event_wifi_sta_disconnected_t; + uint8_t ssid[32]; /**< SSID of disconnected AP */ + uint8_t ssid_len; /**< SSID length of disconnected AP */ + uint8_t bssid[6]; /**< BSSID of disconnected AP */ + uint8_t reason; /**< reason of disconnection */ +} wifi_event_sta_disconnected_t; +/** Argument structure for WIFI_EVENT_STA_AUTHMODE_CHANGE event */ typedef struct { - wifi_auth_mode_t old_mode; /**< the old auth mode of AP */ - wifi_auth_mode_t new_mode; /**< the new auth mode of AP */ -} arduino_event_wifi_sta_authmode_change_t; + wifi_auth_mode_t old_mode; /**< the old auth mode of AP */ + wifi_auth_mode_t new_mode; /**< the new auth mode of AP */ +} wifi_event_sta_authmode_change_t; +/** Argument structure for WIFI_EVENT_STA_WPS_ER_PIN event */ typedef struct { - uint8_t pin_code[8]; /**< PIN code of station in enrollee mode */ -} arduino_event_wifi_sta_wps_er_pin_t; - -typedef struct { - uint8_t mac[6]; /**< MAC address of the station connected to ESP32 soft-AP */ - uint8_t aid; /**< the aid that ESP32 soft-AP gives to the station connected to */ -} arduino_event_wifi_ap_staconnected_t; - -typedef struct { - uint8_t mac[6]; /**< MAC address of the station disconnects to ESP32 soft-AP */ - uint8_t aid; /**< the aid that ESP32 soft-AP gave to the station disconnects to */ -} arduino_event_wifi_ap_stadisconnected_t; - -typedef struct { - int rssi; /**< Received probe request signal strength */ - uint8_t mac[6]; /**< MAC address of the station which send probe request */ -} arduino_event_wifi_ap_probe_req_rx_t; + uint8_t pin_code[8]; /**< PIN code of station in enrollee mode */ +} wifi_event_sta_wps_er_pin_t; +/** Argument structure for WIFI_EVENT_STA_WPS_ER_FAILED event */ typedef enum { - WPS_FAIL_REASON_NORMAL = 0, /**< ESP32 WPS normal fail reason */ - WPS_FAIL_REASON_RECV_M2D, /**< ESP32 WPS receive M2D frame */ + WPS_FAIL_REASON_NORMAL = 0, /**< ESP32 WPS normal fail reason */ + WPS_FAIL_REASON_RECV_M2D, /**< ESP32 WPS receive M2D frame */ WPS_FAIL_REASON_MAX -} arduino_event_wifi_sta_wps_fail_reason_t; +} wifi_event_sta_wps_fail_reason_t; typedef union { - arduino_event_wifi_sta_connected_t connected; /**< ESP32 station connected to AP */ - arduino_event_wifi_sta_disconnected_t disconnected; /**< ESP32 station disconnected to AP */ - arduino_event_wifi_sta_scan_done_t scan_done; /**< ESP32 station scan (APs) done */ - arduino_event_wifi_sta_authmode_change_t auth_change; /**< the auth mode of AP ESP32 station connected to changed */ - arduino_event_wifi_sta_wps_fail_reason_t sta_er_fail_reason; /**< ESP32 station WPS enrollee mode failed reason code received */ - arduino_event_wifi_sta_connected_t sta_connected; /**< a station connected to ESP32 soft-AP */ - arduino_event_wifi_sta_disconnected_t sta_disconnected; /**< a station disconnected to ESP32 soft-AP */ - arduino_event_wifi_ap_probe_req_rx_t ap_probereqrecved; /**< ESP32 soft-AP receive probe request packet */ + wifi_event_sta_scan_done_t wifi_scan_done; + wifi_event_sta_authmode_change_t wifi_sta_authmode_change; + wifi_event_sta_connected_t wifi_sta_connected; + wifi_event_sta_disconnected_t wifi_sta_disconnected; } arduino_event_info_t; typedef struct { diff --git a/src/devices/boiler.h b/src/devices/boiler.h index f60b65120..45571d633 100644 --- a/src/devices/boiler.h +++ b/src/devices/boiler.h @@ -131,7 +131,7 @@ class Boiler : public EMSdevice { uint32_t burn2WorkMin_; // burner stage 2 operating time uint32_t heatWorkMin_; // Total heat operating time uint32_t UBAuptime_; // Total UBA working hours - char lastCode_[50]; // last error code + char lastCode_[52]; // last error code char serviceCode_[4]; // 3 character status/service code uint16_t serviceCodeNumber_; // error/service code uint8_t emergencyOps_; diff --git a/src/uart/emsuart_esp32.cpp b/src/uart/emsuart_esp32.cpp index cc1cfdb40..f22841cb0 100644 --- a/src/uart/emsuart_esp32.cpp +++ b/src/uart/emsuart_esp32.cpp @@ -20,6 +20,8 @@ * ESP32 UART port by @ArwedL and improved by @MichaelDvP. See https://github.com/emsesp/EMS-ESP/issues/380 */ +#ifndef EMSESP_STANDALONE + #include "freertos/FreeRTOS.h" #include "freertos/task.h" #include "freertos/queue.h" @@ -166,3 +168,5 @@ uint16_t EMSuart::transmit(const uint8_t * buf, const uint8_t len) { } } // namespace emsesp + +#endif diff --git a/src/version.h b/src/version.h index e56f315d3..45b273d47 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.4.2b1" +#define EMSESP_APP_VERSION "3.4.2b2"