diff --git a/.github/workflows/tagged-release.yml b/.github/workflows/tagged-release.yml index 15985c2a..e8b60454 100644 --- a/.github/workflows/tagged-release.yml +++ b/.github/workflows/tagged-release.yml @@ -50,12 +50,9 @@ jobs: command: objcopy args: --release -- -O binary booster-release.bin - - uses: marvinpinto/action-automatic-releases@v1.1.0 - with: - prerelease: false - repo_token: '${{ secrets.ACCESS_TOKEN }}' - files: | - target/thumbv7em/debug/booster - target/thumbv7em/release/booster - booster-debug.bin - booster-release.bin + - name: Generate Release + env: + GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + VERSION_TAG: ${{ github.event.ref##*/ }} + run: | + hub release create -a target/thumbv7em/debug/booster -a target/thumbv7em/release/booster -a booster-debug.bin -a booster-release.bin -m "Release ${{env.VERSION_TAG}}" diff --git a/Cargo.lock b/Cargo.lock index a2869267..0edc2015 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -844,10 +844,11 @@ checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" [[package]] name = "panic-persist" -version = "0.2.1" -source = "git+https://github.com/jamesmunns/panic-persist?branch=master#3f892297e97adc6a415145193000e3749b1959df" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32bb382689ecd2c4d2d4df9fd56700ba8d43b7b31cca11018cc0e6f8aef39fd5" dependencies = [ - "cortex-m 0.6.7", + "cortex-m 0.7.4", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index f33a8a8a..bb343671 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,7 @@ shared-bus = { version = "0.2", features = ["cortex-m"] } usb-device = "0.2.8" postcard = "0.5.1" crc-any = { version = "2.3.5", default-features = false } -panic-persist = { git = "https://github.com/jamesmunns/panic-persist", branch = "master", features = ["custom-panic-handler"] } +panic-persist = { version = "0.3", features = ["custom-panic-handler"] } smoltcp-nal = { version = "0.2.0", optional = true } embedded-time = { version = "0.12.0", optional = true } miniconf = { version = "0.3", features = ["mqtt-client"]} diff --git a/src/hardware/setup.rs b/src/hardware/setup.rs index 4772a6fc..467176f3 100644 --- a/src/hardware/setup.rs +++ b/src/hardware/setup.rs @@ -378,16 +378,14 @@ pub fn setup( serial_number.replace(serial_string); } - let usb_device = UsbDeviceBuilder::new( - usb_bus.as_ref().unwrap(), - // TODO: Look into sub-licensing from ST. - UsbVidPid(0x0483, 0x5740), - ) - .manufacturer("ARTIQ/Sinara") - .product("Booster") - .serial_number(serial_number.as_ref().unwrap().as_str()) - .device_class(usbd_serial::USB_CLASS_CDC) - .build(); + let usb_device = + // USB VID/PID registered at https://pid.codes/1209/3933/ + UsbDeviceBuilder::new(usb_bus.as_ref().unwrap(), UsbVidPid(0x1209, 0x3933)) + .manufacturer("ARTIQ/Sinara") + .product("Booster") + .serial_number(serial_number.as_ref().unwrap().as_str()) + .device_class(usbd_serial::USB_CLASS_CDC) + .build(); (usb_device, usb_serial) };