|
@@ -277,22 +277,26 @@ end
|
|
|
require("hm_dissector")
|
|
|
data = HM_TC_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
|
|
|
offset = offset + tc_len
|
|
|
- elseif tc_id == 100 then
|
|
|
+ elseif tc_id == 100 then
|
|
|
require("ftci_dissector")
|
|
|
- ftci_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
|
|
|
+ ftci_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
|
|
|
offset = offset + tc_len
|
|
|
- elseif tc_id == 103 then
|
|
|
+ elseif tc_id == 103 then
|
|
|
require("ftfci_dissector")
|
|
|
- ftfci_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
|
|
|
+ ftfci_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
|
|
|
offset = offset + tc_len
|
|
|
- elseif tc_id == 102 then
|
|
|
+ elseif tc_id == 102 then
|
|
|
require("ftds_dissector")
|
|
|
ftds_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
|
|
|
offset = offset + tc_len
|
|
|
- elseif tc_id == 105 then
|
|
|
+ elseif tc_id == 105 then
|
|
|
require("ftsr_dissector")
|
|
|
- ftsr_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
|
|
|
+ ftsr_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
|
|
|
offset = offset + tc_len
|
|
|
+ elseif tc_id == 202 then
|
|
|
+ require("eps_wr_stored_param")
|
|
|
+ eps_tc_wr_stored_param_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
|
|
|
+ offset = offset + tc_len
|
|
|
else
|
|
|
for i=0,tc_len - 1 do
|
|
|
subtree:add(f_tc_data, buffer(offset, 1))
|
|
@@ -409,6 +413,7 @@ function TM_dissector(buffer, pinfo, tree) -- OBC to GS
|
|
|
subtree:add(f_sof2, buffer(add, 1):le_uint()) -- SOF2 in HEX
|
|
|
add = add + 1
|
|
|
|
|
|
+ local tm_ctrl = buffer(add, 1):le_uint()
|
|
|
subtree:add(f_tm_ctrl, buffer(add, 1):le_uint()) -- TM Ctrl in HEX
|
|
|
add = add + 1
|
|
|
-- Dissect timestamp
|
|
@@ -550,7 +555,10 @@ function TM_dissector(buffer, pinfo, tree) -- OBC to GS
|
|
|
|
|
|
|
|
|
|
|
|
- if tm_id == 621 or tm_id == 815 or tm_id == 104 or tm_id == 107 or tm_id == 101 or tm_id == 106 then
|
|
|
+ if tm_id == 621 or tm_id == 815 or tm_id == 104 or tm_id == 107 or tm_id == 101 or tm_id == 106 or tm_id == 200 or tm_id == 201 or tm_id == 202 or
|
|
|
+ tm_id == 129 or tm_id == 241 or tm_id == 130 or tm_id == 133 or tm_id == 134 or tm_id == 135 or tm_id == 137 or tm_id == 195 or tm_id == 196 or
|
|
|
+ tm_id == 184 or tm_id == 855 or tm_id == 857 or tm_id == 800 or tm_id == 819 or tm_id == 823 or tm_id == 398 or tm_id == 413 or tm_id == 461 or
|
|
|
+ tm_id == 463 or tm_id == 464 or tm_id == 468 or tm_id == 474 or tm_id == 475 or tm_id == 412 or tm_id == 253 or tm_id == 411 then
|
|
|
if tm_id == 621 then
|
|
|
require("hm_dissector")
|
|
|
array = HM_TM_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add, tm_len)
|
|
@@ -562,22 +570,140 @@ function TM_dissector(buffer, pinfo, tree) -- OBC to GS
|
|
|
add = add + tm_len
|
|
|
|
|
|
elseif tm_id == 104 then
|
|
|
- require("ftci_dissector")
|
|
|
- ftci_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
- add = add + tm_len
|
|
|
- elseif tm_id == 107 then
|
|
|
- require("ftfci_dissector")
|
|
|
- ftfci_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
- add = add + tm_len
|
|
|
- elseif tm_id == 101 then
|
|
|
- require("ftsr_dissector")
|
|
|
- ftsr_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
- add = add + tm_len
|
|
|
- elseif tm_id == 106 then
|
|
|
- require("ftds_dissector")
|
|
|
- ftds_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
- add = add + tm_len
|
|
|
- end
|
|
|
+ require("ftci_dissector")
|
|
|
+ ftci_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 107 then
|
|
|
+ require("ftfci_dissector")
|
|
|
+ ftfci_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 101 then
|
|
|
+ require("ftsr_dissector")
|
|
|
+ ftsr_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 106 then
|
|
|
+ require("ftds_dissector")
|
|
|
+ ftds_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 200 then
|
|
|
+ require("eps_get_live_param");
|
|
|
+ eps_get_live_param_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 201 then
|
|
|
+ require("eps_rd_stored_param");
|
|
|
+ eps_rd_stored_param_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 202 then
|
|
|
+ require("eps_tm_wr_stored_param");
|
|
|
+ eps_tm_wr_stored_param_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 129 then
|
|
|
+ require("tm_get_adcs_state");
|
|
|
+ tm_get_adcs_state(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 253 then
|
|
|
+ require("tm_adcs_state_cfg");
|
|
|
+ tm_adcs_state_cfg(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 241 then
|
|
|
+ require("tm_adcs_get_est_attitude_angl");
|
|
|
+ tm_get_adcs_estimated_angle(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 130 then
|
|
|
+ require("tm_get_adcs_tle");
|
|
|
+ tm_get_adcs_tle(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 133 then
|
|
|
+ require("tm_get_adcs_mag_field_vector");
|
|
|
+ tm_get_adcs_mag_field_vector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 134 then
|
|
|
+ require("tm_get_adcs_css_vector");
|
|
|
+ tm_get_adcs_css_vector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 135 then
|
|
|
+ require("tm_get_adcs_fss_vector");
|
|
|
+ tm_get_adcs_fss_vector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 137 then
|
|
|
+ require("tm_get_adcs_sensor_vector");
|
|
|
+ tm_get_adcs_sensor_vector(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 195 then
|
|
|
+ require("tm_get_adcs_commanded_wheel_speed");
|
|
|
+ tm_get_command_wheel_speed(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 196 then
|
|
|
+ require("tm_get_adcs_rw_speed_measure");
|
|
|
+ tm_get_adcs_rw_speed_measure(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 184 then
|
|
|
+ require("tm_get_adcs_est_rate");
|
|
|
+ tm_get_adcs_est_rate(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 855 then
|
|
|
+ require("tm_get_sdr_tmr_cfg");
|
|
|
+ tm_get_sdr_tmr_cfg(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 857 then
|
|
|
+ require("tm_get_sdr_rssi_cfg");
|
|
|
+ tm_get_sdr_rssi_cfg(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 800 then
|
|
|
+ require("tm_comms_uhf_get_tm_info");
|
|
|
+ tm_comms_uhf_get_tm_info(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 819 then
|
|
|
+ require("tm_comms_uhf_get_tm_store");
|
|
|
+ tm_comms_uhf_get_tm_store(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 823 then
|
|
|
+ require("tm_comms_uhf_dbg_cb");
|
|
|
+ tm_comms_uhf_dbg_cb(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 398 then
|
|
|
+ require("tm_get_comms_tm_info");
|
|
|
+ tm_get_comms_tm_info(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 413 then
|
|
|
+ require("tm_sband_get_tm_store");
|
|
|
+ tm_sband_get_tm_store(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 461 then
|
|
|
+ require("tm_get_sband_version");
|
|
|
+ tm_get_sband_version(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 463 then
|
|
|
+ require("tm_sband_get_device_conf");
|
|
|
+ tm_sband_get_device_conf(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 464 then
|
|
|
+ require("tm_sband_get_feature_select");
|
|
|
+ tm_sband_get_feature_select(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 468 then
|
|
|
+ require("tm_sband_get_product_key");
|
|
|
+ tm_sband_get_product_key(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 474 then
|
|
|
+ require("tm_get_sband_dbg_cb");
|
|
|
+ tm_get_sband_dbg_cb(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 475 then
|
|
|
+ require("tm_get_sband_tx_rx_on_ts");
|
|
|
+ tm_get_sband_tx_rx_on_ts(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 412 then
|
|
|
+ require("tm_sband_get_tm_all");
|
|
|
+ tm_sband_get_tm_all(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+ elseif tm_id == 411 then
|
|
|
+ require("tm_comms_beacon_tx");
|
|
|
+ tm_comms_beacon_tx(buffer, pinfo, tree, TC_TM_PROTOCOL, add)
|
|
|
+ add = add + tm_len
|
|
|
+
|
|
|
+
|
|
|
+ end
|
|
|
|
|
|
|
|
|
else
|
|
@@ -589,8 +715,7 @@ function TM_dissector(buffer, pinfo, tree) -- OBC to GS
|
|
|
|
|
|
|
|
|
-- Ext Header Len in HEX
|
|
|
- magic = buffer(6, 1):le_uint() -- to check tm control
|
|
|
- if bit.band(magic, 0x80) == 0x80 then
|
|
|
+ if bit.band(tm_ctrl, 0x80) == 0x80 then
|
|
|
magic= buffer(add, 1):uint()
|
|
|
subtree:add(f_ext_header_len, buffer(add, 1):uint())
|
|
|
add=add+1
|
|
@@ -620,7 +745,7 @@ function TM_dissector(buffer, pinfo, tree) -- OBC to GS
|
|
|
if tm_id == 621 then
|
|
|
|
|
|
local switch = {
|
|
|
- [0] = function() return "EPS" end,
|
|
|
+ [0] = function() return "EPS" end,
|
|
|
[1] = function() return "ADCS" end,
|
|
|
[2] = function() return "SBAND" end,
|
|
|
[3] = function() return "UHF" end,
|