HAL_PX4: fixes for merged upstream PX4Firmware