Skip to content
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

Jump to bottom

Rel v3.6.1 #96

Merged
merged 2 commits into from
May 27, 2024
Merged

Rel v3.6.1 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1069a71
fix demo time not saved/restored if changed during demo mode
vortigont May 27, 2024
98cce04
rel v3.6.1
vortigont May 27, 2024
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Change Log

## 3.6.1 (2024-05-27)
* fix demo time save/restore
* fix displaying MP3 volume on TM1637 display
- Remove LinkedList dependency
* minor cleanup, readme update, links, etc...

## 3.6.0 (2024-05-13)
+ Factory firmware builds
- on-demandfactory images builder CI pipeline
Expand Down
2 changes: 1 addition & 1 deletion src/bencoder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This file is a part of FireLamp_JeeUI project
https://github.com/vortigont/FireLamp_JeeUI

Copyright © 2023 Emil Muratov (vortigont)
Copyright © 2023-2024 Emil Muratov (Vortigont)

FireLamp_JeeUI is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/bencoder.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This file is a part of FireLamp_JeeUI project
https://github.com/vortigont/FireLamp_JeeUI

Copyright © 2023 Emil Muratov (vortigont)
Copyright © 2023-2024 Emil Muratov (Vortigont)

FireLamp_JeeUI is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/display.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This file is a part of FireLamp_JeeUI project
https://github.com/vortigont/FireLamp_JeeUI

Copyright © 2023 Emil Muratov (vortigont)
Copyright © 2023-2024 Emil Muratov (Vortigont)

FireLamp_JeeUI is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 1 addition & 1 deletion src/display.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
This file is a part of FireLamp_JeeUI project
https://github.com/vortigont/FireLamp_JeeUI

Copyright © 2023 Emil Muratov (vortigont)
Copyright © 2023-2024 Emil Muratov (Vortigont)

FireLamp_JeeUI is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
3 changes: 1 addition & 2 deletions src/evtloop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
This file is a part of FireLamp_JeeUI project
https://github.com/vortigont/FireLamp_JeeUI

Copyright © 2023 Emil Muratov (vortigont)
Copyright © 2020 Dmytro Korniienko (kDn)
Copyright © 2023-2024 Emil Muratov (Vortigont)

FireLamp_JeeUI is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
3 changes: 1 addition & 2 deletions src/evtloop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
This file is a part of FireLamp_JeeUI project
https://github.com/vortigont/FireLamp_JeeUI

Copyright © 2023 Emil Muratov (vortigont)
Copyright © 2020 Dmytro Korniienko (kDn)
Copyright © 2023-2024 Emil Muratov (Vortigont)

FireLamp_JeeUI is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Expand Down
2 changes: 2 additions & 0 deletions src/filehelpers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

a fork of https://github.com/DmytroKorniienko/FireLamp_EmbUI

Copyright © 2023-2024 Emil Muratov (Vortigont)

FireLamp_JeeUI is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
Expand Down
2 changes: 2 additions & 0 deletions src/filehelpers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

a fork of https://github.com/DmytroKorniienko/FireLamp_EmbUI

Copyright © 2023-2024 Emil Muratov (Vortigont)

FireLamp_JeeUI is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
Expand Down
3 changes: 1 addition & 2 deletions src/interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/*
Copyright © 2023 Emil Muratov (vortigont)
Copyright © 2023-2024 Emil Muratov (Vortigont)
Copyright © 2020 Dmytro Korniienko (kDn)
JeeUI2 lib used under MIT License Copyright (c) 2019 Marsel Akhkamov

This file is part of FireLamp_JeeUI.

Expand Down
3 changes: 1 addition & 2 deletions src/lamp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright © 2023-2024 Emil Muratov (Vortigont)
Copyright © 2020 Dmytro Korniienko (kDn)
JeeUI2 lib used under MIT License Copyright (c) 2019 Marsel Akhkamov

This file is part of FireLamp_JeeUI.

Expand Down Expand Up @@ -488,7 +488,6 @@ void Lamp::setDemoTime(uint32_t seconds){
demoTime = seconds;
if(demoTask){
demoTask->setInterval(demoTime * TASK_SECOND);
return;
}
esp_err_t err;
std::unique_ptr<nvs::NVSHandle> handle = nvs::open_nvs_handle(T_lamp, NVS_READWRITE, &err);
Expand Down
2 changes: 1 addition & 1 deletion src/lamp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright © 2023-2024 Emil Muratov (Vortigont)
Copyright © 2020 Dmytro Korniienko (kDn)
JeeUI2 lib used under MIT License Copyright (c) 2019 Marsel Akhkamov

This file is part of FireLamp_JeeUI.

Expand Down
3 changes: 2 additions & 1 deletion src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright © 2023-2024 Emil Muratov (Vortigont)
Copyright © 2020 Dmytro Korniienko (kDn)
JeeUI2 lib used under MIT License Copyright (c) 2019 Marsel Akhkamov

This file is part of FireLamp_JeeUI.

Expand Down Expand Up @@ -34,6 +34,7 @@ JeeUI2 lib used under MIT License Copyright (c) 2019 Marsel Akhkamov
вместе с этой программой. Если это не так, см.
<https://www.gnu.org/licenses/>.)
*/

#include "main.h"
#include "filehelpers.hpp"
#include "lamp.h"
Expand Down
4 changes: 2 additions & 2 deletions src/main.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
Copyright © 2023-2024 Emil Muratov (Vortigont)
Copyright © 2020 Dmytro Korniienko (kDn)
JeeUI2 lib used under MIT License Copyright (c) 2019 Marsel Akhkamov

This file is part of FireLamp_JeeUI.

Expand Down Expand Up @@ -45,7 +45,7 @@ JeeUI2 lib used under MIT License Copyright (c) 2019 Marsel Akhkamov

#define LAMPFW_VERSION_MAJOR 3
#define LAMPFW_VERSION_MINOR 6
#define LAMPFW_VERSION_REVISION 0
#define LAMPFW_VERSION_REVISION 1

#define LAMPFW_VERSION_VALUE (MAJ, MIN, REV) ((MAJ) << 16 | (MIN) << 8 | (REV))

Expand Down