Merge branch 'master' of github.com:vortigont/FireLamp_JeeUI

vortigont · May 27, 2024 · 77663c0 · 77663c0
2 parents 894e373 + b963bfc
commit 77663c0
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git a/src/bencoder.cpp b/src/bencoder.cpp
@@ -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

diff --git a/src/bencoder.hpp b/src/bencoder.hpp
@@ -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

diff --git a/src/display.cpp b/src/display.cpp
@@ -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

diff --git a/src/display.hpp b/src/display.hpp
@@ -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

diff --git a/src/evtloop.cpp b/src/evtloop.cpp
@@ -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

diff --git a/src/evtloop.h b/src/evtloop.h
@@ -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

diff --git a/src/filehelpers.cpp b/src/filehelpers.cpp
@@ -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

diff --git a/src/filehelpers.hpp b/src/filehelpers.hpp
@@ -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

diff --git a/src/interface.cpp b/src/interface.cpp
@@ -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.
 

diff --git a/src/lamp.h b/src/lamp.h
@@ -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.
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -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.
 
@@ -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"

diff --git a/src/main.h b/src/main.h
@@ -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.
 
@@ -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))