diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 42951d0f..907741ca 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -15,13 +15,15 @@ jobs: runs-on: ${{ matrix.os }} steps: - name: Install odrivetool + shell: bash run: | + pip3 list | grep setuptools || echo "setuptools not installed" # show version + pip3 install odrive + env: # TODO: this is a workaround for https://github.com/pypa/setuptools/issues/2353 and we # can remove it as soon as python3-setuptools on GitHub's ubuntu-latest # moves to version 50.1+. - pip3 list | grep setuptools # show version - export SETUPTOOLS_USE_DISTUTILS=stdlib - pip3 install odrive + SETUPTOOLS_USE_DISTUTILS: stdlib # This one currently fails because Github Actions runs pip as non-root #- name: Check if udev rules were set up properly diff --git a/Firmware/communication/can/can_simple.cpp b/Firmware/communication/can/can_simple.cpp index 2e72adfe..348afa6c 100644 --- a/Firmware/communication/can/can_simple.cpp +++ b/Firmware/communication/can/can_simple.cpp @@ -21,6 +21,7 @@ bool CANSimple::renew_subscription(size_t i) { extended_node_ids_[i] = axis.config_.can.is_extended; MsgIdFilterSpecs filter = { + .id = {}, .mask = (uint32_t)(0xffffffff << NUM_CMD_ID_BITS) }; if (axis.config_.can.is_extended) { diff --git a/Firmware/communication/can/odrive_can.cpp b/Firmware/communication/can/odrive_can.cpp index 25c1440b..c771540d 100644 --- a/Firmware/communication/can/odrive_can.cpp +++ b/Firmware/communication/can/odrive_can.cpp @@ -199,7 +199,8 @@ bool ODriveCAN::unsubscribe(CanSubscription* handle) { subscription->fifo = kCanFifoNone; - CAN_FilterTypeDef hal_filter = {.FilterActivation = DISABLE}; + CAN_FilterTypeDef hal_filter = {}; + hal_filter.FilterActivation = DISABLE; return HAL_CAN_ConfigFilter(handle_, &hal_filter) == HAL_OK; }