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.

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

Proposal: Rework of code and adding features #110

Draft
wants to merge 176 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
176 commits
Select commit Hold shift + click to select a range
657c5b3
merge main changes
munzili Apr 16, 2023
bd9f3e4
merged feature-webui changes
munzili Apr 24, 2023
085168f
implemented bluetooth support
munzili Apr 24, 2023
532e5d6
fixed length
munzili Apr 24, 2023
ae332b1
make use of the bluetooth config options
munzili Apr 25, 2023
d9068ff
added version displaying and update version check
munzili Apr 26, 2023
5ec32ef
added CAN stop/cleanup methods
munzili Apr 26, 2023
43127fa
added base method for calling CAN bus preloads/data previews
munzili Apr 26, 2023
fa1de7a
first work to drop config struct dependency
munzili Apr 27, 2023
f7fadc8
created own header with config struct and enums for CAN. Use this str…
munzili Apr 28, 2023
f1676cb
use in ocnfig CAN_Config as pointer. renaemed commandDef to CANComman…
munzili Apr 28, 2023
ee23047
fiexed version check
munzili Apr 28, 2023
0ef142f
added dev comments
munzili Apr 28, 2023
b389344
added basic (untested) function to scan CAN messages over webui. Webu…
munzili Apr 29, 2023
96a582d
renamed files, droped redundant CAN string
munzili Apr 30, 2023
4d0f48e
implemented webui CAN scan methods
munzili Apr 30, 2023
e06b51a
fixed submodule
May 3, 2023
9620e01
fixed file naming
May 3, 2023
5e1f76b
Merge branch 'rework' into feature-webui
munzili May 3, 2023
599f95e
reduced header file sizes with not needed methods and moved board def…
munzili May 4, 2023
9edb555
continued implementing live CAN scan
munzili May 6, 2023
8ced501
Merge branch 'main' of https://github.com/raomin/ESPAltherma
munzili May 6, 2023
0387b76
Merge branch 'main' into feature-webui
munzili May 6, 2023
394d905
fixed CAN live scanning
munzili May 7, 2023
b6bb21c
fixed config saving
munzili May 7, 2023
21dd669
refactored X10A configs to be in own struct. still webui needs some c…
munzili May 7, 2023
ac35e57
fixed webui X10A fields handling
munzili May 8, 2023
9d1b9a1
unified file names
munzili May 8, 2023
9cf23a9
fixed CAN config verification
munzili May 8, 2023
cdfe8b5
fixed recursive loop and starting loops on boot
munzili May 9, 2023
77b75db
unified X10A function names
munzili May 9, 2023
5a33c7c
file name changed
May 9, 2023
cd2d820
added first github actions test
munzili May 10, 2023
ef9897f
updated night build process
munzili May 12, 2023
abc9065
updated nightly build process
munzili May 14, 2023
5f4e794
try import fix
munzili May 14, 2023
7ebd60b
fixed m5stickc building
munzili May 14, 2023
680978f
fixed m5stickc compile
munzili May 15, 2023
cadc079
try workflow fix
munzili May 16, 2023
a6e4640
Merge branch 'main' of https://github.com/raomin/ESPAltherma
munzili May 16, 2023
43bf9e9
Merge branch 'main' into feature-webui
munzili May 16, 2023
6eb8964
fixed m5stickc upload and webui
munzili May 16, 2023
9694942
replaced select fields with text inputs
munzili May 21, 2023
3fdeacc
try define correct version and fix compile errors in new platformio
munzili Feb 29, 2024
da6c839
fixed compile error
munzili Mar 2, 2024
8d9c4e5
added solution file
munzili Mar 2, 2024
9046331
replaced espl_littlefs git submodule with a idf component
munzili Mar 13, 2024
404c78b
fixed readme
munzili Mar 13, 2024
a02d823
fixed slash
munzili Mar 13, 2024
29a3429
Merge commit '75f093303467c877d77ec612aecbe12972062e39' into feature-…
munzili Mar 13, 2024
cf84afc
Merge commit '3ae22e79aa5a55eb2f1ed90620b03cefa4f41b2e' into feature-…
munzili Mar 13, 2024
0593dd0
Merge commit '04b8cc269ee609e6583196f4df993ec007dcc22d' into feature-…
munzili Mar 13, 2024
4a33da1
Merge commit '1ad46db75a6f94675add4654fed4602bb637b151' into feature-…
munzili Mar 13, 2024
c95e51e
Merge commit 'ef0c1579716d5ec8b799d16f6ac432a2c8d9c9c9' into feature-…
munzili Mar 13, 2024
73e4d26
README: fix new template format.
thundo Jun 28, 2023
f71c28c
README: fix new template format.
thundo Jun 28, 2023
55e74e9
Merge commit '6d5cf45341347bdfc410470c7badcf15c35c839a' into feature-…
munzili Mar 13, 2024
890352d
Merge commit 'd740d88d853ae4f46cf96dd3941080b5c8a90424' into feature-…
munzili Mar 14, 2024
ae2caab
Merge commit '5d8399d23fd966be47016e07cb9f7629f1e7a90c' into feature-…
munzili Mar 14, 2024
6ba240e
Merge commit '81096cd709cb32e4b78b452cfc6d667dd48c8b3d' into feature-…
munzili Mar 14, 2024
29831b9
Added converter 161-165
munzili Mar 14, 2024
6081f5e
Merge commit '8b0bf27ae0ef044da03483d389f4339590539e7b' into feature-…
munzili Mar 14, 2024
a596923
added option to disable log messages over MQTT
munzili Mar 14, 2024
4ae09a2
Merge commit 'a294ac8fa8f149913e064a91a7c4fc637ead9d96' into feature-…
munzili Mar 14, 2024
6365e60
Merge commit '07e6b0359b80375828d4b892157b899a89e5cd21' into feature-…
munzili Mar 14, 2024
e0106a2
merge
munzili Mar 14, 2024
2455e3f
Merge commit 'dc62550a413799036a9fe3a9b1a63d9b1c567047' into feature-…
munzili Mar 14, 2024
4cb3236
Merge commit '8b29fe8fce11e4a49f8d58afbe316d2f21f7f56c' into feature-…
munzili Mar 14, 2024
2c61718
Merge commit '6410cb5f0ef8dd863e33af0325c220c4e5802abb' into feature-…
munzili Mar 14, 2024
119a418
Merge commit '342d6b42a39f4af0124b33bd3c48a036e682f1bf' into feature-…
munzili Mar 14, 2024
231e236
removed git submodule update from nightly build
munzili Mar 14, 2024
ba1d728
Merge commit '27970d1b76c6a0680ffe370c619940bc3dcd89b6' into feature-…
munzili Mar 14, 2024
bc185fb
Merge commit 'beb6b4d80e1466837aaca6eeb446de6e650356ac' into feature-…
munzili Mar 14, 2024
2b89d17
Merge commit '4000c4540150cdbbaf58ad76ebc03f0ae2a4d677' into feature-…
munzili Mar 14, 2024
683d165
fix converter to merge 1136e85
munzili Mar 14, 2024
3c4b5c3
Merge commit '1136e85f32cbf6d604a30a555520c1c9c41ad2be' into feature-…
munzili Mar 14, 2024
4b44d75
fixed typ
munzili Mar 14, 2024
c183613
Merge commit 'f28312c597bbf9e1ad1a357b3c5b1bd9d616c7a3' into feature-…
munzili Mar 14, 2024
53a23ed
Merge commit 'a55ed55da81f47dd478c302123ba6aa43a7ce4d7' into feature-…
munzili Mar 14, 2024
c672535
Merge commit 'c55dbd699af51c2a5661068521603de1062794b4' into feature-…
munzili Mar 14, 2024
ded17c3
added script to convert C Array definitions from org ESPAltherma to n…
munzili Mar 14, 2024
95ca6f4
work in progress to convert C Array definitions
munzili Mar 15, 2024
866f36a
finished converter script
munzili Mar 15, 2024
6779240
continue work...
munzili Mar 15, 2024
49ee7e4
updated X10A definitions to latest version of org ESLAltherma repo
munzili Mar 15, 2024
a742908
Merge commit '80a7acdb2d4ec00d97973e964427cc9076bb0859' into feature-…
munzili Mar 15, 2024
b538cb1
Merge commit '293af7464f644a9351875703ad8ffd9ae28f667c' into feature-…
munzili Mar 15, 2024
e2932cd
Merge commit 'ccd2d367030ced9ba260b48f6cf28b56dea06a53' into feature-…
munzili Mar 15, 2024
0652e68
Merge commit '00e213affb69b52257ce383ee5761ed7722d72e0' into feature-…
munzili Mar 15, 2024
ec11347
Merge commit '0cc80bd622a7b9ded907fdf7d1ceba764228e056' into feature-…
munzili Mar 15, 2024
d83d035
Merge commit '81ecc2f7d772c1fb0bf82e587ec59ab76ac61f3b' into feature-…
munzili Mar 15, 2024
cfc1504
Merge commit '54f851275a3698deb03302eec8625cc902c8d4c9' into feature-…
munzili Mar 15, 2024
07845b1
Merge commit '38fb5f3c0f5aad71820cc7679f7ce424b5ed0b2f' into feature-…
munzili Mar 15, 2024
d62cf93
Merge commit '5953040aba50a13164c86e5597cfcb8ac3383b79' into feature-…
munzili Mar 15, 2024
ab9e68a
Merge commit '15796a368181cd0eb1c4f5da13f0324836a8b5ae' into feature-…
munzili Mar 15, 2024
66707c0
Merge commit '2453033b2a79c086ddfd4bdad82fd28f506c2703' into feature-…
munzili Mar 15, 2024
daea0f0
Merge commit '87bb5a86cc500d572d58ba648abd297e131a5b9d' into feature-…
munzili Mar 15, 2024
a922203
Merge commit '2af86135961922e9cdc554bd3272987321126994' into feature-…
munzili Mar 15, 2024
f43b80c
Added safety pin
munzili Mar 15, 2024
ab0fed5
Merge commit '5a7502eab726c40b006e01d4f9482dde765a3076' into feature-…
munzili Mar 17, 2024
fb00a91
removed component
munzili Mar 19, 2024
851ced1
Merge commit 'ee38a71cc7a8d54f7fb59d7301cb44490013dfab' into feature-…
munzili Mar 19, 2024
45af8fd
fixed m5stickcplus display brightness and setup page "MQTT disable lo…
munzili Mar 20, 2024
adb9b87
Merge branch 'feature-webui' of https://github.com/munzili/ESPAltherm…
munzili Mar 20, 2024
c60d001
splitted um mqtt calbacks into own file
munzili Mar 21, 2024
31e7a57
do not block ESPAltherma code when MQTT connection failes. Will allow…
munzili Mar 21, 2024
640c9e5
Merge commit '42e3980f1c778906653919bf560d48434fe9069f' into feature-…
munzili Mar 21, 2024
cc5c789
fixed define name
munzili Mar 21, 2024
fbce747
addedM5Stack Tough support
munzili Mar 21, 2024
2ebf1c4
removed oversized debug version and adde m5stack-tough support
munzili Mar 21, 2024
85ca8e7
fixed nightly run script
munzili Mar 21, 2024
a57f091
got code work with normal lib version, no fork required. Needs an war…
munzili Mar 21, 2024
49937b7
fixed screen brithness
munzili Mar 22, 2024
123e3eb
fixed MQTT encrypted connection
munzili Mar 24, 2024
e41c838
removed components again...
munzili Mar 25, 2024
3c1d45b
fixed compilation on m5stickc.
munzili Mar 26, 2024
d8680b8
added template engine for css files too.
munzili Mar 26, 2024
51dd22f
started implementing ESP8266 support
munzili Mar 27, 2024
36db78d
continued implementing ESP8266 support
munzili Mar 27, 2024
6a1dba0
continue ESP8266 support
munzili Mar 27, 2024
fdfa5c1
implemented last code changes to support ESP8266 - UNTESTED
munzili Mar 27, 2024
d839b84
generating .h files with PROGMEM binary data of compress web files an…
munzili Mar 28, 2024
28c086f
fixed ESP8266 support, compiles now fine - UNTESTED
munzili Mar 28, 2024
5c6cdf4
restructured code to be more readable
munzili Mar 28, 2024
46788cf
fixed ESP32 check
munzili Mar 28, 2024
ebc5aa2
moved webui builded files to build folder. refactored pre build scrii…
munzili Mar 29, 2024
829a309
allow native compilation for tests
munzili Mar 29, 2024
613db3c
use arduinofake mockup framework for tests
munzili Mar 30, 2024
9b71037
removed not used headers
munzili Mar 30, 2024
248adf0
WIP - make tests work again
munzili Mar 30, 2024
20ab392
continue test fixing
munzili Mar 30, 2024
df4a4cd
WIP - finished test rewrite
munzili Mar 30, 2024
a0ffcb8
moved CAN code into own lib for unit testing
munzili Apr 2, 2024
87ed832
moved also X10A to own lib to be better testable
munzili Apr 2, 2024
6419700
optimized code
munzili Apr 4, 2024
140c931
temp fix for esp8266 by disabling mcp2515 support
munzili Apr 4, 2024
fb4c6ca
use chain+
munzili Apr 4, 2024
7f97a7d
wip - fixing tests
munzili Apr 4, 2024
3aea4a9
created debug build for esp8266 and use defaul values of esp32. Fixed…
munzili Apr 5, 2024
6c7f316
moved back libs CAN and X10A to src dir. Libs are not correctly indep…
munzili Apr 11, 2024
945378e
Merge branch 'feature-webui' of https://github.com/munzili/ESPAltherm…
munzili Apr 11, 2024
11a3fe2
refactored so no main/espaltherma config is needed to test X10A, only…
munzili Apr 12, 2024
fb948b9
replaced #ifdef cehck if #pragma once, removed not needed files
munzili Apr 12, 2024
31a9b8d
in progress refactor
munzili Apr 23, 2024
09ee784
continue refactor
munzili Apr 23, 2024
8e16014
finished refactor of X10ASerial
munzili Apr 23, 2024
c33c3b2
removed not needed file
munzili Apr 28, 2024
83e0566
wip - refactor debug stream to be an interface and easy to test
munzili May 5, 2024
ff869db
fixed filename
munzili May 6, 2024
44b9788
fixed compile
munzili May 6, 2024
97c23bd
created fake class
munzili May 6, 2024
3eaac5f
fixed conversion
munzili May 7, 2024
4065615
use mock instead of class
munzili May 7, 2024
eaf5dea
moved X10A back to lib dir, working now for build and testing
munzili May 14, 2024
932fc69
replace uint and ulong with uint32_t and uint64_t
munzili May 15, 2024
0cd9760
fixed compile
munzili May 15, 2024
eb601f2
fixed virtual
munzili May 15, 2024
651ff69
wip
munzili May 15, 2024
905bf31
fixed run
munzili May 15, 2024
99687f2
fixed buffer overwritte
munzili May 15, 2024
ca4aaa0
fixed input file search
munzili May 16, 2024
d692ce8
added extra mocks
munzili May 16, 2024
a7b89ff
test now working correctly
munzili May 17, 2024
7b886f8
try to run test son push
munzili May 17, 2024
984261a
fixed wrong commmand
munzili May 17, 2024
7833987
run x10a script befor test
munzili May 17, 2024
448bcb2
keep CAN as lib to be unit tested
munzili May 17, 2024
484f8cf
try creating CAN unit tests
munzili May 17, 2024
fa12e37
fixed compile error on CAN unit test
munzili May 18, 2024
553efe0
added new lib to use as base
munzili May 18, 2024
b0a000d
wip test writing
munzili May 20, 2024
5bcbd7f
fixed compile
munzili May 26, 2024
67aab89
wip - can test fixing
munzili May 26, 2024
c6ee9b0
fixed basic test to compile
munzili May 28, 2024
772ecbe
changed workflow
munzili May 28, 2024
29b053b
created CAN test driver
munzili May 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
125 changes: 125 additions & 0 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
#name: nightly build

on:
push:
branches: [ '*' ]
pull_request:
branches: [ main ]

jobs:
test:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: |
~/.cache/pip
~/.platformio/.cache
key: ${{ runner.os }}-pio
- uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Install PlatformIO Core
run: pip install --upgrade platformio

- name: Build X10A definitions
run: python3 scripts/build_x10a_commands.py

- name: Build CAN definitions
run: python3 scripts/build_can_commands.py

- name: Run Unit Tests
run: pio test -e native

build:
needs: test
runs-on: ubuntu-latest
strategy:
matrix:
target: [esp32, esp32_debug_noBT, nodemcuv2, m5stickc, m5stack-tough, m5stickcplus, m5stickcplus2]

steps:
- uses: actions/checkout@v3
- uses: actions/cache@v3
with:
path: |
~/.cache/pip
~/.platformio/.cache
key: ${{ runner.os }}-pio
- uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Install PlatformIO Core
run: pip install --upgrade platformio

- name: Build PlatformIO Project
run: pio run -e ${{ matrix.target }}

- name: Create build folder
run: mkdir -p build

- name: Move builded firmware to artifacts
run: mv .pio/build/${{ matrix.target }}/firmware.bin build/${{ matrix.target }}_nightly_firmware.bin

- name: Archive build results of ${{ matrix.target }}
uses: actions/upload-artifact@v3
with:
name: pio-build
path: build/*_firmware.bin

release:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- name: Download all workflow run artifacts
uses: actions/download-artifact@v3
with:
name: pio-build
path: build

- uses: actions/setup-python@v4
with:
python-version: '3.11'

- name: Build X10A definitions
run: python3 scripts/build_x10a_commands.py

- name: Build CAN definitions
run: python3 scripts/build_can_commands.py

- name: Create info file
run: |
echo -e "ref: $GITHUB_REF \ncommit: $GITHUB_SHA\nbuild: $(date +"%Y-%m-%dT%H:%M:%SZ")" > build/info.txt

- name: Rename folder name
run: mv build nightly-build

- uses: vimtor/action-zip@v1
with:
files: nightly-build/
recursive: false
dest: nightly-build.zip

- name: Archive production artifacts
uses: actions/upload-artifact@v3
with:
name: nightly-build
path: nightly-build.zip

- uses: geekyeggo/delete-artifact@v2
with:
name: pio-build

- name: Update nightly release
uses: pyTooling/Actions/releaser@r0
with:
tag: nightly
rm: true
token: ${{ secrets.GITHUB_TOKEN }}
files: nightly-build.zip
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
.vscode/c_cpp_properties.json
.vscode/launch.json
.vscode/ipch
src/setup.h
private/
build/
.vscode/settings.json
sdkconfig.*
contrib/ldd_decoder/bin/
contrib/ldd_decoder/obj/
contrib/ldd_decoder/label_defines.*
src/my_setup.h
DaikinLogger.sln
managed_components/
dependencies.lock
.mono
1 change: 1 addition & 0 deletions .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"platformio.platformio-ide"
],
"unwantedRecommendations": [
"ms-dotnettools.csharp",
"ms-vscode.cpptools-extension-pack"
]
}
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
cmake_minimum_required(VERSION 3.16.0)
include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(ESPAltherma)
3 changes: 2 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
MIT License

Copyright (c) 2020 Raomin
Original work Copyright (c) 2020 Raomin
Modified work Copyright (c) 2023 Munzili

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Loading
Loading