Skip to content

Commit

Permalink
Merge pull request #2090 from Blackymas/beta
Browse files Browse the repository at this point in the history
v4.3.7 - Quick Fix for Captive Portal Compile Error
  • Loading branch information
edwardtfn authored Apr 25, 2024
2 parents 7ffaba6 + 33b966c commit e667aa2
Show file tree
Hide file tree
Showing 31 changed files with 42 additions and 28 deletions.
16 changes: 16 additions & 0 deletions ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -767,6 +767,20 @@ These fixes ensure that custom buttons properly trigger actions for climate and
This patch release v4.3.6 ensures that custom buttons on the NSPanel are fully operational, addressing urgent issues that impacted user interaction and control of climate and alarm systems.
We thank our community for their prompt reporting and patience as we continue to enhance the NSPanel experience.

## v4.3.7 - Quick Fix for Captive Portal Compile Error
This patch addresses a critical compile error related to the captive portal feature, ensuring smooth and successful firmware compilations for users utilizing this feature.

### Captive Portal Compile Error Resolved (#2088)
- **Criticality:** Critical
- **Affected Components:** ESPHome
- **Issue Number:** #2088
- **Description:** Fixed a critical issue where users faced a compilation error due to an undeclared reference to 'ap_captive_portal'.
This fix corrects the reference error, restoring the ability to compile with the captive portal enabled.
Users who do not utilize the captive portal can continue without modification, while those who do should see successful compilations without further adjustments.

This release ensures that all users, regardless of their use of the captive portal feature, can compile and update their firmware without interruption.
We apologize for any inconvenience caused and appreciate your patience as we continue to improve the NSPanel firmware.

## Support
For support or more information about this update,
visit our [GitHub repository](https://github.com/Blackymas/NSPanel_HA_Blueprint)
Expand All @@ -783,6 +797,8 @@ Your efforts have significantly improved its functionality and reliability (#183
Your contributions have made our guides more informative and accessible, enriching the user experience for everyone (#1865).

## Previous releases
- [v4.3.6 - Critical Fixes for Custom Buttons](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.6)
- [v4.3.5 - Experimenting with Bluetooth Capabilities](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.5)
- [v4.3.4 - Urgent Fix for Home Screen Interaction](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.4)
- [v4.3.3 - Enhancing Flexibility and User Experience](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.3)
- [v4.3.2 - Enhancements and Critical Fixes for a Seamless Experience](https://github.com/Blackymas/NSPanel_HA_Blueprint/releases/tag/v4.3.2)
Expand Down
2 changes: 0 additions & 2 deletions esphome/nspanel_esphome_addon_climate_base.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,6 @@ script:
const uint cooler_relay = ${cooler_relay};
const uint heater_relay = ${heater_relay};
ESP_LOGCONFIG(TAG, "Add-on climate:");
if (cooler_relay != 0) ESP_LOGCONFIG(TAG, " Relay (cooler): %u", cooler_relay);
if (heater_relay != 0) ESP_LOGCONFIG(TAG, " Relay (heater): %u", heater_relay);
#ifdef NSPANEL_HA_BLUEPRINT_ADDON_CLIMATE_COOL
ESP_LOGCONFIG(TAG, " Cool: Enabled");
if (cooler_relay == 1 or cooler_relay == 2)
Expand Down
24 changes: 12 additions & 12 deletions esphome/nspanel_esphome_addon_upload_tft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -224,18 +224,18 @@ script:
ESP_LOGD(TAG, " Upload URL: %s", url.c_str());
disp1->set_tft_url(url.c_str());
#ifdef USE_IMPROV
ESP_LOGD(TAG, "Stop Improv BLE");
ble_improv->dump_config();
ble_improv->stop();
ble_improv->dump_config();
#endif
#ifdef USE_CAPTIVE_PORTAL
ESP_LOGD(TAG, "Stop Captive Portal");
ap_captive_portal->dump_config();
ap_captive_portal->end();
ap_captive_portal->dump_config();
#endif
// #ifdef USE_IMPROV
// ESP_LOGD(TAG, "Stop Improv BLE");
// ble_improv->dump_config();
// ble_improv->stop();
// ble_improv->dump_config();
// #endif
// #ifdef USE_CAPTIVE_PORTAL
// ESP_LOGD(TAG, "Stop Captive Portal");
// ap_captive_portal->dump_config();
// ap_captive_portal->end();
// ap_captive_portal->dump_config();
// #endif
#ifdef USE_ESP32_BLE_CLIENT
ble_tracker->dump_config();
ESP_LOGD(TAG, "Disable BLE");
Expand Down
4 changes: 2 additions & 2 deletions esphome/nspanel_esphome_core.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ substitutions:
invalid_cooldown: "100ms"
bytes_per_char: "1"
##### DON'T CHANGE THIS ######
version: "4.3.6"
version: "4.3.7"
##############################

##### External components #####
Expand All @@ -27,7 +27,7 @@ external_components:
# path: packages/Blackymas/components
type: git
url: https://github.com/Blackymas/NSPanel_HA_Blueprint
ref: v4.3.6
ref: v4.3.7
components:
- nspanel_ha_blueprint
refresh: 300s
Expand Down
2 changes: 1 addition & 1 deletion hmi/dev/nspanel_CJK_eu_code/boot.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Text tft_version
Dragging : 0
Send Component ID : on press and release
Associated Keyboard: none
Text : 4.3.6
Text : 4.3.7
Max. Text Size : 10

Text esph_version
Expand Down
2 changes: 1 addition & 1 deletion hmi/dev/nspanel_CJK_us_code/boot.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Text tft_version
Dragging : 0
Send Component ID : on press and release
Associated Keyboard: none
Text : 4.3.6
Text : 4.3.7
Max. Text Size : 10

Events
Expand Down
2 changes: 1 addition & 1 deletion hmi/dev/nspanel_CJK_us_land_code/boot.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Text tft_version
Dragging : 0
Send Component ID : on press and release
Associated Keyboard: none
Text : 4.3.6
Text : 4.3.7
Max. Text Size : 10

Text esph_version
Expand Down
2 changes: 1 addition & 1 deletion hmi/dev/nspanel_eu_code/boot.txt
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Text tft_version
Dragging : 0
Send Component ID : on press and release
Associated Keyboard: none
Text : 4.3.6
Text : 4.3.7
Max. Text Size : 10

Text esph_version
Expand Down
Loading

0 comments on commit e667aa2

Please sign in to comment.