openc3 6.4.1 → 6.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 864ffdf1957f4dc816dc54fb49e31da9b824ade6d4ff0e016dc81d0b4eaafc0c
-  data.tar.gz: ad01826136970333f93f6fd24199b5c9f6d21245c342db1709f035a35d09ae49
+  metadata.gz: f50276d75f7b083b8e4ab9bf5572978eb7b67b8d463d5757b7e5dcc64de861b1
+  data.tar.gz: c7af952c813bf8ca3032443225046ac74dd40d366e42a26e0ab5fd8a13e3de04
 SHA512:
-  metadata.gz: 8d3515bdd13040340bb39ac3d0bc51478c65b57e9b42ed31b11e6c10ed4228c4eccb9f7228cd2f7271e533bd66a9eee42e386f91ffabaf7c4e5179cc9ddd6efb
-  data.tar.gz: 2ef03561529805ed8f09037ab664477071bf6d8e672095b979ad828ce8cddc819ec056999b022df0dd1f522254a36f58bf9b31656ce3845b12c65869eb8f011b
+  metadata.gz: e9724e49c5fa0cceffea2b5f3584820542d50a47b5dee4be7e0fafa5af7b6fecf4d152e48b65752ce73f51391219770bc650041ee676d3943eb48efd67f98770
+  data.tar.gz: 8e4429f6a6200454c4d98b1e8b5c881154be0582db9c096329f7c7039a93f7710533dce063d1d562835bfddc094dcc71e6b8ed0661ef2dcdb53ceae0c3412c8d

data/data/config/conversions.yaml

@@ -0,0 +1,273 @@
+BIT_REVERSE_CONVERSION:
+  summary: Reverses the bits of the current telemetry item. Can be used as both a read and write conversion.
+  ruby_example: |
+    READ_CONVERSION bit_reverse_conversion.rb
+    WRITE_CONVERSION bit_reverse_conversion.rb
+  python_example: |
+    READ_CONVERSION openc3/conversions/bit_reverse_conversion.py
+    WRITE_CONVERSION openc3/conversions/bit_reverse_conversion.py
+IP_READ_CONVERSION:
+  summary: Reads a packed 32 bit integer into an IP address string
+  description: |
+    This command reads a packed 32 bit integer into an IP address string.
+    For example, 0xFFFF8000 would be converted to '255.255.128.0'.
+  ruby_example: READ_CONVERSION ip_read_conversion.rb
+  python_example: READ_CONVERSION openc3/conversions/ip_read_conversion.py
+IP_WRITE_CONVERSION:
+  summary: Write an ip address string into a packed 32 bit integer
+  description: |
+    This command writes an IP address string into a packed 32 bit integer. The IP address
+    string should be in the format 'x.x.x.x' where x is a number between 0 and 255.
+    For example, '255.255.128.0' would be converted to 0xFFFF8000.
+  ruby_example: WRITE_CONVERSION ip_write_conversion.rb
+  python_example: WRITE_CONVERSION openc3/conversions/ip_write_conversion.py
+OBJECT_READ_CONVERSION:
+  summary: Reads values from the given packet object
+  description: |
+    This command reads all the values from the given packet object. The values are
+    returned as a Ruby hash or Python dict. The packet object must be defined in the target's configuration.
+  parameters:
+    - name: Command or Telemetry
+      required: true
+      description: Whether the packet is a command or telemetry
+      values: [CMD, TLM]
+    - name: Target Name
+      required: true
+      description: Name of the target
+      values: .*
+    - name: Packet Name
+      required: true
+      description: Name of the packet
+      values: .*
+  ruby_example: READ_CONVERSION object_read_conversion.rb CMD INST COLLECT
+  python_example: READ_CONVERSION openc3/conversions/object_read_conversion.py CMD INST COLLECT
+OBJECT_WRITE_CONVERSION:
+  summary: Writes values into the given packet object
+  description: |
+    This command writes values into the given packet object. The values are specified
+    in a hash format where the keys are the field names in the packet and the values
+    are the values to write. The packet object must be defined in the target's configuration.
+  parameters:
+    - name: Command or Telemetry
+      required: true
+      description: Whether the packet is a command or telemetry
+      values: [CMD, TLM]
+    - name: Target Name
+      required: true
+      description: Name of the target
+      values: .*
+    - name: Packet Name
+      required: true
+      description: Name of the packet
+      values: .*
+  ruby_example: WRITE_CONVERSION object_write_conversion.rb CMD INST COLLECT
+  python_example: WRITE_CONVERSION openc3/conversions/object_write_conversion.py CMD INST COLLECT
+PACKET_TIME_FORMATTED_CONVERSION:
+  summary: Converts the packet time to a formatted string like "YYYY/MM/DD HH:MM:SS.US"
+  description: |
+    This in an internal conversion which is automatically applied to the
+    'PACKET_TIMEFORMATTED' derived telemetry item. It is typically not explicitly used.
+    For more information see the [Received Time and Packet Time](/docs/configuration/telemetry#received-time-and-packet-time) documentation.
+  ruby_example: READ_CONVERSION packet_time_formatted_conversion.rb
+  python_example: READ_CONVERSION openc3/conversions/packet_time_formatted_conversion.py
+PACKET_TIME_SECONDS_CONVERSION:
+  summary: Converts the packet time to a floating point number of seconds since the epoch
+  description: |
+    This in an internal conversion which is automatically applied to the
+    'PACKET_TIMESECONDS' derived telemetry item. It is typically not explicitly used.
+    For more information see the [Received Time and Packet Time](/docs/configuration/telemetry#received-time-and-packet-time) documentation.
+  ruby_example: READ_CONVERSION packet_time_seconds_conversion.rb
+  python_example: READ_CONVERSION openc3/conversions/packet_time_seconds_conversion.py
+POLYNOMIAL_CONVERSION:
+  summary: Adds a polynomial conversion factor to the current item. Can be used as both a read and write conversion.
+  description:
+    For commands, the conversion factor is applied to raw value set by the user (via tool or script)
+    before it is written into the binary command packet and sent. For telemetry, the conversion factor
+    is applied to the raw value in the telemetry packet before it is displayed to the user. The user still
+    has the ability to see the raw unconverted value in a details dialog.
+  parameters:
+    - name: C0
+      required: true
+      description: Coefficient
+      values: .*
+    - name: Cx
+      required: false
+      description: Additional coefficient values for the conversion. Any order
+        polynomial conversion may be used so the value of 'x' will vary with the
+        order of the polynomial. Note that larger order polynomials take longer
+        to process than shorter order polynomials, but are sometimes more accurate.
+      values: .*
+  ruby_example: |
+    READ_CONVERSION polynomial_conversion.rb 10 0.5 0.25
+    # Since this is a common conversion it has an alias:
+    POLY_READ_CONVERSION 10 0.5 0.25
+
+    WRITE_CONVERSION polynomial_conversion.rb 10 0.5 0.25
+    # Since this is a common conversion it has an alias:
+    POLY_WRITE_CONVERSION 10 0.5 0.25
+  python_example: |
+    READ_CONVERSION openc3/conversions/polynomial_conversion.py 10 0.5 0.25
+    # Since this is a common conversion it has an alias:
+    POLY_READ_CONVERSION 10 0.5 0.25
+
+    WRITE_CONVERSION openc3/conversions/polynomial_conversion.py 10 0.5 0.25
+    # Since this is a common conversion it has an alias:
+    POLY_WRITE_CONVERSION 10 0.5 0.25
+PROCESSOR_CONVERSION:
+  summary: Read a value from a processor
+  description: |
+    This command reads a value from a processor. The value is read from the
+    processor's available values. The processor must be defined in the target's configuration.
+  parameters:
+    - name: Processor Name
+      required: true
+      description: Name of the processor
+      values: .*
+    - name: Processor Value
+      required: true
+      description: Published processor value
+      values: .*
+  ruby_example: |
+    PROCESSOR TEMP1WATER watermark_processor.rb TEMP1
+    ITEM TEMP1HIGH 0 0 DERIVED "High-water mark for TEMP1"
+      READ_CONVERSION processor_conversion.rb TEMP1WATER HIGH_WATER
+  python_example: |
+    PROCESSOR TEMP1WATER watermark_processor.rb TEMP1
+    ITEM TEMP1HIGH 0 0 DERIVED "High-water mark for TEMP1"
+      READ_CONVERSION openc3/conversions/processor_conversion.py TEMP1WATER HIGH_WATER
+RECEIVED_COUNT_CONVERSION:
+  summary: Converts the packet received count to a UINT 32 value
+  description: |
+    This in an internal conversion which is automatically applied to the
+    'RECEIVED_COUNT' derived telemetry item. It is typically not explicitly used.
+  ruby_example: READ_CONVERSION received_count_conversion.rb
+  python_example: READ_CONVERSION openc3/conversions/received_count_conversion.py
+RECEIVED_TIME_FORMATTED_CONVERSION:
+  summary: Converts the packet received time to a formatted string like "YYYY/MM/DD HH:MM:SS.US"
+  description: |
+    This in an internal conversion which is automatically applied to the
+    'RECEIVED_TIMEFORMATTED' derived telemetry item. It is typically not explicitly used.
+    For more information see the [Received Time and Packet Time](/docs/configuration/telemetry#received-time-and-packet-time) documentation.
+  ruby_example: READ_CONVERSION received_time_formatted_conversion.rb
+  python_example: READ_CONVERSION openc3/conversions/received_time_formatted_conversion.py
+RECEIVED_TIME_SECONDS_CONVERSION:
+  summary: Converts the packet received to a floating point number of seconds since the epoch
+  description: |
+    This in an internal conversion which is automatically applied to the
+    'RECEIVED_TIMESECONDS' derived telemetry item. It is typically not explicitly used.
+    For more information see the [Received Time and Packet Time](/docs/configuration/telemetry#received-time-and-packet-time) documentation.
+  ruby_example: READ_CONVERSION received_time_formatted_conversion.rb
+  python_example: READ_CONVERSION openc3/conversions/received_time_formatted_conversion.py
+SEGMENTED_POLYNOMIAL_CONVERSION:
+  summary: Adds a segmented polynomial conversion factor to the current item. Can be used as both a read and write conversion.
+  description:
+    For commands, this conversion factor is applied to the raw value set by the user
+    (via tool or script) before it is written into the binary command packet and sent.
+    For telemetry, the conversion factor is applied to the raw value in the telemetry packet
+    before it is displayed to the user. The user still has the ability to see the raw
+    unconverted value in a details dialog.
+  parameters:
+    - name: Lower Bound
+      required: true
+      description:
+        Defines the lower bound of the range of values that this segmented
+        polynomial applies to. Is ignored for the segment with the smallest lower bound.
+      values: .*
+    - name: C0
+      required: true
+      description: Coefficient
+      values: .*
+    - name: Cx
+      required: false
+      description: Additional coefficient values for the conversion. Any order
+        polynomial conversion may be used so the value of 'x' will vary with the
+        order of the polynomial. Note that larger order polynomials take longer
+        to process than shorter order polynomials, but are sometimes more accurate.
+      values: .*
+  ruby_example: |
+    READ_CONVERSION segmented_polynomial_conversion.rb 0 10 0.5 0.25 # Apply the conversion to all values < 50
+    # Since this is a common conversion it has an alias:
+    SEG_POLY_READ_CONVERSION 10 0.5 0.25 0 10 0.5 0.25 # Apply the conversion to all values < 50
+    SEG_POLY_READ_CONVERSION 50 11 0.5 0.275 # Apply the conversion to all values >= 50 and < 100
+    SEG_POLY_READ_CONVERSION 100 12 0.5 0.3 # Apply the conversion to all values >= 100
+
+    WRITE_CONVERSION segmented_polynomial_conversion.rb 0 10 0.5 0.25 # Apply the conversion to all values < 50
+    # Since this is a common conversion it has an alias:
+    SEG_POLY_WRITE_CONVERSION 10 0.5 0.25 0 10 0.5 0.25 # Apply the conversion to all values < 50
+    SEG_POLY_WRITE_CONVERSION 50 11 0.5 0.275 # Apply the conversion to all values >= 50 and < 100
+    SEG_POLY_WRITE_CONVERSION 100 12 0.5 0.3 # Apply the conversion to all values >= 100
+  python_example: |
+    READ_CONVERSION openc3/conversions/segmented_polynomial_conversion.py 0 10 0.5 0.25 # Apply the conversion to all values < 50
+    # Since this is a common conversion it has an alias:
+    SEG_POLY_READ_CONVERSION 10 0.5 0.25 0 10 0.5 0.25 # Apply the conversion to all values < 50
+    SEG_POLY_READ_CONVERSION 50 11 0.5 0.275 # Apply the conversion to all values >= 50 and < 100
+    SEG_POLY_READ_CONVERSION 100 12 0.5 0.3 # Apply the conversion to all values >= 100
+
+    WRITE_CONVERSION openc3/conversions/segmented_polynomial_conversion.py 0 10 0.5 0.25 # Apply the conversion to all values < 50
+    # Since this is a common conversion it has an alias:
+    SEG_POLY_WRITE_CONVERSION 10 0.5 0.25 0 10 0.5 0.25 # Apply the conversion to all values < 50
+    SEG_POLY_WRITE_CONVERSION 50 11 0.5 0.275 # Apply the conversion to all values >= 50 and < 100
+    SEG_POLY_WRITE_CONVERSION 100 12 0.5 0.3 # Apply the conversion to all values >= 100
+UNIX_TIME_CONVERSION:
+  summary: Converts values to a native Ruby or Python time object
+  parameters:
+    - name: Seconds Item Name
+      required: true
+      description: The name of the item which contains the seconds since the epoch.
+      values: .*
+    - name: Microseconds Item Name
+      required: false
+      description: The name of the item which contains the microseconds since the epoch.
+      values: .*
+    - name: Seconds Type
+      required: false
+      description: How to read the seconds item. Defaults to 'RAW'.
+      values: [RAW, CONVERTED]
+    - name: Microseconds Type
+      required: false
+      description: How to read the microseconds item. Defaults to 'RAW'.
+      values: [RAW, CONVERTED]
+  ruby_example: READ_CONVERSION unix_time_conversion.rb TIMESEC TIMEUS
+  python_example: READ_CONVERSION openc3/conversions/unix_time_conversion.py TIMESEC TIMEUS
+UNIX_TIME_FORMATTED_CONVERSION:
+  summary: Converts values to a formatted time string like "YYYY/MM/DD HH:MM:SS.US"
+  parameters:
+    - name: Seconds Item Name
+      required: true
+      description: The name of the item which contains the seconds since the epoch.
+      values: .*
+    - name: Microseconds Item Name
+      required: false
+      description: The name of the item which contains the microseconds since the epoch.
+      values: .*
+    - name: Seconds Type
+      required: false
+      description: How to read the seconds item. Defaults to 'RAW'.
+      values: [RAW, CONVERTED]
+    - name: Microseconds Type
+      required: false
+      description: How to read the microseconds item. Defaults to 'RAW'.
+      values: [RAW, CONVERTED]
+  ruby_example: READ_CONVERSION unix_time_formatted_conversion.rb TIMESEC TIMEUS
+  python_example: READ_CONVERSION openc3/conversions/unix_time_formatted_conversion.py TIMESEC TIMEUS
+UNIX_TIME_SECONDS_CONVERSION:
+  summary: Converts values to a floating point number of seconds since the epoch
+  parameters:
+    - name: Seconds Item Name
+      required: true
+      description: The name of the item which contains the seconds since the epoch.
+      values: .*
+    - name: Microseconds Item Name
+      required: false
+      description: The name of the item which contains the microseconds since the epoch.
+      values: .*
+    - name: Seconds Type
+      required: false
+      description: How to read the seconds item. Defaults to 'RAW'.
+      values: [RAW, CONVERTED]
+    - name: Microseconds Type
+      required: false
+      description: How to read the microseconds item. Defaults to 'RAW'.
+      values: [RAW, CONVERTED]
+  ruby_example: READ_CONVERSION unix_time_seconds_conversion.rb TIMESEC TIMEUS
+  python_example: READ_CONVERSION openc3/conversions/unix_time_seconds_conversion.py TIMESEC TIMEUS

data/data/config/item_modifiers.yaml

@@ -37,36 +37,7 @@ READ_CONVERSION:
     takes extra parameters and must always implement the `call` method. The conversion
     factor is applied to the raw value in the telemetry packet before it is displayed
     to the user. The user still has the ability to see the raw unconverted value
-    in a details dialog.
-  ruby_example: |
-    READ_CONVERSION the_great_conversion.rb 1000
-
-    Defined in the_great_conversion.rb:
-
-    require 'openc3/conversions/conversion'
-    module OpenC3
-      class TheGreatConversion < Conversion
-        def initialize(multiplier)
-          super()
-          @multiplier = multiplier.to_f
-        end
-        def call(value, packet, buffer)
-          return value * @multiplier
-        end
-      end
-    end
-  python_example: |
-    READ_CONVERSION the_great_conversion.py 1000
-
-    Defined in the_great_conversion.py:
-
-    from openc3.conversions.conversion import Conversion
-    class TheGreatConversion(Conversion):
-        def __init__(self, multiplier):
-            super().__init__()
-            self.multiplier = float(multiplier)
-        def call(self, value, packet, buffer):
-            return value * self.multiplier
+    in a details dialog. For more information see the [Conversion](/docs/configuration/conversions) documentation.
   parameters:
     - name: Class Filename
       required: true
@@ -80,50 +51,16 @@ READ_CONVERSION:
       description: Additional parameter values for the conversion which are passed
         to the class constructor.
       values: .*
+  ruby_example: |
+    READ_CONVERSION ip_read_conversion.rb
+  python_example: |
+    READ_CONVERSION openc3/conversions/ip_read_conversion.rb
 POLY_READ_CONVERSION:
   summary: Adds a polynomial conversion factor to the current telemetry item
-  description: The conversion factor is applied to raw value in the telemetry
-    packet before it is displayed to the user. The user still has the ability
-    to see the raw unconverted value in a details dialog.
-  example: POLY_READ_CONVERSION 10 0.5 0.25
-  parameters:
-    - name: C0
-      required: true
-      description: Coefficient
-      values: .*
-    - name: Cx
-      required: false
-      description: Additional coefficient values for the conversion. Any order
-        polynomial conversion may be used so the value of 'x' will vary with the
-        order of the polynomial. Note that larger order polynomials take longer
-        to process than shorter order polynomials, but are sometimes more accurate.
-      values: .*
+  description: See [Polynomial Conversion](/docs/configuration/conversions#polynomial_conversion) for more information.
 SEG_POLY_READ_CONVERSION:
   summary: Adds a segmented polynomial conversion factor to the current telemetry item
-  description: This conversion factor is applied to the raw value in the telemetry packet
-    before it is displayed to the user. The user still has the ability to see the raw
-    unconverted value in a details dialog.
-  example: |
-    SEG_POLY_READ_CONVERSION 0 10 0.5 0.25 # Apply the conversion to all values < 50
-    SEG_POLY_READ_CONVERSION 50 11 0.5 0.275 # Apply the conversion to all values >= 50 and < 100
-    SEG_POLY_READ_CONVERSION 100 12 0.5 0.3 # Apply the conversion to all values >= 100
-  parameters:
-    - name: Lower Bound
-      required: true
-      description: Defines the lower bound of the range of values that this segmented
-        polynomial applies to. Is ignored for the segment with the smallest lower bound.
-      values: .*
-    - name: C0
-      required: true
-      description: Coefficient
-      values: .*
-    - name: Cx
-      required: false
-      description: Additional coefficient values for the conversion. Any order
-        polynomial conversion may be used so the value of 'x' will vary with the
-        order of the polynomial. Note that larger order polynomials take longer
-        to process than shorter order polynomials, but are sometimes more accurate.
-      values: .*
+  description: See [Segmented Polynomial Conversion](/docs/configuration/conversions#segmented_polynomial_conversion) for more information.
 GENERIC_READ_CONVERSION_START:
   summary: Start a generic read conversion
   description: Adds a generic conversion function to the current telemetry item.

data/data/config/parameter_modifiers.yaml

@@ -69,7 +69,7 @@ WRITE_CONVERSION:
     It must implement the `initialize` (Ruby) or `__init__` (Python) method if it
     takes extra parameters and must always implement the `call` method. The conversion
     factor is applied to the value entered by the user before it is written into
-    the binary command packet and sent.
+    the binary command packet and sent. For more information see the [Conversion](/docs/configuration/conversions) documentation.
 
     When applying a write_conversion sometimes the data type changes,
     e.g. creating a UINT from an input STRING (for an example of this see
@@ -90,90 +90,30 @@ WRITE_CONVERSION:
     given_values() method which can be used to retrieve a hash of the user provided
     values to the command. That can be used to check parameter values passed in.
     :::
-  ruby_example: |
-    WRITE_CONVERSION the_great_conversion.rb 1000
-
-    Defined in the_great_conversion.rb:
-
-    require 'openc3/conversions/conversion'
-    module OpenC3
-      class TheGreatConversion < Conversion
-        def initialize(multiplier)
-          super()
-          @multiplier = multiplier.to_f
-        end
-        def call(value, packet, buffer)
-          return value * multiplier
-        end
-      end
-    end
-  python_example: |
-    WRITE_CONVERSION the_great_conversion.py 1000
-
-    Defined in the_great_conversion.py:
-
-    from openc3.conversions.conversion import Conversion
-    class TheGreatConversion(Conversion):
-        def __init__(self, multiplier):
-            super().__init__()
-            self.multiplier = float(multiplier)
-        def call(self, value, packet, buffer):
-            return value * self.multiplier
   parameters:
     - name: Class Filename
       required: true
       description: The filename which contains the Ruby or Python class. The filename must
         be named after the class such that the class is a CamelCase version of the
         underscored filename. For example, 'the_great_conversion.rb' should contain
-        'class TheGreatConversion'.
+        'class TheGreatConversion'. Note the built-in Python conversions must specify
+        the full path to the file, e.g. 'openc3/conversions/bit_reverse_conversion.py'.
       values: .*
     - name: Parameter
       required: false
       description: Additional parameter values for the conversion which are passed
         to the class constructor.
       values: .*
+  ruby_example: |
+    WRITE_CONVERSION ip_write_conversion.rb
+  python_example: |
+    WRITE_CONVERSION openc3/conversions/ip_write_conversion.py
 POLY_WRITE_CONVERSION:
   summary: Adds a polynomial conversion factor to the current command parameter
-  description: The conversion factor is applied to the value entered by the user
-    before it is written into the binary command packet and sent.
-  example: POLY_WRITE_CONVERSION 10 0.5 0.25
-  parameters:
-    - name: C0
-      required: true
-      description: Coefficient
-      values: .*
-    - name: Cx
-      required: false
-      description: Additional coefficient values for the conversion. Any order
-        polynomial conversion may be used so the value of 'x' will vary with the
-        order of the polynomial. Note that larger order polynomials take longer
-        to process than shorter order polynomials, but are sometimes more accurate.
-      values: .*
+  description: See [Polynomial Conversion](/docs/configuration/conversions#polynomial_conversion) for more information.
 SEG_POLY_WRITE_CONVERSION:
   summary: Adds a segmented polynomial conversion factor to the current command parameter
-  description: This conversion factor is applied to the value entered by the user
-    before it is written into the binary command packet and sent.
-  example: |
-    SEG_POLY_WRITE_CONVERSION 0 10 0.5 0.25 # Apply the conversion to all values < 50
-    SEG_POLY_WRITE_CONVERSION 50 11 0.5 0.275 # Apply the conversion to all values >= 50 and < 100
-    SEG_POLY_WRITE_CONVERSION 100 12 0.5 0.3 # Apply the conversion to all values >= 100
-  parameters:
-    - name: Lower Bound
-      required: true
-      description: Defines the lower bound of the range of values that this segmented
-        polynomial applies to. Is ignored for the segment with the smallest lower bound.
-      values: .*
-    - name: C0
-      required: true
-      description: Coefficient
-      values: .*
-    - name: Cx
-      required: false
-      description: Additional coefficient values for the conversion. Any order
-        polynomial conversion may be used so the value of 'x' will vary with the
-        order of the polynomial. Note that larger order polynomials take longer
-        to process than shorter order polynomials, but are sometimes more accurate.
-      values: .*
+  description: See [Segmented Polynomial Conversion](/docs/configuration/conversions#segmented_polynomial_conversion) for more information.
 GENERIC_WRITE_CONVERSION_START:
   summary: Start a generic write conversion
   description: |

data/lib/openc3/api/api.rb

@@ -38,7 +38,7 @@ require 'openc3/topics/topic'
 begin
   require 'openc3-enterprise/api/cmd_authority_api'
 rescue LoadError
-  # LoadError expected for Open Source Edition
+  # LoadError expected for Core
 end
 
 

data/lib/openc3/conversions/unix_time_conversion.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2022, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -35,7 +35,7 @@ module OpenC3
       super()
       @seconds_item_name = seconds_item_name
       @microseconds_item_name = microseconds_item_name
-      @converted_type = :RUBY_TIME
+      @converted_type = :TIME
       @converted_bit_size = 0
       @seconds_type = seconds_type.to_sym
       @microseconds_type = microseconds_type.to_sym

data/lib/openc3/conversions/unix_time_formatted_conversion.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2024, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -32,9 +32,9 @@ module OpenC3
     #   represents the number of seconds since the UNIX time epoch
     # @param microseconds_item_name [String] The telemetry item in the packet
     #   which represents microseconds
-    def initialize(seconds_item_name, microseconds_item_name = nil)
+    def initialize(seconds_item_name, microseconds_item_name = nil, seconds_type = 'RAW', microseconds_type = 'RAW')
       # @params is set by the parent class in super()
-      super(seconds_item_name, microseconds_item_name)
+      super(seconds_item_name, microseconds_item_name, seconds_type, microseconds_type)
       @converted_type = :STRING
       @converted_bit_size = 0
     end

data/lib/openc3/conversions/unix_time_seconds_conversion.rb

@@ -14,7 +14,7 @@
 # GNU Affero General Public License for more details.
 
 # Modified by OpenC3, Inc.
-# All changes Copyright 2024, OpenC3, Inc.
+# All changes Copyright 2025, OpenC3, Inc.
 # All Rights Reserved
 #
 # This file may also be used under the terms of a commercial license
@@ -32,9 +32,9 @@ module OpenC3
     #   represents the number of seconds since the UNIX time epoch
     # @param microseconds_item_name [String] The telemetry item in the packet
     #   which represents microseconds
-    def initialize(seconds_item_name, microseconds_item_name = nil)
+    def initialize(seconds_item_name, microseconds_item_name = nil, seconds_type = 'RAW', microseconds_type = 'RAW')
       # @params is set by the parent class in super()
-      super(seconds_item_name, microseconds_item_name)
+      super(seconds_item_name, microseconds_item_name, seconds_type, microseconds_type)
       @converted_type = :FLOAT
       @converted_bit_size = 64
     end

data/lib/openc3/core_ext/time.rb

@@ -249,19 +249,12 @@ class Time
     Time.total_seconds(self.hour, self.min, self.sec, self.usec)
   end
 
-  # @return [String] Date formatted as YYYY/MM/DD HH:MM:SS.US UTC_OFFSET
-  def formatted(include_year = true, fractional_digits = 3, include_utc_offset = false)
+  # @return [String] Date formatted as YYYY/MM/DD HH:MM:SS.US
+  def formatted(include_year = true, fractional_digits = 3)
     str =  ""
     str << "%Y/%m/%d " if include_year
     str << "%H:%M:%S"
     str << ".%#{fractional_digits}N" if fractional_digits > 0
-    if include_utc_offset
-      if self.utc?
-        str << " UTC"
-      else
-        str << " %z"
-      end
-    end
     self.strftime(str)
   end
 

data/lib/openc3/microservices/cleanup_microservice.rb

@@ -102,6 +102,6 @@ end
 
 if __FILE__ == $0
   OpenC3::CleanupMicroservice.run
-  ThreadManager.instance.shutdown
-  ThreadManager.instance.join
+  OpenC3::ThreadManager.instance.shutdown
+  OpenC3::ThreadManager.instance.join
 end

data/lib/openc3/microservices/decom_microservice.rb

@@ -254,6 +254,6 @@ end
 
 if __FILE__ == $0
   OpenC3::DecomMicroservice.run
-  ThreadManager.instance.shutdown
-  ThreadManager.instance.join
+  OpenC3::ThreadManager.instance.shutdown
+  OpenC3::ThreadManager.instance.join
 end

data/lib/openc3/microservices/interface_microservice.rb

@@ -824,7 +824,7 @@ module OpenC3
     end
 
     def sync_tlm_packet_counts(packet)
-      if @sync_packet_count_delay_seconds <= 0
+      if @sync_packet_count_delay_seconds <= 0 or $openc3_redis_cluster
         # Perfect but slow method
         packet.received_count = TargetModel.increment_telemetry_count(packet.target_name, packet.packet_name, 1, scope: @scope)
       else
@@ -880,6 +880,6 @@ end
 
 if __FILE__ == $0
   OpenC3::InterfaceMicroservice.run
-  ThreadManager.instance.shutdown
-  ThreadManager.instance.join
+  OpenC3::ThreadManager.instance.shutdown
+  OpenC3::ThreadManager.instance.join
 end

data/lib/openc3/microservices/log_microservice.rb

@@ -55,6 +55,8 @@ module OpenC3
       @cycle_size = 50_000_000 unless @cycle_size # ~50 MB
 
       @buffer_depth = DEFAULT_BUFFER_DEPTH unless @buffer_depth
+      @plws = {}
+
       @error_count = 0
       @metric.set(name: 'log_total', value: @count, type: 'counter')
       @metric.set(name: 'log_error_total', value: @error_count, type: 'counter')
@@ -144,6 +146,6 @@ end
 
 if __FILE__ == $0
   OpenC3::LogMicroservice.run
-  ThreadManager.instance.shutdown
-  ThreadManager.instance.join
+  OpenC3::ThreadManager.instance.shutdown
+  OpenC3::ThreadManager.instance.join
 end

data/lib/openc3/microservices/multi_microservice.rb

@@ -53,6 +53,6 @@ module OpenC3
 end
 if __FILE__ == $0
   OpenC3::MultiMicroservice.run
-  ThreadManager.instance.shutdown
-  ThreadManager.instance.join
+  OpenC3::ThreadManager.instance.shutdown
+  OpenC3::ThreadManager.instance.join
 end

data/lib/openc3/microservices/periodic_microservice.rb

@@ -91,6 +91,6 @@ end
 
 if __FILE__ == $0
   OpenC3::PeriodicMicroservice.run
-  ThreadManager.instance.shutdown
-  ThreadManager.instance.join
+  OpenC3::ThreadManager.instance.shutdown
+  OpenC3::ThreadManager.instance.join
 end