Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit1477b9f

Browse files
Merge branch 'v1dev' into v1dev-esp
# Conflicts:#platformio.custom.ini
2 parentsce77085 +5e46cb6 commit1477b9f

File tree

7 files changed

+89
-181
lines changed

7 files changed

+89
-181
lines changed
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# Check build of OpenKNX OAM (merging/building of OpenKNX knxprod for combination of all referenced module versions + build of full releases)
2+
# SPDX-License-Identifier: AGPL-3.0-only
3+
# Copyright (C) 2024-2025 Cornelius Koepp
4+
5+
name:openknx-oam-check
6+
run-name:Check OpenKNX OAM Build
7+
8+
on:[push]
9+
10+
jobs:
11+
build:
12+
runs-on:ubuntu-latest
13+
env:
14+
KNXPROD_PREFIX:StateEngine
15+
strategy:
16+
fail-fast:false
17+
matrix:
18+
target:["DFA16-Release", ""]
19+
restore_branch:[false, true]
20+
steps:
21+
-uses:actions/checkout@v4
22+
23+
-name:Restore Project
24+
shell:pwsh
25+
run:|
26+
cd restore
27+
if (${{ matrix.restore_branch }}) {
28+
./Restore-Dependencies-Branch.ps1
29+
} else {
30+
./Restore-Dependencies.ps1
31+
}
32+
33+
-name:Download OpenKNXproducer 3.7.14.0 and Verify
34+
run:|
35+
mkdir OpenKNXproducer
36+
cd OpenKNXproducer
37+
echo '40e30f59deb949704c3ec21e26b3fceb18b418a46443d904383bf4fd99d56461d1d8c39fac756de09079004469d1e868ce33c50768dbe1e3314b304a6fc20c2f *OpenKNXproducer-3.7.14.0.zip' > OpenKNXproducer.checksum
38+
wget -q https://github.com/OpenKNX/OpenKNXproducer/releases/download/v3.7.14/OpenKNXproducer-3.7.14.0.zip
39+
sha512sum OpenKNXproducer-3.7.14.0.zip
40+
sha512sum -c OpenKNXproducer.checksum
41+
-name:Unzip OpenKNXproducer and Make Executable
42+
run:|
43+
cd OpenKNXproducer
44+
unzip OpenKNXproducer-3.7.14.0.zip || test -f tools/Linux/OpenKNXproducer
45+
chmod u+x tools/Linux/OpenKNXproducer
46+
-name:Check OpenKNXproducer
47+
run:OpenKNXproducer/tools/Linux/OpenKNXproducer version || echo Ignore OpenKNXproducer always returning 1...
48+
49+
-name:Install OpenKNXproducer
50+
run:cp -av OpenKNXproducer/tools/Linux/OpenKNXproducer /usr/local/bin/OpenKNXproducer
51+
52+
-name:Create knxprod
53+
run:OpenKNXproducer create --Debug -h include/knxprod.h src/${KNXPROD_PREFIX}${{ matrix.target != '' && format('-{0}', matrix.target) || '' }}
54+
55+
-name:Install Python
56+
uses:actions/setup-python@v5
57+
with:
58+
python-version:'3.8'
59+
60+
-name:Install PlatformIO
61+
run:|
62+
python -m pip install --upgrade pip
63+
pip install virtualenv
64+
virtualenv ~/.platformio/penv
65+
source ~/.platformio/penv/bin/activate
66+
pip install platformio
67+
68+
-name:OpenKNX Release Build
69+
run:pwsh ./scripts/Build-Release.ps1 ${{ matrix.target }}
70+
71+
-name:Show Changed Files
72+
run:git diff

‎.github/workflows/openknx-project-check-action.yml‎

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
1+
#upcoming v0.3
2+
3+
* Fix#8: Wrong Memory-Layout (16MiB instead of 2MiB) was used for some devices.<br /> Affected Devices:
4+
**OpenKNX REG2 PiPico V1*
5+
**OpenKNXiao Mini V1*
6+
* Hardware-Support:
7+
* Add Device*SmartMF 1TE REG*
8+
* Dev-Environment
9+
* Build-Action to Check Full Project
10+
* Add Tasks for Git-Updates
11+
* Documentation
12+
* Extend Readme
13+
14+
115
#2025-03-01 First DFA16 Beta with new ApplicationNumber (16xDFA16 + 48xLOG)
216

317
* Use DFA reduced to 16 states to prevent frequent excessive programming time (was&gt;6 minutes for 32xDFA32 every 10th time) and reduce
418
* Add Support for*OpenKNXiao Mini* Hardware
519

20+
621
#2025-02 Second Beta Release (32xDFA32 + 96xLOG)
722

823
* Update OFM-**DFA** to 0.3.0 (with improvements from first PROD beta-test)

‎platformio.custom.ini‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,14 @@ build_flags =
9898
-D DEVICE_REG1_BASE
9999

100100
[env:release_REG2_PIPICO_V1]
101-
extends = RP2040_custom_releases,RP2040_16MB
101+
extends = RP2040_custom_releases,RP2040_2MB
102102
build_flags =
103103
${RP2040_custom_releases.build_flags}
104104
; replace -D OKNXHW_REG2_PIPICO_V1
105105
-D DEVICE_REG2_PIPICO_V1
106106

107107
[env:release_XIAO_MINI_RP2040_V1]
108-
extends = RP2040_custom_releases,RP2040_16MB
108+
extends = RP2040_custom_releases,RP2040_2MB
109109
build_flags =
110110
${RP2040_custom_releases.build_flags}
111111
-D OKNXHW_OPENKNXIAO_RP2040_MINI_V1

‎restore/Restore-Checkout-Branch.ps1‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎restore/Restore-Checkout-Hash.ps1‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎restore/Restore-Project.ps1‎

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp