Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2.3.0 cn stillness hotfix #1355

Open
wants to merge 4 commits into
base: v2.3.0-release-cn
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions external-artifacts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,19 +24,19 @@ artifact_sets:
name: multi
artifacts:
- name: fpga_bitstream
version: v2.3.19
version: v2.3.23
s3_bucket: swiftnav-artifacts
s3_repository: piksi_fpga
s3_object: piksi_prod_fpga.bit
local_path: firmware/prod/piksi_fpga.bit
sha256: 484ba408fe4a5b03d2a438fc3f91eb1d6b9c849b6027074336ac9aec514e5b6d
sha256: be304a3002fa43aa7a5bf363e230f64693207aca2444437858d8670be4511490
- name: rtos_elf
version: v2.3.19
version: v2.3.23
s3_bucket: swiftnav-artifacts
s3_repository: piksi_firmware_private
s3_object: v3/piksi_firmware_v3_prod.stripped.elf
local_path: firmware/prod/piksi_firmware.elf
sha256: 346e65897af5f4d40f544262533406fbc653b08fa90bb1e2f37d3584a8d50151
sha256: 8fa12357be6c495fdb6fd9744a615a28897d45936a8a81e164bbd3b0c945e4f7
- name: piksi_upgrade_tool
version: v2.2.6
s3_bucket: swiftnav-artifacts
Expand All @@ -48,19 +48,19 @@ artifact_sets:
name: internal
artifacts:
- name: rtos_elf
version: v2.3.19
version: v2.3.23
s3_bucket: swiftnav-artifacts
s3_repository: piksi_firmware_private
s3_object: v3/piksi_firmware_v3_prod.stripped.elf
local_path: firmware/prod/piksi_firmware.elf
sha256: 346e65897af5f4d40f544262533406fbc653b08fa90bb1e2f37d3584a8d50151
sha256: 8fa12357be6c495fdb6fd9744a615a28897d45936a8a81e164bbd3b0c945e4f7
- name: fpga_bitstream
version: v2.3.19
version: v2.3.23
s3_bucket: swiftnav-artifacts
s3_repository: piksi_fpga
s3_object: piksi_prod_fpga.bit
local_path: firmware/prod/piksi_fpga.bit
sha256: 484ba408fe4a5b03d2a438fc3f91eb1d6b9c849b6027074336ac9aec514e5b6d
sha256: be304a3002fa43aa7a5bf363e230f64693207aca2444437858d8670be4511490
- name: piksi_upgrade_tool
version: v2.2.6
s3_bucket: swiftnav-artifacts
Expand All @@ -79,19 +79,19 @@ artifact_sets:
name: sdk
artifacts:
- name: rtos_elf
version: v2.3.19
version: v2.3.23
s3_bucket: swiftnav-releases
s3_repository: piksi_firmware_private
s3_object: v3/piksi_firmware_v3_prod.stripped.elf
local_path: firmware/prod/piksi_firmware.elf
sha256: 346e65897af5f4d40f544262533406fbc653b08fa90bb1e2f37d3584a8d50151
sha256: 8fa12357be6c495fdb6fd9744a615a28897d45936a8a81e164bbd3b0c945e4f7
- name: fpga_bitstream
version: v2.3.19
version: v2.3.23
s3_bucket: swiftnav-releases
s3_repository: piksi_fpga
s3_object: piksi_sdk_fpga.bit
local_path: firmware/prod/piksi_fpga.bit
sha256: 51a0673a48ec5c6507cd13b5026994a15548545fcbc6995617dea684d8693c0d
sha256: 3032512d629d53f8b34edd876b4f60477dea583883449e4f84e1a402aa997882
- name: piksi_upgrade_tool
version: v2.2.6
s3_bucket: swiftnav-releases
Expand Down
2 changes: 1 addition & 1 deletion package/piksi_ins/piksi_ins_version.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# The piksi-releases project is used to manage the piksi_ins version,
# any updates here will be overwritten the next time piksi-releases
# is run.
PIKSI_RELEASES_INS_VERSION = v2.3.19
PIKSI_RELEASES_INS_VERSION = 9c7269879f0997be0445e79ea0e50a7ba48ee6b3 # tip of v2.3.0-cn-stillness-hotfix
9 changes: 9 additions & 0 deletions package/sbp_protocol/src/sbp_router.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ ports:
filters:
- { action: ACCEPT, prefix: [0x55, 0x4A, 0x00] } # SBP_MSG_OBS
- { action: REJECT }
- dst_port: SBP_PORT_NAV_DAEMON # This list sends only what Smoothpose needs at present.
filters:
- { action: ACCEPT, prefix: [0x55, 0x03, 0x09] } # MSG_ODOMETRY **Smoothpose Change**
- { action: REJECT }

- name: SBP_PORT_FILEIO_FIRMWARE
metric: "sbp/fileio_fw"
Expand Down Expand Up @@ -156,6 +160,10 @@ ports:
- dst_port: SBP_PORT_EXTERNAL
filters:
- { action: ACCEPT }
- dst_port: SBP_PORT_NAV_DAEMON # This list sends only what Smoothpose needs at present.
filters:
- { action: ACCEPT, prefix: [0x55, 0x03, 0x09] } # MSG_ODOMETRY **Smoothpose Change**
- { action: REJECT }

- name: SBP_PORT_SETTINGS_CLIENT
metric: "sbp/settings_client"
Expand Down Expand Up @@ -219,6 +227,7 @@ ports:
- { action: ACCEPT, prefix: [0x55, 0x20, 0x02] } # MSG_ORIENT_QUAT **Smoothpose Change**
- { action: ACCEPT, prefix: [0x55, 0x21, 0x02] } # MSG_ORIENT_EULER **Smoothpose Change**
- { action: ACCEPT, prefix: [0x55, 0x22, 0x02] } # MSG_ANGULAR_RATE **Smoothpose Change**
- { action: ACCEPT, prefix: [0x55, 0x03, 0xFF] } # MSG_INS_STATUS **Smoothpose Change**
- { action: ACCEPT, prefix: [0x55, 0x01, 0x04] } # MSG_LOG **Smoothpose Change**
- { action: REJECT }

Expand Down
8 changes: 8 additions & 0 deletions package/sbp_protocol/src/sbp_router_smoothpose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,10 @@ ports:
filters:
- { action: ACCEPT, prefix: [0x55, 0x4A, 0x00] } # SBP_MSG_OBS
- { action: REJECT }
- dst_port: SBP_PORT_NAV_DAEMON # This list sends only what Smoothpose needs at present.
filters:
- { action: ACCEPT, prefix: [0x55, 0x03, 0x09] } # MSG_ODOMETRY **Smoothpose Change**
- { action: REJECT }

- name: SBP_PORT_FILEIO_FIRMWARE
metric: "sbp/fileio_fw"
Expand Down Expand Up @@ -169,6 +173,10 @@ ports:
- dst_port: SBP_PORT_EXTERNAL
filters:
- { action: ACCEPT }
- dst_port: SBP_PORT_NAV_DAEMON # This list sends only what Smoothpose needs at present.
filters:
- { action: ACCEPT, prefix: [0x55, 0x03, 0x09] } # MSG_ODOMETRY **Smoothpose Change**
- { action: REJECT }

- name: SBP_PORT_SETTINGS_CLIENT
metric: "sbp/settings_client"
Expand Down
4 changes: 2 additions & 2 deletions scripts/pbr_script_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ def exit_code(self):
Run a pipeline and check that it's successful.
"""
proc = self._make_proc(stdout=subprocess.PIPE, stderr=subprocess.PIPE)
ret = proc.wait()
return (ret, proc.stdout.read().decode('utf8'), proc.stderr.read().decode('utf8'))
(stdout, stderr) = proc.communicate()
return (proc.returncode, stdout.decode('utf8'), stderr.decode('utf8'))

def check(self, stdout=None):
"""
Expand Down