From e0689082c5c686ee785259f7dcc1c0becf7cf8f3 Mon Sep 17 00:00:00 2001 From: markusC64 Date: Wed, 11 Jan 2023 22:50:01 +0100 Subject: [PATCH 1/4] Config fix --- configs/config-evo2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/config-evo2 b/configs/config-evo2 index 2807717..f5b5de4 100644 --- a/configs/config-evo2 +++ b/configs/config-evo2 @@ -55,7 +55,7 @@ CONFIG_BUFFER_COUNT=6 CONFIG_EEPROM_SIZE=512 CONFIG_EEPROM_OFFSET=512 CONFIG_MAX_PARTITIONS=4 -CONFIG_RTC_DS1307=y +CONFIG_RTC_DSRTC=y CONFIG_REMOTE_DISPLAY=n CONFIG_DISPLAY_BUFFER_SIZE=40 CONFIG_LCD_DISPLAY=y From 3422f95d15222d754bb5d5493ef5964b42b318e6 Mon Sep 17 00:00:00 2001 From: markusC64 Date: Sun, 15 Jan 2023 18:37:40 +0100 Subject: [PATCH 2/4] Workflow added --- .github/workflows/ci.yml | 47 +++++++++++++++++++++++++++++ .github/workflows/release.yml | 57 +++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..538cd7a --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,47 @@ +name: CI +on: + push: + branches: + - devel_lcd + - testing* + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Build dist + run: | + sudo apt-get update + sudo apt-get -y install avr-libc gcc-arm-none-eabi + REV=$(git rev-parse --short HEAD | tr a-z A-Z) + VER=63 + PLUS=+ + make CONFIG=configs/config-uIEC PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-uIEC3 PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-larsp PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-sw1 PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-sw2 PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-arm2iec1 PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-petSD PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-evo2 PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-lcd PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-lcdcf PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + mkdir bin + cp obj-m1281-uIEC/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1281-uIEC.bin + cp obj-m1281-uIEC3/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1281-uIEC3.bin + cp obj-m1284p-larsp/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-larsp.bin + cp obj-m1284p-sw1/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-sw1.bin + cp obj-m1284p-sw2/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-sw2.bin + cp obj-lpc1768-arm2iec1/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-lpc1768-arm2iec1.bin + cp obj-m1284p-petSD/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-petSD.bin + cp obj-m1284p-evo2/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-evo2.bin + cp obj-m1284p-lcd/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-lcd.bin + cp obj-m1284p-lcdcf/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-lcdcf.bin + + - name: Upload artifacts + uses: actions/upload-artifact@v3 + with: + name: sd2iec-firmware + path: bin/ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..afe6d20 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,57 @@ +name: Release +on: + push: + tags: + - '*' + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - name: Build dist + id: build + run: | + sudo apt-get update + sudo apt-get -y install avr-libc + REV=$(git rev-parse --short HEAD | tr a-z A-Z) + VER=63 + PLUS=+ + echo "ver=1.0.0atentdead0-${VER}${PLUS}-$REV" >> $GITHUB_OUTPUT + make CONFIG=configs/config-mbed PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV + make CONFIG=configs/config-uIEC PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-uIEC3 PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-larsp PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-sw1 PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-sw2 PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-arm2iec1 PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-petSD PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-evo2 PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-lcd PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + make CONFIG=configs/config-lcdcf PRERELEASE=ATENTDEAD0-${VER}${PLUS}-$REV-LCD + mkdir bin + cp obj-m1281-uIEC/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1281-uIEC.bin + cp obj-m1281-uIEC3/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1281-uIEC3.bin + cp obj-m1284p-larsp/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-larsp.bin + cp obj-m1284p-sw1/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-sw1.bin + cp obj-m1284p-sw2/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-sw2.bin + cp obj-lpc1768-arm2iec1/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-lpc1768-arm2iec1.bin + cp obj-lpc1768-mbed/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-lpc1768-mbed.bin + cp obj-m1284p-petSD/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-petSD.bin + cp obj-m1284p-evo2/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-evo2.bin + cp obj-m1284p-lcd/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-lcd.bin + cp obj-m1284p-lcdcf/sd2iec.bin bin/sd2iec-1.0.0atentdead0-${VER}${PLUS}-$REV-m1284p-lcdcf.bin + cd bin + zip ../sd2iec-firmware-1.0.0atentdead0-${VER}${PLUS}-$REV.zip sd2iec* + cd .. + + - name: Create Release + uses: softprops/action-gh-release@v1 + with: + files: sd2iec-firmware-${{ steps.build.outputs.ver }}.zip + draft: true + prerelease: false + name: SD2IEC Firmware ${{ steps.build.outputs.ver }} + generate_release_notes: false + body: To be done. \ No newline at end of file From 88be28b67164a8d5dcf8d254c47a60229ed1e9fa Mon Sep 17 00:00:00 2001 From: markusC64 Date: Sun, 15 Jan 2023 18:45:18 +0100 Subject: [PATCH 3/4] Fix compiling evo2 --- scripts/Makefile.main | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.main b/scripts/Makefile.main index 99fa813..598d484 100644 --- a/scripts/Makefile.main +++ b/scripts/Makefile.main @@ -187,12 +187,14 @@ PROGRAMVERSION := $(MAJOR).$(MINOR) BOOT_VERSION := $(BOOT_VERSION)00 endif +LCDVERSION := $(PROGRAMVERSION) ifdef PRERELEASE PROGRAMVERSION := $(PROGRAMVERSION)$(PRERELEASE) +LCDVERSION := $(LCDVERSION) endif LONGVERSION := -$(CONFIGSUFFIX) -CDEFS += -DVERSION=\"$(PROGRAMVERSION)\" -DLONGVERSION=\"$(LONGVERSION)\" +CDEFS += -DVERSION=\"$(PROGRAMVERSION)\" -DLONGVERSION=\"$(LONGVERSION)\" -DLCDVERSION=\"$(LCDVERSION)\" # Define programs and commands. From 833f6164597fb38a32e40f083b4d1c851555f6ae Mon Sep 17 00:00:00 2001 From: markusC64 Date: Fri, 20 Jan 2023 20:24:35 +0100 Subject: [PATCH 4/4] Enable build an all branches --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 538cd7a..38f0515 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,8 +2,7 @@ name: CI on: push: branches: - - devel_lcd - - testing* + - '*' jobs: build: