adding eps dissector

Dissector/eps_dissector.lua

@@ -0,0 +1,163 @@
+-- Define the dissector function
+function dissect_power_system_data(buffer, pinfo, tree,HM_TM_dissector, offset, len,data3)
+
+-- Define ProtoFields for each field in the structure
+local f_pv_cnt = ProtoField.uint8("PowerSystemData.pv_cnt", "PV Count", base.DES)
+local f_mppt_cnt = ProtoField.uint8("PowerSystemData.mppt_cnt", "MPPT Count", base.DES)
+local f_op_conv_cnt = ProtoField.uint8("PowerSystemData.op_conv_cnt", "Operating Converter Count", base.DES)
+local f_btry_cnt = ProtoField.uint8("PowerSystemData.btry_cnt", "Battery Count", base.DES)
+local f_btry_temp_sns_cnt = ProtoField.uint8("PowerSystemData.btry_temp_sns_cnt", "Battery Temperature Sensor Count", base.DES)
+local f_chnl_cnt = ProtoField.uint8("PowerSystemData.chnl_cnt", "Channel Count", base.DES)
+local f_volt_rail_cnt = ProtoField.uint8("PowerSystemData.volt_rail_cnt", "Voltage Rail Count", base.DES)
+local f_tot_btry_volt_rd = ProtoField.uint16("PowerSystemData.tot_btry_volt_rd", "Total Battery Voltage", base.DES)
+local f_tot_btry_cur_rd = ProtoField.uint16("PowerSystemData.tot_btry_cur_rd", "Total Battery Current", base.DES)
+local f_hrm_btry_mode_info = ProtoField.uint8("PowerSystemData.hrm_btry_mode_info", "Harmonic Battery Mode Info", base.DES)
+
+-- Fields for arrays (treated as ProtoFields with array index)
+local f_pv_volt_rd = ProtoField.uint16("PowerSystemData.pv_volt_rd", "PV Voltage Reading", base.DES)
+local f_pv_cur_rd = ProtoField.uint16("PowerSystemData.pv_cur_rd", "PV Current Reading", base.DES)
+local f_mppt_volt_rd = ProtoField.uint16("PowerSystemData.mppt_volt_rd", "MPPT Voltage Reading", base.DES)
+local f_mppt_cur_rd = ProtoField.uint16("PowerSystemData.mppt_cur_rd", "MPPT Current Reading", base.DES)
+local f_op_conv_volt_rd = ProtoField.uint16("PowerSystemData.op_conv_volt_rd", "Operating Converter Voltage", base.DES)
+local f_btry_temp_sns_rd = ProtoField.uint8("PowerSystemData.btry_temp_sns_rd", "Battery Temperature Sensor Readings", base.DES)
+local f_chnl_state = ProtoField.uint8("PowerSystemData.chnl_state", "Channel State", base.DES)
+local f_volt_rail_cur_value = ProtoField.uint8("PowerSystemData.volt_rail_cur_value", "Voltage Rail Current Value", base.DES)
+local f_chnl_ovr_cur_flg = ProtoField.uint8("PowerSystemData.chnl_ovr_cur_flg", "Channel Over Current Flag", base.DES)
+
+-- Add the fields to the protocol
+HM_TM_dissector.fields = { f_pv_cnt, f_mppt_cnt, f_op_conv_cnt, f_btry_cnt, f_btry_temp_sns_cnt, f_chnl_cnt,
+    f_volt_rail_cnt, f_tot_btry_volt_rd, f_tot_btry_cur_rd, f_hrm_btry_mode_info,
+    f_pv_volt_rd, f_pv_cur_rd, f_mppt_volt_rd, f_mppt_cur_rd, f_op_conv_volt_rd,
+    f_btry_temp_sns_rd, f_chnl_state, f_volt_rail_cur_value, f_chnl_ovr_cur_flg 
+}
+
+for i=1,data3 do
+
+     offset = offset+8
+    local subtree = tree:add(TC_TM_PROTOCOL, buffer(), "Power System Data")
+
+    -- dissect pv_cnt
+    local pv_cnt = buffer(offset, 1):le_uint()
+    subtree:add(f_pv_cnt, pv_cnt)
+    offset = offset + 1
+
+    -- dissect mppt_cnt
+    local mppt_cnt = buffer(offset, 1):le_uint()
+    subtree:add(f_mppt_cnt, mppt_cnt)
+    offset = offset + 1
+
+    -- dissect op_conv_cnt
+    local op_conv_cnt = buffer(offset, 1):le_uint()
+    subtree:add(f_op_conv_cnt, op_conv_cnt)
+    offset = offset + 1
+
+    -- dissect btry_cnt
+    local btry_cnt = buffer(offset, 1):le_uint()
+    subtree:add(f_btry_cnt, btry_cnt)
+    offset = offset + 1
+
+    -- dissect btry_temp_sns_cnt
+    local btry_temp_sns_cnt = buffer(offset, 1):le_uint()
+    subtree:add(f_btry_temp_sns_cnt, btry_temp_sns_cnt)
+    offset = offset + 1
+
+    -- dissect chnl_cnt
+    local chnl_cnt = buffer(offset, 1):le_uint()
+    subtree:add(f_chnl_cnt, chnl_cnt)
+    offset = offset + 1
+
+    -- dissect volt_rail_cnt
+    local volt_rail_cnt = buffer(offset, 1):le_uint()
+    subtree:add(f_volt_rail_cnt, volt_rail_cnt)
+    offset = offset + 1
+------------------------------------------------------------------------------------------------------------
+for i=1, pv_cnt do 
+-- dissect pv_volt_rd 
+	--local pv_volt = string.unpack("<d", buffer(offset, 2):le_uint())
+        local pv_volt = buffer(offset, 2):le_uint()
+        subtree:add(f_pv_volt_rd, pv_volt)
+        offset = offset + 2
+end
+for i=1, pv_cnt do 
+-- dissect pv_cur_rd 
+        local pv_cur = buffer(offset, 2):le_uint()
+        subtree:add(f_pv_cur_rd, pv_cur)
+        offset = offset + 2
+end
+
+--for i=1, mppt_cnt do 
+ -- dissect mppt_volt_rd 
+        local mppt_volt = buffer(offset, 2):le_uint()
+        subtree:add(f_mppt_volt_rd, mppt_volt)
+        offset = offset + 2
+--end
+--for i=1, mppt_cnt do 
+-- dissect mppt_cur_rd 
+        local mppt_cur = buffer(offset, 2):le_uint()
+        subtree:add(f_mppt_cur_rd, mppt_cur)
+        offset = offset + 2
+--end
+
+for i=1 ,op_conv_cnt do 
+-- dissect op_conv_volt_rd (array of uint16, loop through based on op_conv_cnt)
+        local op_conv_volt = buffer(offset, 2):le_uint()
+        subtree:add(f_op_conv_volt_rd, op_conv_volt)
+        offset = offset + 2
+end
+ -- dissect tot_btry_volt_rd
+    	local tot_btry_volt_rd = buffer(offset, 2):le_uint()
+    	subtree:add(f_tot_btry_volt_rd, tot_btry_volt_rd)
+    	offset = offset + 2
+-- dissect tot_btry_cur_rd
+    	local tot_btry_cur_rd = buffer(offset, 2):le_uint()
+    	subtree:add(f_tot_btry_cur_rd, tot_btry_cur_rd)
+    	offset = offset + 2
+for i=1, btry_temp_sns_cnt do
+-- dissect btry_temp_sns_rd (array of uint8, loop through based on btry_temp_sns_cnt)
+        local btry_temp = buffer(offset, 1):le_uint()
+        subtree:add(f_btry_temp_sns_rd, btry_temp)
+        offset = offset + 1
+end
+
+for i=1, chnl_cnt do
+-- dissect chnl_state (array of uint8, loop through based on chnl_cnt)  
+        local chnl_state_value = buffer(offset, 1):le_uint()
+        subtree:add(f_chnl_state, chnl_state_value)
+        offset = offset + 1
+end 
+for i=1, volt_rail_cnt do
+-- volt_rail_cur_value
+        local volt_rail_value = buffer(offset, 2):le_uint()
+        subtree:add(f_volt_rail_cur_value, volt_rail_value)
+        offset = offset + 1
+end
+for i=1,volt_rail_cnt do
+-- dissect chnl_ovr_cur_flg (array of uint8, loop through based on chnl_cnt)
+        local chnl_ovr_cur_flg_value = buffer(offset, 1):le_uint()
+        subtree:add(f_chnl_ovr_cur_flg, chnl_ovr_cur_flg_value)
+        offset = offset + 1
+end
+
+  -- dissect hrm_btry_mode_info
+    local hrm_btry_mode_info = buffer(offset, 1):le_uint()
+    subtree:add(f_hrm_btry_mode_info, hrm_btry_mode_info)
+    offset = offset + 1  
+end
+	
+
+end
+
+    
+
+    
+
+   
+
+    
+
+    
+
+    
+ 
+
+    

Dissector/hm_dissector.lua

@@ -36,13 +36,13 @@ TC_TM_PROTOCOL.fields = { f_sub_mod_id, f_Queue_id, f_priority, f_opt_sel_sin_mu
   
     return data1     
 end 
-
+--------------------------------------------------------------------------------------------------------------------------------
 
 function HM_TM_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset, len)
 
 local f_sub_mod_id = ProtoField.uint8("TC_TM_PROTOCOL.sub_mod_id", "SUB MODULE ID", base.DEC)
 local f_Queue_id = ProtoField.uint8("TC_TM_PROTOCOL.Queue_id", "QUEUE ID", base.DEC)
-local f_num_of_instance = ProtoField.uint8("TC_TM_PROTOCOL.num_of_instance", "Number of Instance", base.DEC)
+local f_num_of_instance = ProtoField.uint16("TC_TM_PROTOCOL.num_of_instance", "Number of Instance", base.DEC)
 local f_Health_Data = ProtoField.uint8("TC_TM_PROTOCOL.Health_Data", "Health Data", base.DEC)
 
 -- Add the fields to the protocol
@@ -63,17 +63,19 @@ TC_TM_PROTOCOL.fields = { f_sub_mod_id, f_Queue_id, f_num_of_instance, f_Health_
      offset = offset + 1
      
      --dissect f_num_of_instance
-     local data3 = buffer(offset,1):le_uint()
+     local data3 = buffer(offset,2):le_uint()
      subtree:add(f_num_of_instance, data3)
-      offset = offset + 1     
+      offset = offset + 2    
       
+	local array1
      --dissect Health_Data
-     len =len - 3
-     for i=0, len-1 do
-       local data4 = buffer(offset,1):le_uint()
-       subtree:add(f_Health_Data, data4)
-       offset = offset + 1
+    if data1 == 0  then
+        require("EPS")
+      dissect_power_system_data(buffer, pinfo, tree, TC_TM_PROTOCOL, offset, tm_len,data3)
      end
+     local array = {data1, data2, data3,array1}
+     
+     return array
 
 end
 

Dissector/tc_tm_protocols.lua

@@ -14,7 +14,7 @@ local f_da_id = ProtoField.uint16("TC_TM_PROTOCOL.da_id", "DA Id", base.DEC)
 local f_rm_id = ProtoField.uint8("TC_TM_PROTOCOL.rm_id", "RM Id", base.DEC)
 local f_tm_id = ProtoField.uint16("TC_TM_PROTOCOL.tm_id", "TM Id", base.DEC)
 local f_co_id = ProtoField.uint16("TC_TM_PROTOCOL.co_id", "Co Id", base.DEC)
-local f_tm_len = ProtoField.uint16("TC_TM_PROTOCOL.tm_len", "TM Len", base.DEC)
+local f_tm_len = ProtoField.uint16("TC_TM_PROTOCOL.tm_len", "TM Len", base.HEX)
 local f_tm_data = ProtoField.uint8("TC_TM_PROTOCOL.tm_data", "TM Data", base.DEC)
 local f_ext_header_len = ProtoField.uint8("TC_TM_PROTOCOL.ext_header_len", "Ext Header Len", base.DEC)
 local f_ext_header_data = ProtoField.uint8("TC_TM_PROTOCOL.ext_header_data", "Ext Header Data", base.DEC)
@@ -232,7 +232,7 @@ end
           else
               if tc_id == 621 then
               
-                 require("HM_dissector")
+                 require("hm_dissector")
 
                 data = HM_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, offset)
                 offset = offset + tc_len   
@@ -279,23 +279,22 @@ end
         subtree:add(f_eof1, buffer(offset, 1))
     end
     local string
- 
-   
-      if data == 9 then
-        string = "EPS"
-      elseif data == 22 then
-        string = "ADCS"
-      elseif data == 14 then
-        string = "COMMS_SBAND_CNTRL"
-      elseif data == 15 then
-        string = "COMMS_UHF_CNTRL"
-      elseif data == 42 then
-        string = "SENSOR"
-      elseif data == 27 then
-        string = "OBC"
-      else
-        string = "All module"
-      end
+    
+    if tc_id == 621 then
+    
+    local switch = {
+    [9] = function() return "EPS" end, 
+    [22] = function() return "ADCS" end,
+    [14] = function() return "COMMS SBAND CNTRL" end,
+    [15] = function() return "COMMS_UHF_CNTRL" end,
+    [42] = function() return "SENSOR" end,
+    [27] = function() return "OBC" end
+    }
+    string = (switch[data] or function() return "All Module" end)()
+    
+    end
+  
+  
               
     
     info_display= {buffer(11, 2):le_uint(),buffer(7, 4):le_uint() ,tc_id, string} --- for info display in wireshark
@@ -407,8 +406,7 @@ function TM_dissector(buffer, pinfo, tree)  -- OBC to GS
 		magic = magic & 0x7fff
 	end
         subtree:add(f_tm_id, magic)  -- TM Id in HEX
-	info_display= {buffer(11, 2):le_uint(),buffer(7, 4):le_uint() ,magic} --- for info display in wireshark
-	add=add+2
+	      add=add+2
     end
 
     tm_id = magic
@@ -426,18 +424,19 @@ function TM_dissector(buffer, pinfo, tree)  -- OBC to GS
     add=add+2
 
     --  logic for TM Data
-	local subtree2 = subtree:add(TC_TM_PROTOCOL, buffer(), "TM_DATA")
+  local array
+	--local subtree2 = subtree:add(TC_TM_PROTOCOL, buffer(), "TM_DATA")
  
    -- Dissect TM_Data (variable length)
       if tm_id == 621  then
       
-        require("HM_dissector")
-        HM_TM_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add, tm_len)
+        require("hm_dissector")
+        array = HM_TM_dissector(buffer, pinfo, tree, TC_TM_PROTOCOL, add, tm_len)
         add = add + tm_len
       
       else
         for i=0,magic-1 do
-	        subtree2:add(f_tm_data, buffer(add, 1):le_uint())
+	        subtree:add(f_tm_data, buffer(add, 1):le_uint())
 	        add=add+1
         end
       end
@@ -470,10 +469,33 @@ function TM_dissector(buffer, pinfo, tree)  -- OBC to GS
     end
     -- EOF1 in HEX
     subtree:add(f_eof1, buffer(add, 1):uint())
+    
+    local string
+    if tm_id == 621 then
+    
+    	local switch = {
+    	[0] = function() return "EPS" end, 
+    	[1] = function() return "ADCS" end,
+    	[2] = function() return "COMMS SBAND CNTRL" end,
+    	[3] = function() return "COMMS_UHF_CNTRL" end,
+    	[4] = function() return "SENSOR" end,
+    	[5] = function() return "OBC" end,
+    	[6] = function() return "ERROR HANDLER" end
+    	}
+    	string = (switch[array[1]] or function() return "All Module" end)()
+    
+    
+    
+    	info_display= {buffer(11, 2):le_uint(),buffer(7, 4):le_uint() ,tm_id, string, array[2], array[3]} --- for info display in wireshark
 
 	 
-	pinfo.cols.info ="seq_no=" ..info_display[1] .." TS=" ..info_display[2].." TM_ID="..info_display[3]  -- for info display in wireshark
+	pinfo.cols.info ="Seq_no = " ..info_display[1] .." TS = " ..info_display[2].." TM ID = "..info_display[3].." Module = "..info_display[4].." Queue id = "..info_display[5].." Number of instance = "..info_display[6] -- for info display in wireshark
+    else
+        info_display= {buffer(11, 2):le_uint(),buffer(7, 4):le_uint() ,tm_id} --- for info display in wireshark
 
+	 
+	pinfo.cols.info ="Seq_no = " ..info_display[1] .." TS = " ..info_display[2].." TM ID = "..info_display[3] -- for info display in wireshark
+    end
     -- Check if the buffer contains enough data for the expected total length
    --if buffer:len() < 38 + buffer(21, 2):uint() then
      --   subtree:add_expert_info(PI_MALFORMED, PI_WARN, "Incomplete data")
@@ -508,7 +530,7 @@ end
 ------------------------------------------------------------------------------------------------------------------------------------------------
 
 -- Add a preference for the port number
-TC_TM_PROTOCOL.prefs.port = Pref.uint("UDP Port", 6767, "UDP port for TC_TM protocol")
+TC_TM_PROTOCOL.prefs.port = Pref.uint("UDP Port", 6779, "UDP port for TC_TM protocol")
 
 -- Register the dissector based on the preference
 function TC_TM_PROTOCOL.init()