re #635 Update get_cmd_param_list to return the type for each parameter

BallAerospace · Nov 2, 2017 · b353862 · b353862
1 parent 9802e0c
commit b353862
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/lib/cosmos/tools/cmd_tlm_server/api.rb b/lib/cosmos/tools/cmd_tlm_server/api.rb
@@ -292,12 +292,12 @@ def get_cmd_param_list(target_name, command_name)
       System.commands.params(target_name, command_name).each do |parameter|
         if parameter.format_string
           unless parameter.default.kind_of?(Array)
-            list << [parameter.name, sprintf(parameter.format_string, parameter.default), parameter.states, parameter.description, parameter.units_full, parameter.units, parameter.required]
+            list << [parameter.name, sprintf(parameter.format_string, parameter.default), parameter.states, parameter.description, parameter.units_full, parameter.units, parameter.required, parameter.data_type.to_s]
           else
-            list << [parameter.name, "[]", parameter.states, parameter.description, parameter.units_full, parameter.units, parameter.required]
+            list << [parameter.name, "[]", parameter.states, parameter.description, parameter.units_full, parameter.units, parameter.required, parameter.data_type.to_s]
           end
         else
-          list << [parameter.name, parameter.default, parameter.states, parameter.description, parameter.units_full, parameter.units, parameter.required]
+          list << [parameter.name, parameter.default, parameter.states, parameter.description, parameter.units_full, parameter.units, parameter.required, parameter.data_type.to_s]
         end
       end
       return list

diff --git a/spec/script/commands_disconnect_spec.rb b/spec/script/commands_disconnect_spec.rb
@@ -254,7 +254,7 @@ module Cosmos
     describe "get_cmd_param_list" do
       it "returns all the parameters for a command" do
         list = get_cmd_param_list("INST", "COLLECT")
-        expect(list).to include(["TYPE", 0, {"NORMAL"=>0, "SPECIAL"=>1}, "Collect type", nil, nil, true])
+        expect(list).to include(["TYPE", 0, {"NORMAL"=>0, "SPECIAL"=>1}, "Collect type", nil, nil, true, "UINT"])
       end
     end
 

diff --git a/spec/script/commands_spec.rb b/spec/script/commands_spec.rb
@@ -272,7 +272,8 @@ module Cosmos
     describe "get_cmd_param_list" do
       it "returns all the parameters for a command" do
         list = get_cmd_param_list("INST", "COLLECT")
-        expect(list).to include(["TYPE", 0, {"NORMAL"=>0, "SPECIAL"=>1}, "Collect type", nil, nil, true])
+        #puts list
+        expect(list).to include(["TYPE", 0, {"NORMAL"=>0, "SPECIAL"=>1}, "Collect type", nil, nil, true, "UINT"])
       end
     end
 

diff --git a/spec/tools/cmd_tlm_server/api_spec.rb b/spec/tools/cmd_tlm_server/api_spec.rb
@@ -472,15 +472,15 @@ def test_cmd_unknown(method)
         result = @api.get_cmd_param_list("INST","COLLECT")
         # Each element in the results array contains:
         #   name, default, states, description, full units, units, required
-        expect(result).to include ['TYPE',0,{"NORMAL"=>0,"SPECIAL"=>1},'Collect type',nil,nil,true]
-        expect(result).to include ['TEMP',0.0,nil,'Collect temperature','Celcius','C',false]
+        expect(result).to include ['TYPE',0,{"NORMAL"=>0,"SPECIAL"=>1},'Collect type',nil,nil,true,"UINT"]
+        expect(result).to include ['TEMP',0.0,nil,'Collect temperature','Celcius','C',false,"FLOAT"]
       end
 
       it "returns array parameters for the command" do
         result = @api.get_cmd_param_list("INST","ARYCMD")
         # Each element in the results array contains:
         #   name, default, states, description, full units, units, required
-        expect(result).to include ['ARRAY',[],nil,'Array parameter',nil,nil,false]
+        expect(result).to include ['ARRAY',[],nil,'Array parameter',nil,nil,false,"FLOAT"]
       end
     end