Skip to content

Merge changes from main #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 15, 2025
Merged

Merge changes from main #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5649fa
Update reset reason check in setup function
techniccontroller Feb 14, 2025
5054991
Add custom hostname setting in setup function
techniccontroller Feb 14, 2025
238322f
Update .gitignore to ignore all log files
techniccontroller Feb 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
secrets.h
/.vscode
/build
log.txt
log*.txt
5 changes: 4 additions & 1 deletion wordclock_esp8266.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ void setup() {
// set custom ip for portal
//wifiManager.setAPStaticIPConfig(IPAdress_AccessPoint, Gateway_AccessPoint, Subnetmask_AccessPoint);

// set a custom hostname
wifiManager.setHostname(hostname);

// fetches ssid and pass from eeprom and tries to connect
// if it does not connect it starts an access point with the specified name
// here "wordclockAP"
Expand Down Expand Up @@ -352,7 +355,7 @@ void setup() {
loadBrightnessSettingsFromEEPROM();
loadColorShiftStateFromEEPROM();

if(!ESP.getResetReason().equals("Software/System restart")){
if(ESP.getResetReason().equals("Power On") || ESP.getResetReason().equals("External System")){
// test quickly each LED
for(int r = 0; r < HEIGHT; r++){
for(int c = 0; c < WIDTH; c++){
Expand Down