Skip to content

Commit

Permalink
release 1.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dewenni committed Jan 1, 2025

Verified

This commit was signed with the committer’s verified signature.
cjdenio Caleb Denio
1 parent 65d3369 commit 1903fd0
Showing 12 changed files with 33 additions and 47 deletions.
18 changes: 11 additions & 7 deletions changeNew.md
Original file line number Diff line number Diff line change
@@ -2,23 +2,27 @@

## what's new

### direct GitHub Update 🎉🎉🎉
### 1. direct GitHub Update 🎉🎉🎉

This update introduces an exciting new feature: You can now update to the latest version directly from the WebUI – no need to download the .bin file manually anymore!

Simply click on the version info in the bottom left corner, and a dialog will open. If a new version is available, you can initiate the update right there. It will automatically download and install the latest release from GitHub.

![ota-2](Doc/github_ota.gif)

### 2. new option to enable/disable WIFI

there is a new option to enable/disable WiFi. This could be useful if you use the Ethernet connection and you do not want to use the WiFi in parallel.
The depending switch to enable/disable is also in Settings > WiFi

> [!CAUTION]
> Unfortunately after the update the "enable" will be false and therefore the Controller will be activate the "Setup-Mode" after restart, because WiFi and in most cases Ethernet is now disabled. Then you have to connect to the Accesspoint, go to Settings and activate WiFi. After Reboot everything should be fine again. Sorry, but that's something I can't avoid in this case.
> [!TIP]
> Maybe it is necessary to clean your browser cache after the update, to be sure that everything works well!
> [!NOTE]
> this project is still in an early phase.
> If you like this project, feel free to push the **[Star ⭐️]** button and click **[Watch 👁]** to stay updated.
> If there is any bug, please use the Issue function and let me know.
> If you have any further questions, suggestions or requests, please use the discussion function.
## changelog

- add new feature to update directly from GitHub
- add option to enable/disable WIFI in case ETH is used (WiFi will be activated automatically in Setup-Mode) #17
- improve the size of controls at mobile layout
2 changes: 1 addition & 1 deletion include/config.h
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
/*-------------------------------------------------------------------------------
General Configuration
--------------------------------------------------------------------------------*/
#define VERSION "v1.3.0" // internal program version
#define VERSION "v1.4.0" // internal program version

#define WIFI_RECONNECT 30000 // Delay between wifi reconnection tries
#define MQTT_RECONNECT 10000 // Delay between mqtt reconnection tries
4 changes: 2 additions & 2 deletions include/gzip_css.h

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions include/gzip_js.h

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion include/gzip_login_html.h
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
const uint8_t PROGMEM gzip_login_html[] = {0x1f, 0x8b, 0x08, 0x00, 0x2e, 0x77, 0x70, 0x67, 0x02, 0xff, 0x75, 0x53, 0xb1, 0x92, 0xd4, 0x30, 0x0c, 0xed, 0xef, 0x2b, 0x84, 0x5b, 0xc8, 0xe6, 0x38, 0x1a, 0x8a, 0x64, 0x1b, 0xb8, 0x2b, 0x18, 0x66, 0xd8, 0x19, 0x8e, 0x82, 0x52, 0x89, 0xb5, 0xb1, 0xe7, 0x1c, 0xdb, 0xd8, 0xca, 0xee, 0x85, 0xaf, 0xc7, 0x59, 0x27, 0x24, 0x3b, 0x2c, 0x95, 0xe5, 0xf7, 0xe4, 0x27, 0xe9, 0x69, 0x5c, 0xbd, 0xf9, 0xfc, 0xed, 0xd3, 0xf3, 0xcf, 0xc3, 0x23, 0x28, 0xee, 0xcd, 0xfe, 0xae, 0x9a, 0x0e, 0x30, 0x68, 0xbb, 0x5a, 0x90, 0x15, 0x20, 0x75, 0xa8, 0x85, 0xe1, 0x90, 0x22, 0x64, 0x2c, 0x58, 0x51, 0x4f, 0xb5, 0x90, 0x18, 0x5e, 0xc4, 0xfe, 0x0e, 0xa0, 0x52, 0x84, 0x72, 0x0a, 0x52, 0xd8, 0x13, 0x23, 0xb4, 0x0a, 0x43, 0x24, 0xae, 0xc5, 0x8f, 0xe7, 0xa7, 0xe2, 0xa3, 0x80, 0x72, 0x4b, 0x5a, 0x9c, 0x1e, 0xa3, 0xf7, 0x86, 0x8a, 0xde, 0x35, 0x3a, 0x1d, 0x67, 0x6a, 0x8a, 0x04, 0x14, 0x2d, 0x7a, 0x6c, 0x0c, 0x09, 0x68, 0x9d, 0x65, 0xb2, 0x49, 0x60, 0xa4, 0xb8, 0x3e, 0x67, 0xcd, 0x86, 0xf6, 0x8f, 0xdf, 0x0f, 0x1f, 0x1e, 0x8a, 0x2f, 0x18, 0x9c, 0xd1, 0x47, 0xae, 0xca, 0x8c, 0xe6, 0x0c, 0xa3, 0xed, 0x0b, 0x04, 0x32, 0xb5, 0xd0, 0x49, 0x42, 0x80, 0x0a, 0x74, 0xac, 0x45, 0x79, 0xc4, 0xd3, 0x74, 0xdf, 0xc5, 0x53, 0x27, 0x20, 0xea, 0xdf, 0x14, 0x53, 0x03, 0x76, 0x14, 0xc0, 0xa3, 0x4f, 0xbd, 0xe8, 0x1e, 0x3b, 0x2a, 0x13, 0xf9, 0xf6, 0xb5, 0x37, 0x6b, 0xb9, 0x55, 0x2c, 0xf2, 0x68, 0x28, 0x2a, 0x22, 0x5e, 0x9e, 0x30, 0xbd, 0x72, 0xd9, 0xc6, 0xb8, 0x94, 0xe8, 0x51, 0xdb, 0xdd, 0xe5, 0x7e, 0x63, 0xd6, 0x93, 0xa6, 0xb3, 0x77, 0x81, 0x37, 0x73, 0x9d, 0xb5, 0x64, 0x55, 0x4b, 0x4a, 0x7d, 0xa5, 0xf1, 0xa7, 0xcb, 0x3b, 0xd0, 0x56, 0xb3, 0x46, 0x53, 0xc4, 0x16, 0x0d, 0xd5, 0xef, 0x77, 0xf7, 0xb3, 0x58, 0x55, 0x2e, 0xfe, 0x56, 0x8d, 0x93, 0xe3, 0xac, 0x2f, 0x53, 0xaa, 0xeb, 0xc0, 0x79, 0xb2, 0x19, 0x49, 0x18, 0x06, 0xd6, 0xed, 0x62, 0xc6, 0x05, 0x51, 0x0f, 0xff, 0xf8, 0x95, 0xa0, 0x95, 0xf7, 0xfb, 0x83, 0x21, 0x8c, 0x04, 0x5f, 0x5d, 0xa7, 0x6d, 0x55, 0xfa, 0x0d, 0x77, 0x74, 0xa1, 0x07, 0x6c, 0x59, 0x3b, 0x9b, 0x3c, 0x34, 0x53, 0x82, 0x80, 0x34, 0x96, 0x72, 0xb2, 0x16, 0xde, 0x45, 0x16, 0x6b, 0x72, 0x4a, 0xd7, 0xd6, 0x0f, 0xbc, 0xb1, 0x47, 0xcc, 0xd3, 0x0f, 0x91, 0xc2, 0x14, 0x09, 0xf0, 0x06, 0x5b, 0x52, 0xce, 0x48, 0x0a, 0x19, 0x86, 0x8c, 0x07, 0xfa, 0x35, 0xe8, 0x40, 0x72, 0xf1, 0x6e, 0x2b, 0xb8, 0x01, 0x60, 0x16, 0xf7, 0x18, 0xe3, 0xd9, 0x05, 0x29, 0xae, 0xb8, 0x5c, 0xec, 0x36, 0x77, 0x55, 0xf8, 0x76, 0xca, 0x7f, 0x7a, 0x68, 0x06, 0x66, 0x67, 0xe7, 0xc2, 0x71, 0x68, 0x7a, 0x9d, 0xa6, 0x9e, 0xbd, 0xca, 0xdc, 0xc6, 0xb0, 0x72, 0x72, 0xec, 0xef, 0x32, 0xca, 0xab, 0x6d, 0x54, 0x65, 0x5e, 0x58, 0x5e, 0x68, 0xde, 0x63, 0xda, 0xc5, 0xe5, 0xbb, 0xfd, 0x01, 0x84, 0x40, 0xe8, 0x4e, 0x7f, 0x03, 0x00, 0x00};
const uint8_t PROGMEM gzip_login_html[] = {0x1f, 0x8b, 0x08, 0x00, 0xbf, 0xb0, 0x75, 0x67, 0x02, 0xff, 0x75, 0x53, 0xb1, 0x92, 0xd4, 0x30, 0x0c, 0xed, 0xef, 0x2b, 0x84, 0x5b, 0xc8, 0xe6, 0x38, 0x1a, 0x8a, 0x64, 0x1b, 0xb8, 0x2b, 0x18, 0x66, 0xd8, 0x19, 0x8e, 0x82, 0x52, 0x89, 0xb5, 0xb1, 0xe7, 0x1c, 0xdb, 0xd8, 0xca, 0xee, 0x85, 0xaf, 0xc7, 0x59, 0x27, 0x24, 0x3b, 0x2c, 0x95, 0xe5, 0xf7, 0xe4, 0x27, 0xe9, 0x69, 0x5c, 0xbd, 0xf9, 0xfc, 0xed, 0xd3, 0xf3, 0xcf, 0xc3, 0x23, 0x28, 0xee, 0xcd, 0xfe, 0xae, 0x9a, 0x0e, 0x30, 0x68, 0xbb, 0x5a, 0x90, 0x15, 0x20, 0x75, 0xa8, 0x85, 0xe1, 0x90, 0x22, 0x64, 0x2c, 0x58, 0x51, 0x4f, 0xb5, 0x90, 0x18, 0x5e, 0xc4, 0xfe, 0x0e, 0xa0, 0x52, 0x84, 0x72, 0x0a, 0x52, 0xd8, 0x13, 0x23, 0xb4, 0x0a, 0x43, 0x24, 0xae, 0xc5, 0x8f, 0xe7, 0xa7, 0xe2, 0xa3, 0x80, 0x72, 0x4b, 0x5a, 0x9c, 0x1e, 0xa3, 0xf7, 0x86, 0x8a, 0xde, 0x35, 0x3a, 0x1d, 0x67, 0x6a, 0x8a, 0x04, 0x14, 0x2d, 0x7a, 0x6c, 0x0c, 0x09, 0x68, 0x9d, 0x65, 0xb2, 0x49, 0x60, 0xa4, 0xb8, 0x3e, 0x67, 0xcd, 0x86, 0xf6, 0x8f, 0xdf, 0x0f, 0x1f, 0x1e, 0x8a, 0x2f, 0x18, 0x9c, 0xd1, 0x47, 0xae, 0xca, 0x8c, 0xe6, 0x0c, 0xa3, 0xed, 0x0b, 0x04, 0x32, 0xb5, 0xd0, 0x49, 0x42, 0x80, 0x0a, 0x74, 0xac, 0x45, 0x79, 0xc4, 0xd3, 0x74, 0xdf, 0xc5, 0x53, 0x27, 0x20, 0xea, 0xdf, 0x14, 0x53, 0x03, 0x76, 0x14, 0xc0, 0xa3, 0x4f, 0xbd, 0xe8, 0x1e, 0x3b, 0x2a, 0x13, 0xf9, 0xf6, 0xb5, 0x37, 0x6b, 0xb9, 0x55, 0x2c, 0xf2, 0x68, 0x28, 0x2a, 0x22, 0x5e, 0x9e, 0x30, 0xbd, 0x72, 0xd9, 0xc6, 0xb8, 0x94, 0xe8, 0x51, 0xdb, 0xdd, 0xe5, 0x7e, 0x63, 0xd6, 0x93, 0xa6, 0xb3, 0x77, 0x81, 0x37, 0x73, 0x9d, 0xb5, 0x64, 0x55, 0x4b, 0x4a, 0x7d, 0xa5, 0xf1, 0xa7, 0xcb, 0x3b, 0xd0, 0x56, 0xb3, 0x46, 0x53, 0xc4, 0x16, 0x0d, 0xd5, 0xef, 0x77, 0xf7, 0xb3, 0x58, 0x55, 0x2e, 0xfe, 0x56, 0x8d, 0x93, 0xe3, 0xac, 0x2f, 0x53, 0xaa, 0xeb, 0xc0, 0x79, 0xb2, 0x19, 0x49, 0x18, 0x06, 0xd6, 0xed, 0x62, 0xc6, 0x05, 0x51, 0x0f, 0xff, 0xf8, 0x95, 0xa0, 0x95, 0xf7, 0xfb, 0x83, 0x21, 0x8c, 0x04, 0x5f, 0x5d, 0xa7, 0x6d, 0x55, 0xfa, 0x0d, 0x77, 0x74, 0xa1, 0x07, 0x6c, 0x59, 0x3b, 0x9b, 0x3c, 0x34, 0x53, 0x82, 0x80, 0x34, 0x96, 0x72, 0xb2, 0x16, 0xde, 0x45, 0x16, 0x6b, 0x72, 0x4a, 0xd7, 0xd6, 0x0f, 0xbc, 0xb1, 0x47, 0xcc, 0xd3, 0x0f, 0x91, 0xc2, 0x14, 0x09, 0xf0, 0x06, 0x5b, 0x52, 0xce, 0x48, 0x0a, 0x19, 0x86, 0x8c, 0x07, 0xfa, 0x35, 0xe8, 0x40, 0x72, 0xf1, 0x6e, 0x2b, 0xb8, 0x01, 0x60, 0x16, 0xf7, 0x18, 0xe3, 0xd9, 0x05, 0x29, 0xae, 0xb8, 0x5c, 0xec, 0x36, 0x77, 0x55, 0xf8, 0x76, 0xca, 0x7f, 0x7a, 0x68, 0x06, 0x66, 0x67, 0xe7, 0xc2, 0x71, 0x68, 0x7a, 0x9d, 0xa6, 0x9e, 0xbd, 0xca, 0xdc, 0xc6, 0xb0, 0x72, 0x72, 0xec, 0xef, 0x32, 0xca, 0xab, 0x6d, 0x54, 0x65, 0x5e, 0x58, 0x5e, 0x68, 0xde, 0x63, 0xda, 0xc5, 0xe5, 0xbb, 0xfd, 0x01, 0x84, 0x40, 0xe8, 0x4e, 0x7f, 0x03, 0x00, 0x00};
const unsigned int gzip_login_html_size = 448;
4 changes: 2 additions & 2 deletions include/gzip_m_html.h

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion include/gzip_ntp_html.h

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions platformio.ini
Original file line number Diff line number Diff line change
@@ -31,17 +31,17 @@ extra_scripts =
; ----------------------------------------------------------------
;upload_port = /dev/cu.usbserial-0258166D
;upload_port = /dev/cu.usbserial-576D0483281
;upload_port = /dev/cu.usbserial-576D0481591
upload_port = /dev/cu.usbserial-576D0481591
;upload_port = /dev/cu.usbserial-0001
;upload_port = /dev/cu.usbmodem01


; ----------------------------------------------------------------
; OPTION 2: wireless OTA Update
; ----------------------------------------------------------------
upload_protocol = espota
upload_speed = 115000
upload_port = 192.168.178.193 ; Conneted to Router
;upload_protocol = espota
;upload_speed = 115000
;upload_port = 192.168.178.193 ; Conneted to Router
;upload_port = 192.168.4.1 ; Setup Mode (ESP create Accesspoint)


Binary file not shown.
Binary file not shown.
35 changes: 9 additions & 26 deletions src/config.cpp
Original file line number Diff line number Diff line change
@@ -15,9 +15,8 @@ muTimer checkTimer = muTimer(); // timer to refresh other values
static const char *TAG = "CFG"; // LOG TAG

/* P R O T O T Y P E S ********************************************************/
void configGPIO();
void configInitValue();
void checkGPIO();
void configInitValue();
void configFinalCheck();

/**
@@ -36,10 +35,8 @@ void configSetup() {

// load config from file
configLoadFromFile();
// check GPIO
//check gpio
checkGPIO();
// gpio settings
configGPIO();
// check final settings
configFinalCheck();
}
@@ -201,23 +198,6 @@ void configCyclic() {
}
}

/**
* *******************************************************************
* @brief Setup for GPIO
* @param none
* @return none
* *******************************************************************/
void configGPIO() {

if (setupMode) {
if (config.gpio.led_setup <= 0) {
pinMode(LED_BUILTIN, OUTPUT); // onboard LED
} else {
pinMode(config.gpio.led_setup, OUTPUT); // LED for Wifi-Status
}
}
}

/**
* *******************************************************************
* @brief intitial configuration values
@@ -485,13 +465,11 @@ void configLoadFromFile() {
}
}


file.close(); // Close the file (Curiously, File's destructor doesn't close the file)
configHashInit(); // init hash value

}

void configFinalCheck(){
void configFinalCheck() {

// check network settings
if (strlen(config.wifi.ssid) == 0) {
@@ -510,5 +488,10 @@ void configFinalCheck(){
}
setLogLevel(config.log.level);


// check GIO for LED
if (config.gpio.led_setup <= 0) {
pinMode(LED_BUILTIN, OUTPUT); // onboard LED
} else {
pinMode(config.gpio.led_setup, OUTPUT); // LED for Wifi-Status
}
}
1 change: 0 additions & 1 deletion src/webUIcallback.cpp
Original file line number Diff line number Diff line change
@@ -237,7 +237,6 @@ void webCallback(const char *elementId, const char *value) {
}
if (strcmp(elementId, "cfg_gpio_led_setup") == 0) {
config.gpio.led_setup = strtoul(value, NULL, 10);
configGPIO();
}

// Jarolift settings

0 comments on commit 1903fd0

Please sign in to comment.