Skip to content

Commit

Permalink
Merge pull request #83 from AxxAxx/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
AxxAxx authored Nov 16, 2024
2 parents 4ff6a83 + 936f9af commit 15ecab2
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 1 deletion.
37 changes: 37 additions & 0 deletions .github/workflows/build-main.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Build Main

on:
push:
branches:
- main

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Build Docker image
run: cd AxxSolder_firmware && docker build -t firmware-builder -f Containerfile .

- name: Set firmware path
run: echo "FIRMWARE_PATH=AxxSolder-${GITHUB_REF#refs/tags/}.bin" >> $GITHUB_ENV

- name: Run firmware build and copy artifact
if: startsWith(github.ref, 'refs/tags/')
run: |
cd AxxSolder_firmware
docker run --rm \
-v ${{ github.workspace }}:/workspace \
-w /workspace \
firmware-builder \
cp /app/build/AxxSolder.bin /workspace/${FIRMWARE_PATH}
- name: Upload firmware artifact
if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v4
with:
name: firmware
path: ${{ env.FIRMWARE_PATH }}
2 changes: 1 addition & 1 deletion AxxSolder_firmware/Core/Src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1416,7 +1416,7 @@ int main(void)

/* initialize moving average functions */
Moving_Average_Init(&thermocouple_temperature_filter_struct,2);
Moving_Average_Init(&thermocouple_temperature_filtered_filter_struct,30);
Moving_Average_Init(&thermocouple_temperature_filtered_filter_struct,50);
Moving_Average_Init(&requested_power_filtered_filter_struct,20);
Moving_Average_Init(&mcu_temperature_filter_struct,100);
Moving_Average_Init(&input_voltage_filterStruct,25);
Expand Down

0 comments on commit 15ecab2

Please sign in to comment.