openc3 5.5.2 → 5.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ff99b8c3ca332659e787d054c96ed43f617a4e53ba3aea706c4ed799d024f9d
-  data.tar.gz: 72b7fe317faf9e6902a797de6ebfbd8069b51967c0adb54e9367f13ed74b4f15
+  metadata.gz: aec8c77fa13a1d046d9a6a75b0ab2854a5c130a9ea967dc7b9164ae3840ca4a1
+  data.tar.gz: 9071d947cf90051add2c714a74c40ab54b359b4a16861029e93e290cd68b05bd
 SHA512:
-  metadata.gz: 73ca222afa29f68ad9c3dcdbe697a90eebb9d656db43e5f69dcc3e0fb7e5bb6f5dd0e774a80c4282a26a623a9d63ee0d8a8b8ad6f743e9bc6cad5cca876bc395
-  data.tar.gz: a33e0239e3c688968587154945b426a5f3f2f6f73d9ea0270868235b8ccef74c19f4a823ea2d9665c07f15a3441de577da79b46ac8c4fc0877959a0d4552ee02
+  metadata.gz: 399787f9f75cf2d66d340662e9dbfb57feb700ea6661f0e93668a88e0b327dead2f1ca76a910da7d604ffce64ec627e8a177997d4c6c5292c281c8e410510516
+  data.tar.gz: bae872d3fef6e8e2014d116b461b4685e56222e9d2ac31c5c1ee2720733affa3ae5cb0b482dfc5c30488d34809063e97a352b69c8afb1bb2cb5c8e5eabe4abb6

data/bin/openc3cli

@@ -79,6 +79,28 @@ def print_usage
   puts ""
 end
 
+def check_environment
+  hostname = ENV['OPENC3_API_HOSTNAME'] || (ENV['OPENC3_DEVEL'] ? '127.0.0.1' : 'openc3-cosmos-cmd-tlm-api')
+  begin
+    Resolv.getaddress(hostname)
+  rescue Resolv::ResolvError
+    abort "Unable to resolv api hostname: #{hostname}"
+  end
+
+  if hostname =~ /openc3-cosmos-cmd-tlm-api/
+    $openc3_in_cluster = true
+  else
+    $openc3_in_cluster = false
+  end
+
+  unless $openc3_in_cluster
+    # Make sure the user has all the required environment variables set
+    abort "OPENC3_API_HOSTNAME environment variable is required" unless ENV['OPENC3_API_HOSTNAME']
+    abort "OPENC3_API_PORT environment variable is required" unless ENV['OPENC3_API_PORT']
+    abort "OPENC3_API_PASSWORD environment variable is required" unless ENV['OPENC3_API_PASSWORD']
+  end
+end
+
 def migrate(args)
   MIGRATE_PARSER.parse!(args)
   abort(MIGRATE_PARSER.to_s) if args.length == 0
@@ -101,9 +123,7 @@ def migrate(args)
   # NOTE: generate does a chdir to be inside the plugin directory
   ###############################################################
   plugin = args.shift
-  target_name = OpenC3::CliGenerator.generate(['plugin', plugin])
-  # Delete target contents from the plugin framework (but keep directory)
-  FileUtils.rm_rf Dir.glob("targets/#{target_name}/*")
+  OpenC3::CliGenerator.generate(['plugin', plugin])
 
   if MIGRATE_OPTIONS.all
     # Grab all target directories to match the command line input
@@ -301,6 +321,29 @@ def update_plugin(plugin_file_path, plugin_name, variables: nil, plugin_txt_line
   end
 end
 
+def wait_process_complete(process_name)
+  STDOUT.flush
+  state = 'Running'
+  status = nil
+  while state == 'Running'
+    status = plugin_status(process_name)
+    state = status['state']
+    sleep(5)
+    print '.'
+    STDOUT.flush
+  end
+  puts "\nFinished: #{state}"
+  puts "Output:\n"
+  puts status['output']
+  if state == 'Complete'
+    puts "Success!"
+    exit 0
+  else
+    puts "Failed!"
+    exit 1
+  end
+end
+
 # Loads a plugin into the OpenC3 system
 # This code is used from the command line and is the same code that gets called if you
 # edit/upgrade or install a new plugin from the Admin interface
@@ -320,90 +363,142 @@ end
 #
 def load_plugin(plugin_file_path, scope:, plugin_hash_file: nil, force: false)
   scope ||= 'DEFAULT'
-  # Only create the scope if it doesn't already exist
-  unless OpenC3::ScopeModel.names.include?(scope)
-    begin
-      puts "Creating scope: #{scope}"
-      scope_model = OpenC3::ScopeModel.new(name: scope, scope: scope)
-      scope_model.create
-      scope_model.deploy(".", {})
-    rescue => err
-      abort("Error creating scope: #{scope}: #{err.formatted}")
+  check_environment()
+  if $openc3_in_cluster
+    # In Cluster
+
+    # Only create the scope if it doesn't already exist
+    unless OpenC3::ScopeModel.names.include?(scope)
+      begin
+        puts "Creating scope: #{scope}"
+        scope_model = OpenC3::ScopeModel.new(name: scope, scope: scope)
+        scope_model.create
+        scope_model.deploy(".", {})
+      rescue => err
+        abort("Error creating scope: #{scope}: #{err.formatted}")
+      end
     end
-  end
 
-  begin
-    if plugin_hash_file
-      # Admin Create / Edit / or Upgrade Plugin
-      OpenC3::PluginModel.install_phase1(plugin_file_path, scope: scope)
-      plugin_hash = JSON.parse(File.read(plugin_hash_file), :allow_nan => true, :create_additions => true)
-    else
-      # Init or Command Line openc3cli load with no plugin_hash_file
-      file_full_name = File.basename(plugin_file_path, ".gem")
-      file_gem_name = file_full_name.split('-')[0..-2].join('-')
-      found = false
-      plugin_names = OpenC3::PluginModel.names(scope: scope)
-      plugin_names.each do |plugin_name|
-        gem_name = plugin_name.split("__")[0]
-        full_name = File.basename(gem_name, ".gem")
-        gem_name = full_name.split('-')[0..-2].join('-')
-        if file_gem_name == gem_name
-          found = true
-          # Upgrade if version changed else do nothing
-          if file_full_name != full_name
-            update_plugin(plugin_file_path, plugin_name, scope: scope, existing_plugin_name: plugin_name, force: force)
-          else
-            puts "No version change detected for: #{plugin_name}"
+    begin
+      if plugin_hash_file
+        # Admin Create / Edit / or Upgrade Plugin
+        OpenC3::PluginModel.install_phase1(plugin_file_path, scope: scope)
+        plugin_hash = JSON.parse(File.read(plugin_hash_file), :allow_nan => true, :create_additions => true)
+      else
+        # Init or Command Line openc3cli load with no plugin_hash_file
+        file_full_name = File.basename(plugin_file_path, ".gem")
+        file_gem_name = file_full_name.split('-')[0..-2].join('-')
+        found = false
+        plugin_names = OpenC3::PluginModel.names(scope: scope)
+        plugin_names.each do |plugin_name|
+          gem_name = plugin_name.split("__")[0]
+          full_name = File.basename(gem_name, ".gem")
+          gem_name = full_name.split('-')[0..-2].join('-')
+          if file_gem_name == gem_name
+            found = true
+            # Upgrade if version changed else do nothing
+            if file_full_name != full_name
+              update_plugin(plugin_file_path, plugin_name, scope: scope, existing_plugin_name: plugin_name, force: force)
+            else
+              puts "No version change detected for: #{plugin_name}"
+            end
           end
         end
+        return if found
+
+        plugin_hash = OpenC3::PluginModel.install_phase1(plugin_file_path, scope: scope)
       end
-      return if found
 
-      plugin_hash = OpenC3::PluginModel.install_phase1(plugin_file_path, scope: scope)
-    end
+      # Determine if plugin named in plugin_hash exists
+      existing_plugin_hash = OpenC3::PluginModel.get(name: plugin_hash['name'], scope: scope)
+
+      # Existing plugin hash will be present if plugin is being edited or upgraded
+      # However, a missing existing could also be that a plugin was updated in local mode directly from across installations
+      # changing the plugin name without really meaning to create a new instance of the plugin
+      # ie.
+      # User on machine 1 checks in a changed plugin_instance.json with a different name - There is still only one plugin desired and committed
+      # User on machine 2 starts up with the new configuration, OpenC3::PluginModel.get will return nil because the exact name is different
+      # In this case, the plugin should be updated without installing a second instance. analyze_local_mode figures this out.
+      unless existing_plugin_hash
+        existing_plugin_hash = OpenC3::LocalMode.analyze_local_mode(plugin_name: plugin_hash['name'], scope: scope)
+      end
 
-    # Determine if plugin named in plugin_hash exists
-    existing_plugin_hash = OpenC3::PluginModel.get(name: plugin_hash['name'], scope: scope)
-
-    # Existing plugin hash will be present if plugin is being edited or upgraded
-    # However, a missing existing could also be that a plugin was updated in local mode directly from across installations
-    # changing the plugin name without really meaning to create a new instance of the plugin
-    # ie.
-    # User on machine 1 checks in a changed plugin_instance.json with a different name - There is still only one plugin desired and committed
-    # User on machine 2 starts up with the new configuration, OpenC3::PluginModel.get will return nil because the exact name is different
-    # In this case, the plugin should be updated without installing a second instance. analyze_local_mode figures this out.
-    unless existing_plugin_hash
-      existing_plugin_hash = OpenC3::LocalMode.analyze_local_mode(plugin_name: plugin_hash['name'], scope: scope)
+      if existing_plugin_hash
+        # Upgrade or Edit
+        update_plugin(plugin_file_path, plugin_hash['name'], variables: plugin_hash['variables'], scope: scope,
+          plugin_txt_lines: plugin_hash['plugin_txt_lines'], existing_plugin_name: existing_plugin_hash['name'], force: force)
+      else
+        # New Install
+        puts "Loading new plugin: #{plugin_file_path}\n#{plugin_hash}"
+        plugin_hash = OpenC3::PluginModel.install_phase2(plugin_hash, scope: scope)
+        OpenC3::LocalMode.update_local_plugin(plugin_file_path, plugin_hash, scope: scope)
+      end
+    rescue => error
+      abort("Error installing plugin: #{scope}: #{plugin_file_path}\n#{error.message}")
     end
+  else
+    # Outside Cluster
+    require 'openc3/script'
 
-    if existing_plugin_hash
-      # Upgrade or Edit
-      update_plugin(plugin_file_path, plugin_hash['name'], variables: plugin_hash['variables'], scope: scope,
-        plugin_txt_lines: plugin_hash['plugin_txt_lines'], existing_plugin_name: existing_plugin_hash['name'], force: force)
+    if plugin_hash_file
+      plugin_hash = JSON.parse(File.read(plugin_hash_file), :allow_nan => true, :create_additions => true)
     else
-      # New Install
-      puts "Loading new plugin: #{plugin_file_path}\n#{plugin_hash}"
-      plugin_hash = OpenC3::PluginModel.install_phase2(plugin_hash, scope: scope)
-      OpenC3::LocalMode.update_local_plugin(plugin_file_path, plugin_hash, scope: scope)
+      plugin_hash = plugin_install_phase1(plugin_file_path, scope: scope)
     end
-  rescue => error
-    abort("Error installing plugin: #{scope}: #{plugin_file_path}\n#{error.message}")
+
+    process_name = plugin_install_phase2(plugin_hash, scope: scope)
+
+    print "Installing..."
+    wait_process_complete(process_name)
   end
 end
 
 def unload_plugin(plugin_name, scope:)
   scope ||= 'DEFAULT'
-  begin
-    OpenC3::PluginModel.new(name: plugin_name, scope: scope).destroy
-    OpenC3::LocalMode.remove_local_plugin(plugin_name, scope: scope)
-    OpenC3::Logger.info("PluginModel destroyed: #{plugin_name}", scope: scope)
-  rescue => err
-    abort("Error uninstalling plugin: #{scope}: #{plugin_name}: #{err.formatted}")
+  check_environment()
+  if $openc3_in_cluster
+    begin
+      plugin_model = OpenC3::PluginModel.get_model(name: plugin_name, scope: scope)
+      plugin_model.destroy
+      OpenC3::LocalMode.remove_local_plugin(plugin_name, scope: scope)
+      OpenC3::Logger.info("PluginModel destroyed: #{plugin_name}", scope: scope)
+    rescue => err
+      abort("Error uninstalling plugin: #{scope}: #{plugin_name}: #{err.formatted}")
+    end
+  else
+    # Outside Cluster
+    require 'openc3/script'
+    process_name = plugin_uninstall(plugin_name, scope: scope)
+    print "Uninstalling..."
+    wait_process_complete(process_name)
+  end
+end
+
+def cli_gem_install(gem_filename, scope:)
+  scope ||= 'DEFAULT'
+  check_environment()
+  if $openc3_in_cluster
+    OpenC3::GemModel.install(gem_filename, scope: scope)
+  else
+    # Outside Cluster
+    require 'openc3/script'
+    process_name = gem_install(gem_filename, scope: scope)
+    print "Installing..."
+    wait_process_complete(process_name)
   end
 end
 
-def gem_install(gem_filename, scope:)
-  OpenC3::GemModel.install(gem_filename, scope: scope)
+def cli_gem_uninstall(gem_filename, scope:)
+  scope ||= 'DEFAULT'
+  check_environment()
+  if $openc3_in_cluster
+    OpenC3::GemModel.destroy(gem_filename)
+  else
+    # Outside Cluster
+    require 'openc3/script'
+    gem_uninstall(gem_filename, scope: scope)
+    puts "Success!"
+  end
 end
 
 def get_redis_keys
@@ -510,7 +605,10 @@ if not ARGV[0].nil? # argument(s) given
     unload_plugin(ARGV[1], scope: ARGV[2])
 
   when 'geminstall'
-    gem_install(ARGV[1], scope: ARGV[2])
+    cli_gem_install(ARGV[1], scope: ARGV[2])
+
+  when 'gemuninstall'
+    cli_gem_uninstall(ARGV[1], scope: ARGV[2])
 
   when 'generate'
     OpenC3::CliGenerator.generate(ARGV[1..-1])

data/data/config/_interfaces.yaml

@@ -17,7 +17,6 @@ tcpip_client_interface.rb:
     - name: Write Timeout
       required: true
       description: Number of seconds to wait before aborting the write.
-        Pass 'nil' to block on write.
       values: .+
     - name: Read Timeout
       required: true
@@ -43,7 +42,6 @@ tcpip_server_interface.rb:
     - name: Write Timeout
       required: true
       description: Number of seconds to wait before aborting the write.
-        Pass 'nil' to block on write.
       values: .+
     - name: Read Timeout
       required: true
@@ -90,9 +88,7 @@ udp_interface.rb:
       values: .+
     - name: Write Timeout
       required: false
-      description:
-        Number of seconds to wait before aborting the write. Default is
-        'nil' (block on write).
+      description: Number of seconds to wait before aborting the write
       values: .+
     - name: Read Timeout
       required: false
@@ -134,7 +130,6 @@ serial_interface.rb:
     - name: Write Timeout
       required: true
       description: Number of seconds to wait before aborting the write.
-        Pass 'nil' to block on write.
       values: .+
     - name: Read Timeout
       required: true

data/data/config/interface_modifiers.yaml

@@ -6,6 +6,9 @@ MAP_TARGET:
       required: true
       description: Target name to map to this interface
       values: .+
+  example: |
+    INTERFACE DATA_INT tcpip_client_interface.rb host.docker.internal 8080 8081 10.0 nil BURST
+      MAP_TARGET DATA
 MAP_CMD_TARGET:
   summary: Maps a target name to an interface for commands only
   since: 5.2.0
@@ -14,6 +17,9 @@ MAP_CMD_TARGET:
       required: true
       description: Command target name to map to this interface
       values: .+
+  example: |
+    INTERFACE CMD_INT tcpip_client_interface.rb host.docker.internal 8080 8081 10.0 nil BURST
+      MAP_CMD_TARGET DATA # Only DATA commands go on the CMD_INT interface
 MAP_TLM_TARGET:
   summary: Maps a target name to an interface for telemetry only
   since: 5.2.0
@@ -22,6 +28,9 @@ MAP_TLM_TARGET:
       required: true
       description: Telemetry target name to map to this interface
       values: .+
+  example: |
+    INTERFACE TLM_INT tcpip_client_interface.rb host.docker.internal 8080 8081 10.0 nil BURST
+      MAP_TLM_TARGET DATA # Only DATA telemetry received on TLM_INT interface
 DONT_CONNECT:
   summary: Server will not automatically try to connect to the interface at startup
 DONT_RECONNECT:
@@ -43,14 +52,41 @@ DISABLE_DISCONNECT:
     Use this keyword to prevent the user from disconnecting from the interface.
     This is typically used in a 'production' environment where you would not want
     the user to inadvertantly disconnect from a target.
-DONT_LOG:
-  summary: Disable logging commands and telemetry on this interface
 LOG_RAW:
+  summary: Deprecated, use LOG_STREAM
+LOG_STREAM:
   summary: Log all data on the interface exactly as it is sent and received
   description:
-    LOG_RAW does not add any OpenC3 headers and thus can not be read by OpenC3 tools.
+    LOG_STREAM does not add any OpenC3 headers and thus can not be read by OpenC3 tools.
     It is primarily useful for low level debugging of an interface. You will have to
     manually parse these logs yourself using a hex editor or other application.
+  since: 5.5.2
+  parameters:
+    - name: Cycle Time
+      required: false
+      description:
+        Amount of time to wait before cycling the log file. Default is 10 min.
+        If nil refer to Cycle Hour and Cycle Minute.
+      values: .*
+    - name: Cycle Size
+      required: false
+      description: Amount of data to write before cycling the log file. Default is 50MB.
+      values: .*
+    - name: Cycle Hour
+      required: false
+      description:
+        The time at which to cycle the log. Combined with Cycle Minute to cycle
+        the log daily at the specified time. If nil, the log will be cycled hourly at the specified Cycle Minute.
+        Only applies if Cycle Time is nil.
+      values: .*
+    - name: Cycle Minute
+      required: false
+      description: See Cycle Hour.
+      values: .*
+  example: |
+    INTERFACE EXAMPLE example_interface.rb
+      # Override the default log time of 600
+      LOG_STREAM 60
 PROTOCOL:
   summary: Protocols modify the interface by processing the data
   description:
@@ -71,6 +107,14 @@ PROTOCOL:
     - name: Protocol specific parameters
       required: false
       description: Additional parameters used by the protocol
+  example: |
+    INTERFACE DATA_INT tcpip_client_interface.rb host.docker.internal 8080 8081 10.0 nil nil
+      MAP_TARGET DATA
+      # Rather than defining the LENGTH protocol on the INTERFACE line we define it here
+      PROTOCOL READ LengthProtocol 0 16 0 1 BIG_ENDIAN 4 0xBA5EBA11
+    INTERFACE DATA_INT tcpip_client_interface.rb host.docker.internal 8080 8081 10.0 nil BURST
+      MAP_TARGET DATA
+      PROTOCOL READ IgnorePacketProtocol INST IMAGE # Drop all INST IMAGE packets
 OPTION:
   summary: Set a parameter on an interface
   description:
@@ -90,6 +134,10 @@ OPTION:
       required: false
       description: Parameters to pass to the option
       values: .*
+  example: |
+    INTERFACE SERIAL_INT serial_interface.rb COM1 COM1 115200 NONE 1 10.0 nil
+      OPTION FLOW_CONTROL RTSCTS
+      OPTION DATA_BITS 8
 SECRET:
   summary: Define a secret needed by this interface
   description: Defines a secret for this interface and optionally assigns its value to an option
@@ -105,7 +153,7 @@ SECRET:
       required: true
       description: The name of the secret to retrieve
       values: .*
-    - name: Environment Variable of File Path
+    - name: Environment Variable or File Path
       required: true
       description: Environment variable name or file path to store secret
       values: .*
@@ -117,3 +165,6 @@ SECRET:
       required: false
       description: Name of the secret store for stores with multipart keys
       values: .*
+  example: |
+    SECRET ENV USERNAME ENV_USERNAME USERNAME
+    SECRET FILE KEY "/tmp/DATA/cert" KEY

data/data/config/microservice.yaml

@@ -1,7 +1,6 @@
 ---
 MICROSERVICE:
   summary: Defines a new microservice
-  example: MICROSERVICE EXAMPLE example-microservice
   description: Defines a microservice that the plugin adds to the OpenC3 system. Microservices are background software processes that perform persistent processing.
   parameters:
     - name: Microservice Folder Name
@@ -12,6 +11,7 @@ MICROSERVICE:
       description: The specific name of this instance of the microservice in the OpenC3 system
       required: true
       values: .+
+  example: MICROSERVICE EXAMPLE openc3-example
   modifiers:
     ENV:
       summary: Sets an environment variable in the microservice.
@@ -24,6 +24,9 @@ MICROSERVICE:
           required: true
           description: Environment variable value
           values: .+
+      example: |
+        MICROSERVICE EXAMPLE openc3-example
+          ENV COMPANY OpenC3
     WORK_DIR:
       summary: Set the working directory
       description: Working directory to run the microservice CMD in.  Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
@@ -32,6 +35,9 @@ MICROSERVICE:
           required: true
           description: Working directory to run the microservice CMD in. Can be a path relative to the microservice folder in the plugin, or an absolute path in the container the microservice runs in.
           values: .+
+      example: |
+        MICROSERVICE EXAMPLE openc3-example
+          WORK_DIR .
     PORT:
       summary: Open port for the microservice
       description: Kubernetes needs a Service to be applied to open a port so this is required for Kubernetes support
@@ -45,6 +51,9 @@ MICROSERVICE:
           required: false
           description: Port protocol. Default is TCP.
           values: .+
+      example: |
+        MICROSERVICE EXAMPLE openc3-example
+          PORT 7272
     TOPIC:
       summary: Associate a Redis topic
       description: Redis topic to associate with this microservice. Standard OpenC3 microservices such as decom_microservice use this information to know what packet streams to subscribe to. The TOPIC keyword can be used as many times as necessary to associate all needed topics.
@@ -53,6 +62,12 @@ MICROSERVICE:
           required: true
           description: Redis Topic to associate with the microservice
           values: .+
+      example: |
+        MICROSERVICE EXAMPLE openc3-example
+          # Manually assigning topics is an advanced topic and requires
+          # intimate knowledge of the internal COSMOS data structures.
+          TOPIC DEFAULT__openc3_log_messages
+          TOPIC DEFAULT__TELEMETRY__EXAMPLE__STATUS
     TARGET_NAME:
       summary: Associate a OpenC3 target
       description: OpenC3 target to associate with the microservice. For standard OpenC3 microservices such as decom_microservice this causes the target configuration to get loaded into the container for the microservice.
@@ -61,6 +76,9 @@ MICROSERVICE:
           required: true
           description: OpenC3 target to associate with the microservice
           values: .+
+      example: |
+        MICROSERVICE EXAMPLE openc3-example
+          TARGET_NAME EXAMPLE
     CMD:
       summary: Command line to execute to run the microservice.
       description: Command line to execute to run the microservice.
@@ -69,6 +87,9 @@ MICROSERVICE:
           required: true
           description: One or more arguments to exec to run the microservice.
           values: .+
+      example: |
+        MICROSERVICE EXAMPLE openc3-example
+          CMD ruby example_target.rb
     OPTION:
       summary: Pass an option to the microservice
       description: Generic key/value(s) options to pass to the microservice. These take the form of KEYWORD/PARAMS like a line in a OpenC3 configuration file. Multiple OPTION keywords can be used to pass multiple options to the microservice.
@@ -82,8 +103,8 @@ MICROSERVICE:
           description: One or more values to associate with the option
           values: .+
     CONTAINER:
-      summary: Docker Container.
-      description: Container to execute and run the microservice in.
+      summary: Docker Container
+      description: Container to execute and run the microservice in. Only used in COSMOS Enterprise Edition.
       parameters:
         - name: Args
           required: false
@@ -112,6 +133,9 @@ MICROSERVICE:
           required: false
           description: Name of the secret store for stores with multipart keys
           values: .*
+      example: |
+        SECRET ENV USERNAME ENV_USERNAME
+        SECRET FILE KEY "/tmp/DATA/cert"
     ROUTE_PREFIX:
       summary: Prefix of route
       description: Prefix of route to the microservice to expose externally with Traefik
@@ -121,3 +145,6 @@ MICROSERVICE:
           required: true
           description: Route prefix. Must be unique across all scopes. Something like /myprefix
           values: .*
+      example: |
+        MICROSERVICE CFDP CFDP
+          ROUTE_PREFIX /cfdp

data/ext/openc3/ext/crc/crc.c

@@ -18,7 +18,7 @@
 # All changes Copyright 2022, OpenC3, Inc.
 # All Rights Reserved
 #
-# This file may also be used under the terms of a commercial license 
+# This file may also be used under the terms of a commercial license
 # if purchased from OpenC3, Inc.
 */
 
@@ -27,6 +27,7 @@
 
 VALUE mOpenC3;
 VALUE cCrc;
+VALUE cCrc8;
 VALUE cCrc16;
 VALUE cCrc32;
 VALUE cCrc64;
@@ -98,6 +99,83 @@ static unsigned long long bit_reverse_64(unsigned long long value)
          ((unsigned long long)BIT_REVERSE_TABLE[(value >> 56) & 0x00000000000000ffULL]);
 }
 
+/*
+ * Calculate a 8-bit CRC
+ */
+static VALUE crc8_calculate(int argc, VALUE *argv, VALUE self)
+{
+  volatile VALUE param_data = Qnil;
+  volatile VALUE param_seed = Qnil;
+  unsigned char *data = NULL;
+  unsigned char *table = NULL;
+  int i = 0;
+  long length = 0;
+  unsigned char crc = 0;
+
+  switch (argc)
+  {
+  case 1:
+    Check_Type(argv[0], T_STRING);
+    param_data = argv[0];
+    param_seed = rb_ivar_get(self, id_ivar_seed);
+    break;
+  case 2:
+    Check_Type(argv[0], T_STRING);
+    param_data = argv[0];
+    if (argv[1] == Qnil)
+    {
+      param_seed = rb_ivar_get(self, id_ivar_seed);
+    }
+    else
+    {
+      param_seed = argv[1];
+    }
+    break;
+  default:
+    /* Invalid number of arguments given */
+    rb_raise(rb_eArgError, "wrong number of arguments (%d for 1..2)", argc);
+    break;
+  };
+
+  crc = NUM2UINT(param_seed);
+  data = (unsigned char *)RSTRING_PTR(param_data);
+  length = RSTRING_LEN(param_data);
+  table = (unsigned char *)RSTRING_PTR(rb_ivar_get(self, id_ivar_table));
+
+  if (RTEST(rb_ivar_get(self, id_ivar_reflect)))
+  {
+    for (i = 0; i < length; i++)
+    {
+      crc = (crc << 8) ^ table[(crc) ^ bit_reverse_8(data[i])];
+    }
+
+    if (RTEST(rb_ivar_get(self, id_ivar_xor)))
+    {
+      return UINT2NUM(bit_reverse_8(crc ^ 0xFF));
+    }
+    else
+    {
+      return UINT2NUM(bit_reverse_8(crc));
+    }
+  }
+  else
+  {
+    for (i = 0; i < length; i++)
+    {
+      crc = (crc << 8) ^ table[(crc) ^ data[i]];
+    }
+
+    if (RTEST(rb_ivar_get(self, id_ivar_xor)))
+    {
+      return UINT2NUM(crc ^ 0xFF);
+    }
+    else
+    {
+      return UINT2NUM(crc);
+    }
+  }
+}
+
 /*
  * Calculate a 16-bit CRC
  */
@@ -343,6 +421,9 @@ void Init_crc()
 
   cCrc = rb_define_class_under(mOpenC3, "Crc", rb_cObject);
 
+  cCrc8 = rb_define_class_under(mOpenC3, "Crc8", cCrc);
+  rb_define_method(cCrc8, "calc", crc8_calculate, -1);
+
   cCrc16 = rb_define_class_under(mOpenC3, "Crc16", cCrc);
   rb_define_method(cCrc16, "calc", crc16_calculate, -1);