Skip to content

Commit 2e84501

Browse files
aerodomigueaerodomigue
committed
Merge branch 'BUGFIX_2025_07_13_RemoveLegacyDoorControl'
2 parents 6eca3e8 + 3d69999 commit 2e84501

File tree

3 files changed

+124
-124
lines changed

3 files changed

+124
-124
lines changed

‎.github/workflows/push-to-blledflasher.yml‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,68 @@
1-
name: Push Firmware to BLLED-Flasher
1+
# name: Push Firmware to BLLED-Flasher
22

3-
on:
4-
release:
5-
types: [published, edited]
3+
# on:
4+
# release:
5+
# types: [published, edited]
66

7-
jobs:
8-
push-firmware:
9-
runs-on: ubuntu-latest
7+
# jobs:
8+
# push-firmware:
9+
# runs-on: ubuntu-latest
1010

11-
steps:
12-
- name: Checkout BLLEDController-NG
13-
uses: actions/checkout@v3
11+
# steps:
12+
# - name: Checkout BLLEDController-NG
13+
# uses: actions/checkout@v3
1414

15-
- name: Download .bin from current release
16-
uses: actions/github-script@v6
17-
with:
18-
github-token: ${{ secrets.GITHUB_TOKEN }}
19-
script: |
20-
const fs = require('fs');
21-
const owner = context.repo.owner;
22-
const repo = context.repo.repo;
23-
const release = context.payload.release;
24-
const tag = release.tag_name;
15+
# - name: Download .bin from current release
16+
# uses: actions/github-script@v6
17+
# with:
18+
# github-token: ${{ secrets.GITHUB_TOKEN }}
19+
# script: |
20+
# const fs = require('fs');
21+
# const owner = context.repo.owner;
22+
# const repo = context.repo.repo;
23+
# const release = context.payload.release;
24+
# const tag = release.tag_name;
2525

26-
const assets = release.assets.filter(a => a.name.endsWith('.bin'));
27-
if (assets.length === 0) {
28-
core.setFailed("No .bin files found in release");
29-
return;
30-
}
26+
# const assets = release.assets.filter(a => a.name.endsWith('.bin'));
27+
# if (assets.length === 0) {
28+
# core.setFailed("No .bin files found in release");
29+
# return;
30+
# }
3131

32-
fs.mkdirSync('firmware', { recursive: true });
32+
# fs.mkdirSync('firmware', { recursive: true });
3333

34-
for (const asset of assets) {
35-
const dl = await github.rest.repos.getReleaseAsset({
36-
owner,
37-
repo,
38-
asset_id: asset.id,
39-
headers: { Accept: 'application/octet-stream' }
40-
});
34+
# for (const asset of assets) {
35+
# const dl = await github.rest.repos.getReleaseAsset({
36+
# owner,
37+
# repo,
38+
# asset_id: asset.id,
39+
# headers: { Accept: 'application/octet-stream' }
40+
# });
4141

42-
fs.writeFileSync(`firmware/${asset.name}`, Buffer.from(dl.data));
43-
console.log(`✅ Downloaded: ${asset.name}`);
44-
}
42+
# fs.writeFileSync(`firmware/${asset.name}`, Buffer.from(dl.data));
43+
# console.log(`✅ Downloaded: ${asset.name}`);
44+
# }
4545

46-
- name: Clone BLLED-Flasher repo
47-
run: |
48-
git clone https://x-access-token:${{ secrets.BLLED_FLASHER_TOKEN }}@github.com/softwarecrash/BLLED-Flasher.git flasher
49-
cp firmware/*.bin flasher/firmware/
46+
# - name: Clone BLLED-Flasher repo
47+
# run: |
48+
# git clone https://x-access-token:${{ secrets.BLLED_FLASHER_TOKEN }}@github.com/softwarecrash/BLLED-Flasher.git flasher
49+
# cp firmware/*.bin flasher/firmware/
5050

51-
- name: Generate firmware.json + manifests
52-
run: |
53-
cd flasher
54-
node generateRelease.js
51+
# - name: Generate firmware.json + manifests
52+
# run: |
53+
# cd flasher
54+
# node generateRelease.js
5555

56-
- name: Commit and Push to BLLED-Flasher
57-
run: |
58-
cd flasher
59-
git config user.name "BLLED Release Bot"
60-
git config user.email "actions@github.com"
61-
git fetch origin
62-
git add firmware/
63-
if git diff --cached --quiet; then
64-
echo "✅ Keine Änderungen – kein Push."
65-
else
66-
git commit -m "📦 Add firmware from release ${{ github.event.release.tag_name }}"
67-
git push
68-
fi
56+
# - name: Commit and Push to BLLED-Flasher
57+
# run: |
58+
# cd flasher
59+
# git config user.name "BLLED Release Bot"
60+
# git config user.email "actions@github.com"
61+
# git fetch origin
62+
# git add firmware/
63+
# if git diff --cached --quiet; then
64+
# echo "✅ Keine Änderungen – kein Push."
65+
# else
66+
# git commit -m "📦 Add firmware from release ${{ github.event.release.tag_name }}"
67+
# git push
68+
# fi

‎.github/workflows/push-to-universalflasher.yml‎

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
name: Push Firmware to Universal-Flasher
1+
# name: Push Firmware to Universal-Flasher
22

3-
on:
4-
release:
5-
types: [published, edited]
3+
# on:
4+
# release:
5+
# types: [published, edited]
66

7-
env:
8-
TARGET_DIR: BLLED
7+
# env:
8+
# TARGET_DIR: BLLED
99

10-
jobs:
11-
push-firmware:
12-
runs-on: ubuntu-latest
10+
# jobs:
11+
# push-firmware:
12+
# runs-on: ubuntu-latest
1313

14-
steps:
15-
- name: Checkout this firmware repo
16-
uses: actions/checkout@v3
14+
# steps:
15+
# - name: Checkout this firmware repo
16+
# uses: actions/checkout@v3
1717

18-
- name: Download .bin from current release
19-
uses: actions/github-script@v6
20-
env:
21-
TARGET_DIR: ${{ env.TARGET_DIR }}
22-
with:
23-
github-token: ${{ secrets.GITHUB_TOKEN }}
24-
script: |
25-
const fs = require('fs');
26-
const path = require('path');
18+
# - name: Download .bin from current release
19+
# uses: actions/github-script@v6
20+
# env:
21+
# TARGET_DIR: ${{ env.TARGET_DIR }}
22+
# with:
23+
# github-token: ${{ secrets.GITHUB_TOKEN }}
24+
# script: |
25+
# const fs = require('fs');
26+
# const path = require('path');
2727

28-
const owner = context.repo.owner;
29-
const repo = context.repo.repo;
30-
const release = context.payload.release;
31-
const assets = release.assets.filter(a => a.name.endsWith('.bin'));
28+
# const owner = context.repo.owner;
29+
# const repo = context.repo.repo;
30+
# const release = context.payload.release;
31+
# const assets = release.assets.filter(a => a.name.endsWith('.bin'));
3232

33-
if (assets.length === 0) {
34-
core.setFailed("❌ No .bin files found in release");
35-
return;
36-
}
33+
# if (assets.length === 0) {
34+
# core.setFailed("❌ No .bin files found in release");
35+
# return;
36+
# }
3737

38-
const targetDir = path.join('firmware', process.env.TARGET_DIR);
39-
fs.mkdirSync(targetDir, { recursive: true });
38+
# const targetDir = path.join('firmware', process.env.TARGET_DIR);
39+
# fs.mkdirSync(targetDir, { recursive: true });
4040

41-
for (const asset of assets) {
42-
const dl = await github.rest.repos.getReleaseAsset({
43-
owner,
44-
repo,
45-
asset_id: asset.id,
46-
headers: { Accept: 'application/octet-stream' }
47-
});
41+
# for (const asset of assets) {
42+
# const dl = await github.rest.repos.getReleaseAsset({
43+
# owner,
44+
# repo,
45+
# asset_id: asset.id,
46+
# headers: { Accept: 'application/octet-stream' }
47+
# });
4848

49-
const filePath = path.join(targetDir, asset.name);
50-
fs.writeFileSync(filePath, Buffer.from(dl.data));
51-
console.log(`✅ Downloaded: ${filePath}`);
52-
}
49+
# const filePath = path.join(targetDir, asset.name);
50+
# fs.writeFileSync(filePath, Buffer.from(dl.data));
51+
# console.log(`✅ Downloaded: ${filePath}`);
52+
# }
5353

54-
- name: Clone BLLED-Flasher repo
55-
run: |
56-
git clone https://x-access-token:${{ secrets.BLLED_FLASHER_TOKEN }}@github.com/DutchDevelop/blledsetup.git flasher
54+
# - name: Clone BLLED-Flasher repo
55+
# run: |
56+
# git clone https://x-access-token:${{ secrets.BLLED_FLASHER_TOKEN }}@github.com/DutchDevelop/blledsetup.git flasher
5757

58-
- name: Copy firmware to Flasher repo
59-
run: |
60-
mkdir -p flasher/firmware/${{ env.TARGET_DIR }}
61-
cp -r firmware/${{ env.TARGET_DIR }}/* flasher/firmware/${{ env.TARGET_DIR }}/
58+
# - name: Copy firmware to Flasher repo
59+
# run: |
60+
# mkdir -p flasher/firmware/${{ env.TARGET_DIR }}
61+
# cp -r firmware/${{ env.TARGET_DIR }}/* flasher/firmware/${{ env.TARGET_DIR }}/
6262

63-
- name: Generate manifests and firmware.json
64-
run: |
65-
cd flasher
66-
node generateRelease.js
63+
# - name: Generate manifests and firmware.json
64+
# run: |
65+
# cd flasher
66+
# node generateRelease.js
6767

68-
- name: Commit and Push to BLLED-Flasher
69-
run: |
70-
cd flasher
71-
git config user.name "BLLED Release Bot"
72-
git config user.email "actions@github.com"
73-
git fetch origin
74-
git add firmware/
75-
if git diff --cached --quiet; then
76-
echo "✅ No changes to commit."
77-
else
78-
git commit -m "📦 Add firmware from release ${{ github.event.release.tag_name }} into ${{ env.TARGET_DIR }}"
79-
git push
80-
fi
68+
# - name: Commit and Push to BLLED-Flasher
69+
# run: |
70+
# cd flasher
71+
# git config user.name "BLLED Release Bot"
72+
# git config user.email "actions@github.com"
73+
# git fetch origin
74+
# git add firmware/
75+
# if git diff --cached --quiet; then
76+
# echo "✅ No changes to commit."
77+
# else
78+
# git commit -m "📦 Add firmware from release ${{ github.event.release.tag_name }} into ${{ env.TARGET_DIR }}"
79+
# git push
80+
# fi

‎platformio.ini‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
[env:esp32dev]
1212
custom_project_name = BLLC
1313
custom_project_codename = Balder
14-
custom_version = 2.2.3 #BLLC_[Major].[Minor].[Patch]
14+
custom_version = 2.2.4-aerodomigue #BLLC_[Major].[Minor].[Patch]
1515
platform = espressif32
1616
board = esp32dev
1717
framework = arduino

0 commit comments

Comments
 (0)