diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 87883af..86c9a31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,20 +1,27 @@ -# main.yml - # Workflow's name -name: Build Package for Windows +name: Build Application for Windows # Workflow's trigger -on: [push] +on: + push: + tags: + - '*' # Workflow's jobs jobs: # job's id - release: + publish: # job's name - name: Build and Release Package - + name: Build and Publish Release # the type of machine to run the job on runs-on: ubuntu-latest + strategy: + matrix: + include: + - artifact_name: ./artifact/x86/snander.exe + asset_name: SNANDer-Windows-32bit.exe + - artifact_name: ./artifact/x64/snander.exe + asset_name: SNANDer-Windows-64bit.exe if: github.event.repository.owner.id == github.event.sender.id @@ -34,8 +41,8 @@ jobs: sudo -E apt-get update sudo -E apt-get install -y pkg-config mingw-w64 tar wget make - # step3: Build App for Windows - - name: Build App for Windows + # step3: Build App + - name: Build App run: | ./build.sh @@ -50,14 +57,15 @@ jobs: - name: Deliver Package uses: actions/upload-artifact@v2 with: - name: SNANDer_Package + name: SNANDer path: ./artifact/ - # step6: Create Release - - name: Create Release + # step6: Publish Release + - name: Publish Release uses: svenstaro/upload-release-action@v2 with: - repo_token: ${{ secrets.YOURTOKEN }} - file: ./artifact/* + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ${{ matrix.artifact_name }} + asset_name: ${{ matrix.asset_name }} tag: ${{ github.ref }} - file_glob: true + overwrite: true diff --git a/README.md b/README.md index 1b03428..b5a9e70 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ After successful compilation, the target executable file will be generated in th Using `snander` is straightforward: ``` -SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.2 by McMCC +SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.3 by McMCC Usage: -h display this message @@ -61,7 +61,7 @@ For example: ``` $ ./SNANDer -i -SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.2 by McMCC +SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.3 by McMCC Found programmer device: WinChipHead (WCH) - CH341A Device revision is 3.0.4 @@ -78,7 +78,7 @@ $ ``` $ ./SNANDer -d -e -SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.2 by McMCC +SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.3 by McMCC Found programmer device: WinChipHead (WCH) - CH341A Device revision is 3.0.4 @@ -101,7 +101,7 @@ $ ``` $ ./SNANDer -d -v -w ecc_2Gb_2K_64_flashimage_rfb1_ac2600.bin -SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.2 by McMCC +SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.3 by McMCC Found programmer device: WinChipHead (WCH) - CH341A Device revision is 3.0.4 @@ -128,7 +128,7 @@ $ ``` $ ./SNANDer -E 93c46 -r test.bin -SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.2 by McMCC +SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.3 by McMCC Found programmer device: WinChipHead (WCH) - CH341A Device revision is 3.0.4 @@ -147,7 +147,7 @@ Status: OK ``` $ ./SNANDer -E 93c46 -w test.bin -v -SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.2 by McMCC +SNANDer - Serial Nor/nAND/Eeprom programmeR v.1.7.3 by McMCC Found programmer device: WinChipHead (WCH) - CH341A Device revision is 3.0.4 @@ -329,42 +329,43 @@ SPI NOR Flash Support List: 077. ZB25VQ32 078. ZB25VQ64 079. ZB25VQ128 -080. BY25Q16BS -081. BY25Q32BS -082. BY25Q64AS -083. BY25Q128AS -084. XT25F32B +080. BH25D80 +081. BY25Q16BS +082. BY25Q32BS +083. BY25Q64AS +084. BY25Q128AS 085. XT25F32B -086. XT25F64B -087. XT25F128B -088. PM25LQ016 -089. PM25LQ032 -090. PM25LQ064 -091. PM25LQ128 -092. IC25LP016 -093. IC25LP032 -094. IC25LP064 -095. IC25LP128 -096. FS25Q016 -097. FS25Q032 -098. FS25Q064 -099. FS25Q128 -100. FM25W16 -101. FM25W32 -102. FM25W64 -103. FM25W128 -104. FM25Q16A -105. FM25Q32A -106. FM25Q64A -107. FM25Q128A -108. PN25F16 -109. PN25F32 -110. PN25F64 -111. PN25F128 -112. P25Q16H -113. P25Q32H -114. P25Q64H -115. P25Q128H +086. XT25F32B +087. XT25F64B +088. XT25F128B +089. PM25LQ016 +090. PM25LQ032 +091. PM25LQ064 +092. PM25LQ128 +093. IC25LP016 +094. IC25LP032 +095. IC25LP064 +096. IC25LP128 +097. FS25Q016 +098. FS25Q032 +099. FS25Q064 +100. FS25Q128 +101. FM25W16 +102. FM25W32 +103. FM25W64 +104. FM25W128 +105. FM25Q16A +106. FM25Q32A +107. FM25Q64A +108. FM25Q128A +109. PN25F16 +110. PN25F32 +111. PN25F64 +112. PN25F128 +113. P25Q16H +114. P25Q32H +115. P25Q64H +116. P25Q128H I2C EEPROM Support List: 001. 24c01 diff --git a/src/Makefile b/src/Makefile index f4983a9..cdc1130 100644 --- a/src/Makefile +++ b/src/Makefile @@ -63,7 +63,7 @@ install-udev-rule: .PHONY: clean install-udev-rule debian/changelog: - dch --create -v 1.7.2-1 --package $(PKG) + dch --create -v 1.7.3-1 --package $(PKG) deb: dpkg-buildpackage -b -us -uc diff --git a/src/debian/changelog b/src/debian/changelog index b665b6d..8619e5d 100644 --- a/src/debian/changelog +++ b/src/debian/changelog @@ -1,6 +1,5 @@ -snander (1.7.2-1) UNRELEASED; urgency=medium +snander (1.7.3-1) UNRELEASED; urgency=medium - * spi_nand_flash: don't break the loop on erase fail. - * Add support Winbond W25Q16JV(BV) and W25Q16JM SPI Nor Flash. + * Add BH25D80 SPI Nor Flash chip support. -- McMCC Mon, 19 July 2021 04:20:12 +0800 diff --git a/src/debian/control b/src/debian/control index f7c671b..598bd7c 100644 --- a/src/debian/control +++ b/src/debian/control @@ -2,7 +2,7 @@ Source: snander Priority: optional Maintainer: McMCC Build-Depends: debhelper (>= 9) -Standards-Version: 1.7.2 +Standards-Version: 1.7.3 Section: electronics Vcs-Git: https://github.com/McMCCRU/SNANDer.git Vcs-Browser: https://github.com/McMCCRU/SNANDer diff --git a/src/main.c b/src/main.c index b986a92..74295e4 100644 --- a/src/main.c +++ b/src/main.c @@ -47,7 +47,7 @@ extern int org; #define EHELP "" #endif -#define _VER "1.7.2" +#define _VER "1.7.3" void title(void) { diff --git a/src/snander.rc b/src/snander.rc index 4d88851..b853e21 100644 --- a/src/snander.rc +++ b/src/snander.rc @@ -2,8 +2,8 @@ #include "res.h" VS_VERSION_INFO VERSIONINFO - FILEVERSION 1, 7, 2, 0 - PRODUCTVERSION 1, 7, 2, 0 + FILEVERSION 1, 7, 3, 0 + PRODUCTVERSION 1, 7, 3, 0 FILEOS VOS_NT_WINDOWS32 FILETYPE VFT_APP FILESUBTYPE 0 @@ -15,11 +15,11 @@ BEGIN VALUE "FileDescription", "SNANDer - Serial Nor/nAND/Eeprom programmeR\0" VALUE "OriginalFilename", "SNANDer.exe\0" VALUE "CompanyName", "-= (c) 2018-2021 Igor Mokrushin aka McMCC =-\0" - VALUE "FileVersion", "1.7.2.0\0" + VALUE "FileVersion", "1.7.3.0\0" VALUE "InternalName", "SNANDer\0" VALUE "LegalCopyright", "Copyright (c) 2018-2021 by McMCC \0" VALUE "ProductName","SNANDer\0" - VALUE "ProductVersion","1.7.2.0\0" + VALUE "ProductVersion","1.7.3.0\0" END END BLOCK "VarFileInfo" diff --git a/src/spi_nor_flash.c b/src/spi_nor_flash.c index f6fb208..5f3c8ca 100644 --- a/src/spi_nor_flash.c +++ b/src/spi_nor_flash.c @@ -385,6 +385,7 @@ static struct chip_info chips_data [] = { { "ZB25VQ64", 0x5e, 0x40170000, 64 * 1024, 128, 0 }, { "ZB25VQ128", 0x5e, 0x40180000, 64 * 1024, 256, 0 }, + { "BH25D80", 0x68, 0x40146840, 64 * 1024, 16, 0 }, { "BY25Q16BS", 0x68, 0x40150000, 64 * 1024, 32, 0 }, { "BY25Q32BS", 0x68, 0x40160000, 64 * 1024, 64, 0 }, { "BY25Q64AS", 0x68, 0x40170000, 64 * 1024, 128, 0 },