diff --git a/.github/workflows/gitea-release.yml b/.github/workflows/gitea-release.yml index f16e747..95a609a 100644 --- a/.github/workflows/gitea-release.yml +++ b/.github/workflows/gitea-release.yml @@ -206,36 +206,3 @@ jobs: fi fi done - - - name: Install lftp - run: sudo apt-get install -y lftp - - - name: Upload Firmware via FTP - if: success() - env: - FTP_PASSWORD: ${{ vars.FTP_PASSWORD }} - FTP_USER: ${{ vars.FTP_USER }} - FTP_HOST: ${{ vars.FTP_HOST }} - VERSION: ${{ steps.get_version.outputs.VERSION }} - run: | - echo "Environment variables:" - env | grep -E '^FTP_' | while read -r line; do - var_name=$(echo "$line" | cut -d= -f1) - var_value=$(echo "$line" | cut -d= -f2-) - echo "$var_name is $(if [ -n "$var_value" ]; then echo "set"; else echo "empty"; fi)" - done - - 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 \ No newline at end of file diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml index b1b5b37..d7fff11 100644 --- a/.github/workflows/github-release.yml +++ b/.github/workflows/github-release.yml @@ -149,4 +149,37 @@ jobs: else echo "Error: No files found to upload" exit 1 - fi \ No newline at end of file + fi + + - name: Install lftp + run: sudo apt-get install -y lftp + + - name: Upload Firmware via FTP + if: success() + env: + FTP_PASSWORD: ${{ vars.FTP_PASSWORD }} + FTP_USER: ${{ vars.FTP_USER }} + FTP_HOST: ${{ vars.FTP_HOST }} + VERSION: ${{ steps.get_version.outputs.VERSION }} + run: | + echo "Environment variables:" + env | grep -E '^FTP_' | while read -r line; do + var_name=$(echo "$line" | cut -d= -f1) + var_value=$(echo "$line" | cut -d= -f2-) + echo "$var_name is $(if [ -n "$var_value" ]; then echo "set"; else echo "empty"; fi)" + done + + 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 \ No newline at end of file diff --git a/README.de.md b/README.de.md index 07c8c3d..a3bd989 100644 --- a/README.de.md +++ b/README.de.md @@ -102,6 +102,20 @@ Deutsches Erklärvideo: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62zaO - Verbindungskabel ### Schritt-für-Schritt Installation +## Einfache Installation +1. **Gehe auf https://www.filaman.app/installer.html + +2. **Stecke dein ESP an den Rechner und klicke Connect + +3. **Wähle dein Device Port und klicke Intall + +4. **Ersteinrichtung:** + - Mit dem "FilaMan" WLAN-Zugangspunkt verbinden. + - WLAN-Einstellungen über das Konfigurationsportal vornehmen. + - Weboberfläche unter `http://filaman.local` oder der IP-Adresse aufrufen. + +## Compile by yourself + 1. **Repository klonen:** ```bash git clone https://github.com/ManuelW77/Filaman.git diff --git a/README.md b/README.md index 53061d1..8bf4260 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,19 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z - Connecting wires ### Step-by-Step Installation +## Easy Installation +1. **Go to https://www.filaman.app/installer.html + +2. **Plug you device in and push Connect button + +3. **Select your Device Port and push Intall + +4. **Initial Setup:** + - Connect to the "FilaMan" WiFi access point. + - Configure WiFi settings through the captive portal. + - Access the web interface at `http://filaman.local` or the IP address. + +## Compile by yourself 1. **Clone the Repository:** ```bash git clone https://github.com/ManuelW77/Filaman.git @@ -124,25 +137,6 @@ german explanatory video: [Youtube](https://youtu.be/uNDe2wh9SS8?si=b-jYx4I1w62z - Configure WiFi settings through the captive portal. - Access the web interface at `http://filaman.local` or the IP address. -## GitHub Actions Configuration - -### Required Secrets for Gitea Releases - -When using Gitea as your repository host, you need to configure the following secrets in your repository: - -- `GITEA_API_URL`: The base URL of your Gitea instance, including protocol (e.g., `https://git.example.com`) -- `GITEA_TOKEN`: Your Gitea access token with permissions to create releases -- `GITEA_REPOSITORY`: The repository name in format `owner/repo` (e.g., `username/filaman`) - -Example values: -``` -GITEA_API_URL=https://git.example.com -GITEA_TOKEN=abcdef1234567890 -GITEA_REPOSITORY=username/filaman -``` - -Make sure to set these secrets in your repository settings under Settings > Secrets and Variables > Actions. - ## Documentation ### Relevant Links