Compare commits

...

4 Commits

Author SHA1 Message Date
Pavel Zakopaylo
b8f0875282
Merge 67bd1bd468 into a67a771bd6 2024-12-14 05:29:23 +00:00
Ben V. Brown
a67a771bd6
Merge pull request #72 from ia/artifact-zip
workflows/build.yml: remove redundant zip extension from file names of artifacts
2024-12-13 12:32:58 +11:00
Ivan Zorin
1cef97ca89 workflows/build.yml: remove redundant zip extension from file names of artifacts 2024-12-13 03:20:20 +03:00
Pavel Zakopaylo
67bd1bd468
Minor fix: blisp_device_flash_erase errors were ignored 2023-11-30 19:57:47 +11:00
2 changed files with 7 additions and 7 deletions

View File

@ -37,7 +37,7 @@ jobs:
- name: Upload results - name: Upload results
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: blips-windows-x86_64.zip name: blips-windows-x86_64
path: | path: |
build/tools/blisp/Release/blisp.exe build/tools/blisp/Release/blisp.exe
if-no-files-found: error if-no-files-found: error
@ -58,7 +58,7 @@ jobs:
- name: Upload results - name: Upload results
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: blips-apple-universal.zip name: blips-apple-universal
path: | path: |
build/tools/blisp/blisp build/tools/blisp/blisp
if-no-files-found: error if-no-files-found: error
@ -79,7 +79,7 @@ jobs:
- name: Upload results - name: Upload results
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: blips-linux-x86_64.zip name: blips-linux-x86_64
path: | path: |
build/tools/blisp/blisp build/tools/blisp/blisp
if-no-files-found: error if-no-files-found: error
@ -151,7 +151,7 @@ jobs:
- name: Upload results - name: Upload results
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: blisp-linux-${{ matrix.arch }}.zip name: blisp-linux-${{ matrix.arch }}
path: | path: |
artifacts/blisp-* artifacts/blisp-*
if-no-files-found: error if-no-files-found: error

View File

@ -360,13 +360,13 @@ blisp_return_t blisp_device_flash_erase(struct blisp_device* device,
*(uint32_t*)(payload + 4) = end_address; *(uint32_t*)(payload + 4) = end_address;
blisp_return_t ret = blisp_send_command(device, 0x30, payload, 8, true); blisp_return_t ret = blisp_send_command(device, 0x30, payload, 8, true);
if (ret < 0) if (ret != BLISP_OK)
return ret; return ret;
do { do {
ret = blisp_receive_response(device, false); ret = blisp_receive_response(device, false);
} while (ret == BLISP_ERR_PENDING); } while (ret == BLISP_ERR_PENDING);
return 0; return ret;
} }
blisp_return_t blisp_device_flash_write(struct blisp_device* device, blisp_return_t blisp_device_flash_write(struct blisp_device* device,
@ -414,4 +414,4 @@ blisp_return_t blisp_device_reset(struct blisp_device* device) {
void blisp_device_close(struct blisp_device* device) { void blisp_device_close(struct blisp_device* device) {
struct sp_port* serial_port = device->serial_port; struct sp_port* serial_port = device->serial_port;
sp_close(serial_port); sp_close(serial_port);
} }