Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
89f176b188 | ||
|
|
b78f34c1d3 | ||
|
|
f9d8fc7a61 | ||
|
|
c77b9c8503 | ||
|
|
1096585b56 |
No files matched your search
@@ -6,6 +6,18 @@ on:
|
|||||||
GITEA_TOKEN:
|
GITEA_TOKEN:
|
||||||
description: 'Token für Gitea API-Zugriff'
|
description: 'Token für Gitea API-Zugriff'
|
||||||
required: true
|
required: true
|
||||||
|
FILAMAN_SSH_PRIVATE_KEY:
|
||||||
|
description: 'SSH Private Key für Deployment'
|
||||||
|
required: true
|
||||||
|
FILAMAN_SSH_HOST:
|
||||||
|
description: 'SSH Host für Deployment'
|
||||||
|
required: true
|
||||||
|
FILAMAN_SSH_USER:
|
||||||
|
description: 'SSH User für Deployment'
|
||||||
|
required: true
|
||||||
|
FILAMAN_SSH_FIRMWARE_PATH:
|
||||||
|
description: 'SSH Pfad für Firmware Upload'
|
||||||
|
required: true
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
version:
|
version:
|
||||||
@@ -212,3 +224,31 @@ jobs:
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
- name: SSH-Deploy Firmware
|
||||||
|
if: success()
|
||||||
|
env:
|
||||||
|
SSH_PRIVATE_KEY: ${{ secrets.FILAMAN_SSH_PRIVATE_KEY }}
|
||||||
|
SSH_HOST: ${{ secrets.FILAMAN_SSH_HOST }}
|
||||||
|
SSH_USER: ${{ secrets.FILAMAN_SSH_USER }}
|
||||||
|
SSH_PATH: ${{ secrets.FILAMAN_SSH_FIRMWARE_PATH }}
|
||||||
|
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
||||||
|
run: |
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
# SSH-Key einrichten
|
||||||
|
mkdir -p ~/.ssh
|
||||||
|
echo "$SSH_PRIVATE_KEY" > ~/.ssh/id_rsa
|
||||||
|
chmod 600 ~/.ssh/id_rsa
|
||||||
|
ssh-keyscan -H "$SSH_HOST" >> ~/.ssh/known_hosts 2>/dev/null
|
||||||
|
|
||||||
|
cd .pio/build/esp32dev
|
||||||
|
|
||||||
|
# Full-Binary per SCP hochladen
|
||||||
|
echo "📤 Upload filaman_full_${VERSION}.bin per SCP ..."
|
||||||
|
scp -o StrictHostKeyChecking=no "filaman_full_${VERSION}.bin" "${SSH_USER}@${SSH_HOST}:${SSH_PATH}/filaman_full.bin"
|
||||||
|
|
||||||
|
echo "✅ filaman_full.bin auf ${SSH_HOST}:${SSH_PATH}/ hochgeladen."
|
||||||
|
|
||||||
|
# Aufräumen
|
||||||
|
rm -f ~/.ssh/id_rsa
|
||||||
@@ -6,15 +6,6 @@ on:
|
|||||||
RELEASE_TOKEN:
|
RELEASE_TOKEN:
|
||||||
description: 'GitHub token for release creation'
|
description: 'GitHub token for release creation'
|
||||||
required: true
|
required: true
|
||||||
FTP_PASSWORD:
|
|
||||||
description: 'FTP Password'
|
|
||||||
required: false
|
|
||||||
FTP_USER:
|
|
||||||
description: 'FTP User'
|
|
||||||
required: false
|
|
||||||
FTP_HOST:
|
|
||||||
description: 'FTP Host'
|
|
||||||
required: false
|
|
||||||
|
|
||||||
permissions:
|
permissions:
|
||||||
contents: write
|
contents: write
|
||||||
@@ -160,29 +151,3 @@ jobs:
|
|||||||
echo "Error: No files found to upload"
|
echo "Error: No files found to upload"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Install lftp
|
|
||||||
run: sudo apt-get install -y lftp
|
|
||||||
|
|
||||||
- name: Upload Firmware via FTP
|
|
||||||
if: success()
|
|
||||||
env:
|
|
||||||
FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
|
|
||||||
FTP_USER: ${{ secrets.FTP_USER }}
|
|
||||||
FTP_HOST: ${{ secrets.FTP_HOST }}
|
|
||||||
VERSION: ${{ steps.get_version.outputs.VERSION }}
|
|
||||||
run: |
|
|
||||||
cd .pio/build/esp32dev
|
|
||||||
if [ -n "$FTP_USER" ] && [ -n "$FTP_PASSWORD" ] && [ -n "$FTP_HOST" ]; then
|
|
||||||
echo "All FTP credentials are present, attempting upload..."
|
|
||||||
lftp -c "set ssl:verify-certificate no; \
|
|
||||||
set ftp:ssl-protect-data true; \
|
|
||||||
set ftp:ssl-force true; \
|
|
||||||
set ssl:check-hostname false; \
|
|
||||||
set ftp:ssl-auth TLS; \
|
|
||||||
open -u $FTP_USER,$FTP_PASSWORD $FTP_HOST; \
|
|
||||||
put -O / filaman_full_${VERSION}.bin -o filaman_full.bin"
|
|
||||||
else
|
|
||||||
echo "Error: Some FTP credentials are missing"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
@@ -32,9 +32,6 @@ jobs:
|
|||||||
uses: ./.github/workflows/github-release.yml
|
uses: ./.github/workflows/github-release.yml
|
||||||
secrets:
|
secrets:
|
||||||
RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
RELEASE_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
FTP_PASSWORD: ${{ secrets.FTP_PASSWORD }}
|
|
||||||
FTP_USER: ${{ secrets.FTP_USER }}
|
|
||||||
FTP_HOST: ${{ secrets.FTP_HOST }}
|
|
||||||
|
|
||||||
gitea-release:
|
gitea-release:
|
||||||
needs: detect-provider
|
needs: detect-provider
|
||||||
@@ -42,3 +39,7 @@ jobs:
|
|||||||
uses: ./.github/workflows/gitea-release.yml
|
uses: ./.github/workflows/gitea-release.yml
|
||||||
secrets:
|
secrets:
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||||
|
FILAMAN_SSH_PRIVATE_KEY: ${{ secrets.FILAMAN_SSH_PRIVATE_KEY }}
|
||||||
|
FILAMAN_SSH_HOST: ${{ secrets.FILAMAN_SSH_HOST }}
|
||||||
|
FILAMAN_SSH_USER: ${{ secrets.FILAMAN_SSH_USER }}
|
||||||
|
FILAMAN_SSH_FIRMWARE_PATH: ${{ secrets.FILAMAN_SSH_FIRMWARE_PATH }}
|
||||||
+1
-1
@@ -9,7 +9,7 @@
|
|||||||
; https://docs.platformio.org/page/projectconf.html
|
; https://docs.platformio.org/page/projectconf.html
|
||||||
|
|
||||||
[common]
|
[common]
|
||||||
version = "3.2.1"
|
version = "3.2.3"
|
||||||
to_old_version = "3.0.9"
|
to_old_version = "3.0.9"
|
||||||
|
|
||||||
##
|
##
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ bool detectBambuTag(const uint8_t* uid, uint8_t uidLength) {
|
|||||||
// Create UID string with separators (same format as NTAG)
|
// Create UID string with separators (same format as NTAG)
|
||||||
String uidString = "";
|
String uidString = "";
|
||||||
for (uint8_t i = 0; i < uidLength; i++) {
|
for (uint8_t i = 0; i < uidLength; i++) {
|
||||||
|
if (uid[i] < 0x10) uidString += "0";
|
||||||
uidString += String(uid[i], HEX);
|
uidString += String(uid[i], HEX);
|
||||||
if (i < uidLength - 1) {
|
if (i < uidLength - 1) {
|
||||||
uidString += ":";
|
uidString += ":";
|
||||||
@@ -1639,6 +1640,7 @@ void writeJsonToTag(void *parameter) {
|
|||||||
|
|
||||||
if (success) {
|
if (success) {
|
||||||
for (uint8_t i = 0; i < uidLength; i++) {
|
for (uint8_t i = 0; i < uidLength; i++) {
|
||||||
|
if (uid[i] < 0x10) uidString += "0";
|
||||||
uidString += String(uid[i], HEX);
|
uidString += String(uid[i], HEX);
|
||||||
if (i < uidLength - 1) {
|
if (i < uidLength - 1) {
|
||||||
uidString += ":"; // Trennzeichen hinzufügen
|
uidString += ":"; // Trennzeichen hinzufügen
|
||||||
@@ -1980,6 +1982,7 @@ void scanRfidTask(void * parameter) {
|
|||||||
String uidString = "";
|
String uidString = "";
|
||||||
for (uint8_t i = 0; i < uidLength; i++) {
|
for (uint8_t i = 0; i < uidLength; i++) {
|
||||||
//TBD: Rework to remove all the string operations
|
//TBD: Rework to remove all the string operations
|
||||||
|
if (uid[i] < 0x10) uidString += "0";
|
||||||
uidString += String(uid[i], HEX);
|
uidString += String(uid[i], HEX);
|
||||||
if (i < uidLength - 1) {
|
if (i < uidLength - 1) {
|
||||||
uidString += ":"; // Optional: Trennzeichen hinzufügen
|
uidString += ":"; // Optional: Trennzeichen hinzufügen
|
||||||
|
|||||||
Reference in new issue
Block a user