Skip to content

Commit e8b09c1

Browse files
committed
Fix firmware copy bug
1 parent b2d5f4c commit e8b09c1

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

.github/workflows/build.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ jobs:
106106
unzip *.atpack -d ./DFP
107107
- name: build-firmware
108108
run: |
109-
mkdir temp
109+
mkdir -p temp
110+
rm -rf ./temp/*
110111
111112
libraries=""
112113
@@ -145,7 +146,7 @@ jobs:
145146
TOOLCHAIN: "3.7.0.1796"
146147
DFP: "ATtiny_DFP.2.0.368"
147148
DEVICE: "attiny1606"
148-
OutputFolder: "./output"
149+
OutputFolder: "./output-test"
149150
FirmwareName: "DIU_TEST"
150151
runs-on: ubuntu-latest
151152
steps:
@@ -165,9 +166,10 @@ jobs:
165166
run: |
166167
wget http://packs.download.atmel.com/Atmel.${{ env.DFP }}.atpack
167168
unzip *.atpack -d ./DFP
168-
- name: build-firmware
169+
- name: build-test-firmware
169170
run: |
170-
mkdir temp
171+
mkdir -p temp_test
172+
rm -rf ./temp_test/*
171173
172174
libraries=""
173175
@@ -180,19 +182,19 @@ jobs:
180182
filename=$(basename -- "$first_file")
181183
filename="${filename%.*}"
182184
183-
./avr8-gnu-toolchain-linux_x86_64/bin/avr-gcc -g -x c -O1 -mmcu=${{ env.DEVICE }} -std=gnu99 -B ./DFP/gcc/dev/${{ env.DEVICE }} -I ./DFP/include -c ./firmware/lib/${name##*/}/${filename}.c -o ./temp/${filename}.o
185+
./avr8-gnu-toolchain-linux_x86_64/bin/avr-gcc -g -x c -O1 -mmcu=${{ env.DEVICE }} -std=gnu99 -B ./DFP/gcc/dev/${{ env.DEVICE }} -I ./DFP/include -c ./firmware/lib/${name##*/}/${filename}.c -o ./temp_test/${filename}.o
184186
185-
libraries+="./temp/${filename}.o "
187+
libraries+="./temp_test/${filename}.o "
186188
done
187189
188-
./avr8-gnu-toolchain-linux_x86_64/bin/avr-gcc -g -x c -O1 -mmcu=${{ env.DEVICE }} -std=gnu99 -B ./DFP/gcc/dev/${{ env.DEVICE }} -I ./DFP/include -c ./firmware/${{ env.FirmwareName }}/main.c -o ./temp/main.o
189-
./avr8-gnu-toolchain-linux_x86_64/bin/avr-gcc -g -mmcu=${{ env.DEVICE }} -B ./DFP/gcc/dev/${{ env.DEVICE }} -I ./DFP/include -o ./temp/main.elf ./temp/main.o ${libraries}
190+
./avr8-gnu-toolchain-linux_x86_64/bin/avr-gcc -g -x c -O1 -mmcu=${{ env.DEVICE }} -std=gnu99 -B ./DFP/gcc/dev/${{ env.DEVICE }} -I ./DFP/include -c ./firmware/${{ env.FirmwareName }}/main.c -o ./temp_test/main.o
191+
./avr8-gnu-toolchain-linux_x86_64/bin/avr-gcc -g -mmcu=${{ env.DEVICE }} -B ./DFP/gcc/dev/${{ env.DEVICE }} -I ./DFP/include -o ./temp_test/main.elf ./temp_test/main.o ${libraries}
190192
191-
./avr8-gnu-toolchain-linux_x86_64/bin/avr-objcopy -j .text -j .data -O ihex ./temp/main.elf ${{ env.OutputFolder }}/${{ env.FirmwareName }}_t1606.hex
192-
./avr8-gnu-toolchain-linux_x86_64/bin/avr-objcopy -j .eeprom --change-section-lma .eeprom=0 -O ihex ./temp/main.elf ${{ env.OutputFolder }}/${{ env.FirmwareName }}_t1606.eep
193+
./avr8-gnu-toolchain-linux_x86_64/bin/avr-objcopy -j .text -j .data -O ihex ./temp_test/main.elf ${{ env.OutputFolder }}/${{ env.FirmwareName }}_t1606.hex
194+
./avr8-gnu-toolchain-linux_x86_64/bin/avr-objcopy -j .eeprom --change-section-lma .eeprom=0 -O ihex ./temp_test/main.elf ${{ env.OutputFolder }}/${{ env.FirmwareName }}_t1606.eep
193195
194-
tar -czvf build.tar.gz ${{ env.OutputFolder }}
195-
zip -r build.zip ${{ env.OutputFolder }}
196+
tar -czvf test-build.tar.gz ${{ env.OutputFolder }}
197+
zip -r test-build.zip ${{ env.OutputFolder }}
196198
197199
- name: upload-test-firmware
198200
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)