Merge pull request #1006 from BallAerospace/celsius

Celcius to Celsius

autohotkey/config/targets/INST/cmd_tlm/inst_cmds.txt

@@ -16,7 +16,7 @@ COMMAND INST COLLECT BIG_ENDIAN "Starts a collect on the instrument"
   PARAMETER    OPCODE        112   8  UINT 0x0 0xFF 0xAB "Collect opcode"
     FORMAT_STRING "0x%0X"
   PARAMETER    TEMP          120  32  FLOAT 0.0 25.0 0.0 "Collect temperature"
-    UNITS Celcius C
+    UNITS Celsius C
 
 COMMAND INST ABORT BIG_ENDIAN "Aborts a collect on the instrument"
   PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"

autohotkey/config/targets/INST/cmd_tlm/inst_tlm.txt

@@ -22,29 +22,29 @@ TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the instrument"
   ITEM TEMP1            144 16 UINT     "Temperature #1"
     POLY_READ_CONVERSION  -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0 -20.0 20.0
     LIMITS TVAC 1     ENABLED -80.0 -30.0 30.0 80.0
     LIMITS_RESPONSE example_limits_response.rb
   ITEM TEMP2            160 16 UINT     "Temperature #2"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -60.0 -55.0 30.0 35.0
     LIMITS TVAC 1 ENABLED -60.0 20.0 30.0 35.0
   ITEM TEMP3            176 16 UINT     "Temperature #3"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -25.0 -10.0 50.0 55.0
     LIMITS TVAC 1 ENABLED -15.0 -10.0 20.0 30.0
   ITEM TEMP4            192 16 UINT     "Temperature #4"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0
   ARRAY_ITEM ARY              208 8 UINT 80 "Array data"
@@ -54,7 +54,7 @@ TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the instrument"
     STATE NORMAL  0
     STATE SPECIAL 1
   APPEND_ARRAY_ITEM ARY2      64 FLOAT 640 "Double array"
-    UNITS CELCIUS C
+    UNITS CELSIUS C
   APPEND_ITEM ASCIICMD 2048 STRING "Most recent ASCIICMD string"
     STATE "NOOP" "NOOP"
     STATE "FIRE LASER" "FIRE LASER"

data/config/param_item_modifiers.yaml

@@ -11,12 +11,12 @@ FORMAT_STRING:
 UNITS:
   summary: Add displayed units
   example: |
-    UNITS Celcius C
+    UNITS Celsius C
     UNITS Kilometers KM
   parameters:
     - name: Full Name
       required: true
-      description: Full name of the units type, e.g. Celcius
+      description: Full name of the units type, e.g. Celsius
       values: .*
     - name: Abbreviated
       required: true

demo/config/targets/INST/cmd_tlm/inst_cmds.txt

@@ -8,7 +8,7 @@ COMMAND INST COLLECT BIG_ENDIAN "Starts a collect on the <%= @target_name %> tar
   PARAMETER    OPCODE        112   8  UINT 0x0 0xFF 0xAB "Collect opcode"
     FORMAT_STRING "0x%0X"
   PARAMETER    TEMP          120  32  FLOAT 0.0 25.0 0.0 "Collect temperature"
-    UNITS Celcius C
+    UNITS Celsius C
 
 COMMAND INST ABORT BIG_ENDIAN "Aborts a collect on the <%= @target_name %> instrument"
   <%= render "_ccsds_cmd.txt", locals: {id: 2} %>

demo/config/targets/INST/cmd_tlm/inst_tlm.txt

@@ -4,29 +4,29 @@ TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the <%= @target_
   APPEND_ITEM TEMP1            16 UINT     "Temperature #1"
     POLY_READ_CONVERSION  -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0 -20.0 20.0
     LIMITS TVAC 1 ENABLED -80.0 -30.0 30.0 80.0
     LIMITS_RESPONSE example_limits_response.rb
   APPEND_ITEM TEMP2            32 FLOAT    "Temperature #2"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -60.0 -55.0 30.0 35.0
     LIMITS TVAC 1 ENABLED -60.0 20.0 30.0 35.0
   APPEND_ITEM TEMP3            16 UINT     "Temperature #3"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -25.0 -10.0 50.0 55.0
     LIMITS TVAC 1 ENABLED -15.0 -10.0 20.0 30.0
   APPEND_ITEM TEMP4            16 UINT     "Temperature #4"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0
   APPEND_ARRAY_ITEM ARY         8 UINT 80 "Array data"
@@ -37,7 +37,7 @@ TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the <%= @target_
     STATE SPECIAL 1
     STATE ERROR ANY
   APPEND_ARRAY_ITEM ARY2       64 FLOAT 640 "Double array"
-    UNITS CELCIUS C
+    UNITS CELSIUS C
   APPEND_ITEM ASCIICMD 2048 STRING "Most recent ASCIICMD string"
     STATE "NOOP" "NOOP"
     STATE "FIRE LASER" "FIRE LASER"

demo/procedures/cosmos_api_test.rb

@@ -170,7 +170,7 @@
   ["TYPE", 0, {"NORMAL"=>0, "SPECIAL"=>1}, "Collect type", nil, nil, true, "UINT"],
   ["DURATION", 1.0, nil, "Collect duration", nil, nil, false, "FLOAT"],
   ["OPCODE", "0xAB", nil, "Collect opcode", nil, nil, false, "UINT"],
-  ["TEMP", 0.0, nil, "Collect temperature", "Celcius", "C", false, "FLOAT"]]
+  ["TEMP", 0.0, nil, "Collect temperature", "Celsius", "C", false, "FLOAT"]]
 list = get_cmd_param_list("INST", "COLLECT")
 puts list.inspect(100)
 if list != expected_list

spec/install/config/targets/INST/cmd_tlm/inst_cmds.txt

@@ -15,7 +15,7 @@ COMMAND INST COLLECT BIG_ENDIAN "Starts a collect on the instrument"
   PARAMETER    OPCODE        112   8  UINT 0x0 0xFF 0xAB "Collect opcode"
     FORMAT_STRING "0x%0X"
   PARAMETER    TEMP          120  32  FLOAT 0.0 25.0 0.0 "Collect temperature"
-    UNITS Celcius C
+    UNITS Celsius C
 
 COMMAND INST ABORT BIG_ENDIAN "Aborts a collect on the instrument"
   PARAMETER    CCSDSVER        0   3  UINT  0     0   0 "CCSDS primary header version number"

spec/install/config/targets/INST/cmd_tlm/inst_tlm.txt

@@ -21,28 +21,28 @@ TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the instrument"
   ITEM TEMP1            144 16 UINT     "Temperature #1"
     POLY_READ_CONVERSION  -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0 -20.0 20.0
     LIMITS TVAC 1     ENABLED -80.0 -30.0 30.0 80.0
   ITEM TEMP2            160 16 UINT     "Temperature #2"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -60.0 -55.0 30.0 35.0
     LIMITS TVAC 1 ENABLED -60.0 20.0 30.0 35.0
   ITEM TEMP3            176 16 UINT     "Temperature #3"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -25.0 -10.0 50.0 55.0
     LIMITS TVAC 1 ENABLED -15.0 -10.0 20.0 30.0
   ITEM TEMP4            192 16 UINT     "Temperature #4"
     POLY_READ_CONVERSION -100.0 0.00305
     POLY_WRITE_CONVERSION 32768.885246 327.86885
-    UNITS CELCIUS C
+    UNITS CELSIUS C
     FORMAT_STRING "%0.3f"
     LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0
   ARRAY_ITEM ARY              208 8 UINT 80 "Array data"
@@ -52,7 +52,7 @@ TELEMETRY INST HEALTH_STATUS BIG_ENDIAN "Health and status from the instrument"
     STATE NORMAL  0
     STATE SPECIAL 1
   APPEND_ARRAY_ITEM ARY2      64 FLOAT 640 "Double array"
-    UNITS CELCIUS C
+    UNITS CELSIUS C
   APPEND_ITEM ASCIICMD 2048 STRING "Most recent ASCIICMD string"
     STATE "NOOP" "NOOP"
     STATE "FIRE LASER" "FIRE LASER"

spec/packets/packet_item_spec.rb

@@ -400,7 +400,7 @@ module Cosmos
         @pi.read_conversion = GenericConversion.new("value / 2")
         @pi.write_conversion = GenericConversion.new("value * 2")
         @pi.description = "description"
-        @pi.units_full = "Celcius"
+        @pi.units_full = "Celsius"
         @pi.units = "C"
         @pi.default = 0
         @pi.range = (0..100)
@@ -428,7 +428,7 @@ module Cosmos
         expect(hash["id_value"]).to eql 10
         expect(hash["states"]).to include("TRUE"=>1,"FALSE"=>0)
         expect(hash["description"]).to eql "description"
-        expect(hash["units_full"]).to eql "Celcius"
+        expect(hash["units_full"]).to eql "Celsius"
         expect(hash["units"]).to eql "C"
         expect(hash["default"]).to eql 0
         expect(hash["range"]).to eql (0..100)

spec/tools/cmd_tlm_server/api_spec.rb

@@ -497,7 +497,7 @@ def test_cmd_unknown(method)
         # 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,"UINT"]
-        expect(result).to include ['TEMP',0.0,nil,'Collect temperature','Celcius','C',false,"FLOAT"]
+        expect(result).to include ['TEMP',0.0,nil,'Collect temperature','Celsius','C',false,"FLOAT"]
       end
 
       it "returns array parameters for the command" do

test/performance/config/targets/PACKET/cmd_tlm/packet_tlm.txt

@@ -23,29 +23,29 @@ TELEMETRY PACKET STATUS BIG_ENDIAN "Health and status from the instrument"
     APPEND_ITEM TEMP1 16 UINT     "Temperature #1"
       POLY_READ_CONVERSION  -100.0 0.00305
       POLY_WRITE_CONVERSION 32768.885246 327.86885
-      UNITS CELCIUS C
+      UNITS CELSIUS C
       FORMAT_STRING "%0.3f"
       LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0 -20.0 20.0
       LIMITS TVAC 1     ENABLED -80.0 -30.0 30.0 80.0
       LIMITS_RESPONSE packet_limits_response.rb
     APPEND_ITEM TEMP2 16 UINT     "Temperature #2"
       POLY_READ_CONVERSION -100.0 0.00305
       POLY_WRITE_CONVERSION 32768.885246 327.86885
-      UNITS CELCIUS C
+      UNITS CELSIUS C
       FORMAT_STRING "%0.3f"
       LIMITS DEFAULT 1 ENABLED -60.0 -55.0 30.0 35.0
       LIMITS TVAC 1 ENABLED -60.0 20.0 30.0 35.0
     APPEND_ITEM TEMP3 16 UINT     "Temperature #3"
       POLY_READ_CONVERSION -100.0 0.00305
       POLY_WRITE_CONVERSION 32768.885246 327.86885
-      UNITS CELCIUS C
+      UNITS CELSIUS C
       FORMAT_STRING "%0.3f"
       LIMITS DEFAULT 1 ENABLED -25.0 -10.0 50.0 55.0
       LIMITS TVAC 1 ENABLED -15.0 -10.0 20.0 30.0
     APPEND_ITEM TEMP4 16 UINT     "Temperature #4"
       POLY_READ_CONVERSION -100.0 0.00305
       POLY_WRITE_CONVERSION 32768.885246 327.86885
-      UNITS CELCIUS C
+      UNITS CELSIUS C
       FORMAT_STRING "%0.3f"
       LIMITS DEFAULT 1 ENABLED -80.0 -70.0 60.0 80.0
   MACRO_APPEND_END
@@ -61,7 +61,7 @@ TELEMETRY PACKET STATUS BIG_ENDIAN "Health and status from the instrument"
     STATE NORMAL  0
     STATE SPECIAL 1
   APPEND_ARRAY_ITEM ARY2      64 FLOAT 640 "Double array"
-    UNITS CELCIUS C
+    UNITS CELSIUS C
   APPEND_ITEM ASCIICMD 2048 STRING "Most recent ASCIICMD string"
     STATE "NOOP" "NOOP"
     STATE "FIRE LASER" "FIRE LASER"

test/performance/procedures/cosmos_api_test.rb

@@ -167,7 +167,7 @@
   ["TYPE", 0, {"NORMAL"=>0, "SPECIAL"=>1}, "Collect type", nil, nil, true],
   ["DURATION", 1.0, nil, "Collect duration", nil, nil, false],
   ["OPCODE", "0xAB", nil, "Collect opcode", nil, nil, false],
-  ["TEMP", 0.0, nil, "Collect temperature", "Celcius", "C", false]]
+  ["TEMP", 0.0, nil, "Collect temperature", "Celsius", "C", false]]
 list = get_cmd_param_list("INST", "COLLECT")
 if list != expected_list
   raise "Fail"