Checkout to matching firmware if possible

This commit is contained in:
kamilritz 2020-01-23 18:32:29 +01:00 committed by Roman Bapst
parent f3d790a664
commit a3e1eb9d50
2 changed files with 5 additions and 2 deletions

View File

@ -16,7 +16,11 @@ jobs:
repository: PX4/Firmware
ref: master
submodules: recurvise
- run: git submodule update --init --recursive
- name: Checkout matching branch on PX4/Firmware if possible
run: |
git fetch origin
git checkout ${{github.head_ref}} || echo "Firmware branch: ${{github.head_ref}} not found, using master instead"
git submodule update --init --recursive
working-directory: ../Firmware
- name: Configure Firmware to include current ECL version
working-directory: ../Firmware/src/lib/ecl

View File

@ -387,7 +387,6 @@ void EstimatorInterface::setOpticalFlowData(const flowSample& flow)
flowSample optflow_sample_new = flow;
// compensate time-stamp for the trailing edge of the flow data integration period
optflow_sample_new.time_us -= _params.flow_delay_ms * 1000;
optflow_sample_new.time_us -= FILTER_UPDATE_PERIOD_MS * 1000 / 2;