cosmos 4.4.1-java → 4.4.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36e34fbd844de84ca2b8b051fa32cdb3d4a378b8042aeb968951af68e74a79da
-  data.tar.gz: c00194480b4dac9e5cc1c7c519f1f5b0f5ae343503735207ab22da09dcf6d18a
+  metadata.gz: acf444b515bd25779264c1a5f13436a212ef77d727137a44e9389ab9b64a4dfb
+  data.tar.gz: 4dbf05321b812f9a1ca0f1c05c29794870ab22e06e895073085017b2a2702da9
 SHA512:
-  metadata.gz: 948f3c0738765b8c62057871449b56f05490bc66a5dd31e78fa8d5bf57d0b4bdd5c90b895d5eee5e4a3f345ddfaf2396838ac882599d949e030ae448ff626be7
-  data.tar.gz: c326e41b536132fb332a888b2e63157f1e75c4f0aeb29143525183ccb0456c2653a8c457acbbcc0ffba45b3aebbd5bb5d434aae83e35fe4b5ad1114f46715149
+  metadata.gz: 92e45f58a5b0a524c164dcaddde9338401c03462572b6fe6b6fd5c5fcb234fc1cc0a41b3442134863630f0cd951c8db8b5ed0d4995181843442c11b0b2edc53b
+  data.tar.gz: c253c546cbab3d122b97613172a2f23d53ecdabf165e58b913634ee72bd01252e4eaffb3fa56c6b4d341201def291c326c0d6a06a50074f03842e2dc87884612

data/Rakefile

@@ -320,15 +320,16 @@ task :docker_run do
   STDOUT.puts "6. rake commit_release"
   STDOUT.puts "7. export PATH=/opt/jruby/bin:$PATH"
   STDOUT.puts "8. rake gem"
-  STDOUT.puts "9. gem push cosmos-X.X.X.gem"
-  STDOUT.puts "10. gem push cosmos-X.X.X-java.gem"
+  STDOUT.puts "9. /usr/bin/gem push cosmos-X.X.X.gem"
+  STDOUT.puts "10. /usr/bin/gem push cosmos-X.X.X-java.gem"
   STDOUT.puts "11. cd /devel/cosmos-docker"
-  STDOUT.puts "12. Update COSMOS_VERSION in all Dockerfiles"
-  STDOUT.puts "13. git commit -a -m \"Release COSMOS vX.X.X\""
-  STDOUT.puts "14. git push"
-  STDOUT.puts "15. git checkout -b vX.X.X"
-  STDOUT.puts "16. git push --set-upstream origin vX.X.X"
-  STDOUT.puts "17. Update release notes on github.com and cosmosrb.com"
+  STDOUT.puts "12. git pull"
+  STDOUT.puts "13. Update COSMOS_VERSION in all Dockerfiles"
+  STDOUT.puts "14. git commit -a -m \"Release COSMOS vX.X.X\""
+  STDOUT.puts "15. git push"
+  STDOUT.puts "16. git checkout -b vX.X.X"
+  STDOUT.puts "17. git push --set-upstream origin vX.X.X"
+  STDOUT.puts "18. Update release notes on github.com and cosmosrb.com"
   
   _, platform, *_ = RUBY_PLATFORM.split("-")
   if (platform == 'mswin32' or platform == 'mingw32') and which('winpty')

data/cosmos.gemspec

@@ -114,7 +114,7 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '~> 0.15'
   s.add_development_dependency 'codecov', '~> 0.1'
   s.add_development_dependency 'benchmark-ips', '~> 2.0'
-  s.add_development_dependency 'ruby-prof', '~> 1.0' if RUBY_ENGINE == 'ruby' # MRI Only
+  s.add_development_dependency 'ruby-prof', ['~> 1.0', '< 1.3'] if RUBY_ENGINE == 'ruby' # MRI Only
 
   s.post_install_message = "Thanks for installing Ball Aerospace COSMOS!\nStart your first project with: cosmos demo demo\n"
 end

data/data/crc.txt

@@ -158,7 +158,7 @@
 "lib/cosmos/tools/tlm_viewer/tlm_viewer_config.rb" 0xD1CF7B70
 "lib/cosmos/tools/tlm_viewer/screen.rb" 0x007BDC26
 "lib/cosmos/tools/handbook_creator/handbook_creator_config.rb" 0x9706590F
-"lib/cosmos/tools/handbook_creator/handbook_creator.rb" 0xA0E1DA06
+"lib/cosmos/tools/handbook_creator/handbook_creator.rb" 0x1F9BF5BB
 "lib/cosmos/tools/opengl_builder/opengl_builder.rb" 0x2D82B6FB
 "lib/cosmos/tools/opengl_builder/scene_config.rb" 0x15B59793
 "lib/cosmos/tools/script_runner/script_audit.rb" 0xAAEFBDF7
@@ -233,7 +233,7 @@
 "lib/cosmos/script/limits.rb" 0x9693149E
 "lib/cosmos/script/telemetry.rb" 0x19F63F52
 "lib/cosmos/script/commands.rb" 0x13531FE3
-"lib/cosmos/script/extract.rb" 0x31199456
+"lib/cosmos/script/extract.rb" 0xE39029E6
 "lib/cosmos/script/script.rb" 0xA19681FC
 "lib/cosmos/script/replay.rb" 0xEB08C485
 "lib/cosmos/script/tools.rb" 0xB30033A7
@@ -447,7 +447,7 @@
 "lib/cosmos/win32/win32_main.rb" 0x722DDE0D
 "lib/cosmos/win32/excel.rb" 0x72BFBAC2
 "lib/cosmos/win32/win32.rb" 0xBCECA922
-"lib/cosmos/version.rb" 0x0FA2BCFD
+"lib/cosmos/version.rb" 0xCC5AC5BC
 "lib/cosmos/interfaces/interface.rb" 0xFC517874
 "lib/cosmos/interfaces/udp_interface.rb" 0xE673DC8E
 "lib/cosmos/interfaces/protocols/terminated_protocol.rb" 0xE6AAACCA
@@ -456,15 +456,15 @@
 "lib/cosmos/interfaces/protocols/ignore_packet_protocol.rb" 0xC5443C01
 "lib/cosmos/interfaces/protocols/override_protocol.rb" 0x64479CFF
 "lib/cosmos/interfaces/protocols/preidentified_protocol.rb" 0xE8D0347C
-"lib/cosmos/interfaces/protocols/template_protocol.rb" 0x8C86548D
+"lib/cosmos/interfaces/protocols/template_protocol.rb" 0xA16B27DF
 "lib/cosmos/interfaces/protocols/length_protocol.rb" 0x5036FBBB
-"lib/cosmos/interfaces/protocols/burst_protocol.rb" 0xCF4EE7A5
-"lib/cosmos/interfaces/protocols/crc_protocol.rb" 0x9212C9CB
+"lib/cosmos/interfaces/protocols/burst_protocol.rb" 0x6A6D8FE9
+"lib/cosmos/interfaces/protocols/crc_protocol.rb" 0x61C90363
 "lib/cosmos/interfaces/simulated_target_interface.rb" 0x402C2FF5
-"lib/cosmos/interfaces/linc_interface.rb" 0xA85A43C1
-"lib/cosmos/interfaces/tcpip_server_interface.rb" 0x0209F6E0
+"lib/cosmos/interfaces/linc_interface.rb" 0xBEA1F26B
+"lib/cosmos/interfaces/tcpip_server_interface.rb" 0x0B30B476
 "lib/cosmos/interfaces/cmd_tlm_server_interface.rb" 0x8921CFC1
 "lib/cosmos/interfaces/tcpip_client_interface.rb" 0xE9F201A9
 "lib/cosmos/interfaces/dart_status_interface.rb" 0xE85231B8
-"lib/cosmos/interfaces/stream_interface.rb" 0x6D1676BA
+"lib/cosmos/interfaces/stream_interface.rb" 0xF3EE02F8
 "lib/cosmos/interfaces/serial_interface.rb" 0x97B428D8

data/demo/config/data/crc.txt

@@ -32,7 +32,7 @@
 "config/tools/tlm_extractor/_adcs_time.txt" 0x3DAD5094
 "config/tools/tlm_extractor/tlm_extractor4.txt" 0x068824C2
 "config/tools/tlm_viewer/tlm_viewer.txt" 0x6E6DBC7A
-"config/tools/handbook_creator/default_toc.xsl" 0x4122A040
+"config/tools/handbook_creator/default_toc.xsl" 0x00FD130E
 "config/tools/handbook_creator/templates/command_toc.html.erb" 0x9159BCF9
 "config/tools/handbook_creator/templates/title.html.erb" 0xBC66E2BC
 "config/tools/handbook_creator/templates/footer.html.erb" 0x0E1F9800

data/demo/config/tools/handbook_creator/default_toc.xsl

@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:outline="http://code.google.com/p/wkhtmltopdf/outline"
-                xmlns="http://www.w3.org/1999/xhtml">
-  <xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-              indent="yes" />
-  <xsl:template match="outline:outline">
-    <html>
-      <head>
-        <title>Table of Contents</title>
-        <style>
-          h1 {
-            text-align: center;
-            font-size: 20px;
-            font-family: arial;
-          }
-          div {border-bottom: 1px dashed rgb(200,200,200);}
-          span {float: right;}
-          li {list-style: none;}
-          ul {
-            font-size: 20px;
-            font-family: arial;
-          }
-          ul ul {font-size: 80%; }
-          ul {padding-left: 0em;}
-          ul ul {padding-left: 1em;}
-          a {text-decoration:none; color: black;}
-        </style>
-      </head>
-      <body>
-        <h1>Table of Contents</h1>
-        <ul><xsl:apply-templates select="outline:item/outline:item"/></ul>
-      </body>
-    </html>
-  </xsl:template>
-  <xsl:template match="outline:item">
-    <li>
-      <xsl:if test="@title!=''">
-        <div>
-          <a>
-            <xsl:if test="@link">
-              <xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
-            </xsl:if>
-            <xsl:if test="@backLink">
-              <xsl:attribute name="name"><xsl:value-of select="@backLink"/></xsl:attribute>
-            </xsl:if>
-            <xsl:value-of select="@title" /> 
-          </a>
-          <span> <xsl:value-of select="@page" /> </span>
-        </div>
-      </xsl:if>
-      <ul>
-        <xsl:apply-templates select="outline:item"/>
-      </ul>
-    </li>
-  </xsl:template>
-</xsl:stylesheet>
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:outline="http://code.google.com/p/wkhtmltopdf/outline"
+                xmlns="http://www.w3.org/1999/xhtml">
+  <xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+              indent="yes" />
+  <xsl:template match="outline:outline">
+    <html>
+      <head>
+        <title>Table of Contents</title>
+        <style>
+          h1 {
+            text-align: center;
+            font-size: 20px;
+            font-family: arial;
+          }
+          div {border-bottom: 1px dashed rgb(200,200,200);}
+          span {float: right;}
+          li {list-style: none;}
+          ul {
+            font-size: 20px;
+            font-family: arial;
+          }
+          ul ul {font-size: 80%; }
+          ul {padding-left: 0em;}
+          ul ul {padding-left: 1em;}
+          a {text-decoration:none; color: black;}
+        </style>
+      </head>
+      <body>
+        <h1>Table of Contents</h1>
+        <ul><xsl:apply-templates select="outline:item/outline:item"/></ul>
+      </body>
+    </html>
+  </xsl:template>
+  <xsl:template match="outline:item">
+    <li>
+      <xsl:if test="@title!=''">
+        <div>
+          <a>
+            <xsl:if test="@link">
+              <xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
+            </xsl:if>
+            <xsl:if test="@backLink">
+              <xsl:attribute name="name"><xsl:value-of select="@backLink"/></xsl:attribute>
+            </xsl:if>
+            <xsl:value-of select="@title" />
+          </a>
+          <span> <xsl:value-of select="@page" /> </span>
+        </div>
+      </xsl:if>
+      <ul>
+        <xsl:apply-templates select="outline:item"/>
+      </ul>
+    </li>
+  </xsl:template>
+</xsl:stylesheet>

data/install/config/data/crc.txt

@@ -4,7 +4,7 @@
 "config/tools/launcher/launcher.txt" 0x6A3047DB
 "config/tools/tlm_extractor/README.txt" 0x93B2C07E
 "config/tools/tlm_viewer/tlm_viewer.txt" 0xD9071527
-"config/tools/handbook_creator/default_toc.xsl" 0x4122A040
+"config/tools/handbook_creator/default_toc.xsl" 0x00FD130E
 "config/tools/handbook_creator/templates/command_toc.html.erb" 0x9159BCF9
 "config/tools/handbook_creator/templates/title.html.erb" 0xBC66E2BC
 "config/tools/handbook_creator/templates/footer.html.erb" 0x0E1F9800

data/install/config/tools/handbook_creator/default_toc.xsl

@@ -1,59 +1,59 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:outline="http://code.google.com/p/wkhtmltopdf/outline"
-                xmlns="http://www.w3.org/1999/xhtml">
-  <xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
-              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
-              indent="yes" />
-  <xsl:template match="outline:outline">
-    <html>
-      <head>
-        <title>Table of Contents</title>
-        <style>
-          h1 {
-            text-align: center;
-            font-size: 20px;
-            font-family: arial;
-          }
-          div {border-bottom: 1px dashed rgb(200,200,200);}
-          span {float: right;}
-          li {list-style: none;}
-          ul {
-            font-size: 20px;
-            font-family: arial;
-          }
-          ul ul {font-size: 80%; }
-          ul {padding-left: 0em;}
-          ul ul {padding-left: 1em;}
-          a {text-decoration:none; color: black;}
-        </style>
-      </head>
-      <body>
-        <h1>Table of Contents</h1>
-        <ul><xsl:apply-templates select="outline:item/outline:item"/></ul>
-      </body>
-    </html>
-  </xsl:template>
-  <xsl:template match="outline:item">
-    <li>
-      <xsl:if test="@title!=''">
-        <div>
-          <a>
-            <xsl:if test="@link">
-              <xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
-            </xsl:if>
-            <xsl:if test="@backLink">
-              <xsl:attribute name="name"><xsl:value-of select="@backLink"/></xsl:attribute>
-            </xsl:if>
-            <xsl:value-of select="@title" /> 
-          </a>
-          <span> <xsl:value-of select="@page" /> </span>
-        </div>
-      </xsl:if>
-      <ul>
-        <xsl:apply-templates select="outline:item"/>
-      </ul>
-    </li>
-  </xsl:template>
-</xsl:stylesheet>
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="2.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:outline="http://code.google.com/p/wkhtmltopdf/outline"
+                xmlns="http://www.w3.org/1999/xhtml">
+  <xsl:output doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
+              doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"
+              indent="yes" />
+  <xsl:template match="outline:outline">
+    <html>
+      <head>
+        <title>Table of Contents</title>
+        <style>
+          h1 {
+            text-align: center;
+            font-size: 20px;
+            font-family: arial;
+          }
+          div {border-bottom: 1px dashed rgb(200,200,200);}
+          span {float: right;}
+          li {list-style: none;}
+          ul {
+            font-size: 20px;
+            font-family: arial;
+          }
+          ul ul {font-size: 80%; }
+          ul {padding-left: 0em;}
+          ul ul {padding-left: 1em;}
+          a {text-decoration:none; color: black;}
+        </style>
+      </head>
+      <body>
+        <h1>Table of Contents</h1>
+        <ul><xsl:apply-templates select="outline:item/outline:item"/></ul>
+      </body>
+    </html>
+  </xsl:template>
+  <xsl:template match="outline:item">
+    <li>
+      <xsl:if test="@title!=''">
+        <div>
+          <a>
+            <xsl:if test="@link">
+              <xsl:attribute name="href"><xsl:value-of select="@link"/></xsl:attribute>
+            </xsl:if>
+            <xsl:if test="@backLink">
+              <xsl:attribute name="name"><xsl:value-of select="@backLink"/></xsl:attribute>
+            </xsl:if>
+            <xsl:value-of select="@title" />
+          </a>
+          <span> <xsl:value-of select="@page" /> </span>
+        </div>
+      </xsl:if>
+      <ul>
+        <xsl:apply-templates select="outline:item"/>
+      </ul>
+    </li>
+  </xsl:template>
+</xsl:stylesheet>

data/lib/cosmos/interfaces/linc_interface.rb

@@ -256,7 +256,7 @@ module Cosmos
       # Handle handshake warnings and errors
       if status == "OK" and code != 0
         unless @ignored_error_codes[handshake_cmd.handshake.handshake.target_name].include? code
-          Logger.warn "Warning sending command (#{code}): #{source}"
+          Logger.warn "#{@name}: Warning sending command (#{code}): #{source}"
         end
       elsif status == "ERROR"
         unless @ignored_error_codes[handshake_cmd.handshake.handshake.target_name].include? code
@@ -295,7 +295,7 @@ module Cosmos
       command.received_count += 1
 
       # Put a log of the command onto the server for the user to see
-      Logger.info("External Command: " + System.commands.format(linc_handshake.identified_command, System.targets[linc_handshake.identified_command.target_name].ignored_parameters))
+      Logger.info("#{@name}: External Command: " + System.commands.format(linc_handshake.identified_command, System.targets[linc_handshake.identified_command.target_name].ignored_parameters))
 
       # Log the command to the command log(s)
       @packet_log_writer_pairs.each do |packet_log_writer_pair|
@@ -361,7 +361,7 @@ module Cosmos
       if @handshake
         timed_out = false
       else
-        Logger.warn "No handshake - must be timeout."
+        Logger.warn "#{@name}: No handshake - must be timeout."
         timed_out = true
       end
 

data/lib/cosmos/interfaces/protocols/burst_protocol.rb

@@ -156,7 +156,7 @@ module Cosmos
     end
 
     def log_discard(length, found)
-      Logger.error("Sync #{'not ' unless found}found. Discarding #{length} bytes of data.")
+      Logger.error("#{@interface ? @interface.name : ""}: Sync #{'not ' unless found}found. Discarding #{length} bytes of data.")
       if @data.length >= 0
         Logger.error(sprintf("Starting: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X\n",
           @data.length >= 1 ? @data.getbyte(0) : 0,

data/lib/cosmos/interfaces/protocols/crc_protocol.rb

@@ -140,7 +140,7 @@ module Cosmos
       crc = BinaryAccessor.read(@bit_offset, @bit_size, :UINT, data, @endianness)
       calculated_crc = @crc.calc(data[0...(@bit_offset / 8)])
       if calculated_crc != crc
-        Logger.error "Invalid CRC detected! Calculated 0x#{calculated_crc.to_s(16).upcase} vs found 0x#{crc.to_s(16).upcase}."
+        Logger.error "#{@interface ? @interface.name : ""}: Invalid CRC detected! Calculated 0x#{calculated_crc.to_s(16).upcase} vs found 0x#{crc.to_s(16).upcase}."
         if @bad_strategy == DISCONNECT
           return :DISCONNECT
         end

data/lib/cosmos/interfaces/protocols/template_protocol.rb

@@ -146,13 +146,13 @@ module Cosmos
         # Write the packet value with each of the values received
         response_values = response_string.scan(response_regexp)[0]
         if !response_values || (response_values.length != response_item_names.length)
-          handle_error("#{@interface.name}: Unexpected response: #{response_string}")
+          handle_error("#{@interface ? @interface.name : ""}: Unexpected response: #{response_string}")
         else
           response_values.each_with_index do |value, i|
             begin
               result_packet.write(response_item_names[i], value)
             rescue => error
-              handle_error("#{@interface.name}: Could not write value #{value} due to #{error.message}")
+              handle_error("#{@interface ? @interface.name : ""}: Could not write value #{value} due to #{error.message}")
               break
             end
           end
@@ -234,7 +234,7 @@ module Cosmos
           sleep(@response_polling_period)
           retry if !response_timeout_time
           retry if response_timeout_time and Time.now < response_timeout_time
-          handle_error("#{@interface.name}: Timeout waiting for response")
+          handle_error("#{@interface ? @interface.name : ""}: Timeout waiting for response")
         end
 
         @response_template = nil

data/lib/cosmos/interfaces/stream_interface.rb

@@ -49,7 +49,7 @@ module Cosmos
       begin
         data = @stream.read
       rescue Timeout::Error
-        Logger.instance.error "Timeout waiting for data to be read"
+        Logger.instance.error "#{@name}: Timeout waiting for data to be read"
         data = nil
       end
       return nil if data.nil? or data.length <= 0

data/lib/cosmos/interfaces/tcpip_server_interface.rb

@@ -132,7 +132,7 @@ module Cosmos
             end
           rescue Exception => err
             shutdown_interfaces(@write_interface_infos)
-            Logger.instance.error("Tcpip server write thread unexpectedly died")
+            Logger.instance.error("#{@name}: Tcpip server write thread unexpectedly died")
             Logger.instance.error(err.formatted)
           end
         end
@@ -144,7 +144,7 @@ module Cosmos
             end
           rescue Exception => err
             shutdown_interfaces(@write_interface_infos)
-            Logger.instance.error("Tcpip server write raw thread unexpectedly died")
+            Logger.instance.error("#{@name}: Tcpip server write raw thread unexpectedly died")
             Logger.instance.error(err.formatted)
           end
         end
@@ -346,7 +346,7 @@ module Cosmos
             break if @cancel_threads
           end
         rescue => err
-          Logger.instance.error("Tcpip server listen thread unexpectedly died")
+          Logger.instance.error("#{@name}: Tcpip server listen thread unexpectedly died")
           Logger.instance.error(err.formatted)
         end
       end
@@ -372,7 +372,7 @@ module Cosmos
         if not System.instance.acl.allow_addr?(addr)
           # Reject connection
           Cosmos.close_socket(socket)
-          Logger.instance.info "Tcpip server rejected connection from #{hostname}(#{host_ip}):#{port}"
+          Logger.instance.info "#{@name}: Tcpip server rejected connection from #{hostname}(#{host_ip}):#{port}"
           return
         end
       end
@@ -417,7 +417,7 @@ module Cosmos
         end
         start_read_thread(@read_interface_infos[-1])
       end
-      Logger.instance.info "Tcpip server accepted connection from #{hostname}(#{host_ip}):#{port}"
+      Logger.instance.info "#{@name}: Tcpip server accepted connection from #{hostname}(#{host_ip}):#{port}"
     end
 
     def start_read_thread(interface_info)
@@ -427,10 +427,10 @@ module Cosmos
           begin
             read_thread_body(interface_info.interface)
           rescue Exception => err
-            Logger.instance.error "Tcpip server read thread unexpectedly died"
+            Logger.instance.error "#{@name}: Tcpip server read thread unexpectedly died"
             Logger.instance.error err.formatted
           end
-          Logger.instance.info "Tcpip server lost read connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
+          Logger.instance.info "#{@name}: Tcpip server lost read connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
           @read_threads.delete(Thread.current)
 
           index_to_delete = nil
@@ -453,7 +453,7 @@ module Cosmos
             end
           end
         rescue Exception => err
-          Logger.instance.error "Tcpip server read thread unexpectedly died"
+          Logger.instance.error "#{@name}: Tcpip server read thread unexpectedly died"
           Logger.instance.error err.formatted
         end
       end
@@ -500,7 +500,7 @@ module Cosmos
     end
 
     def interface_disconnect(interface_info)
-      Logger.instance.info "Tcpip server lost write connection to "\
+      Logger.instance.info "#{@name}: Tcpip server lost write connection to "\
         "#{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
       interface_info.interface.disconnect
       interface_info.interface.raw_logger_pair.stop if interface_info.interface.raw_logger_pair
@@ -552,13 +552,13 @@ module Cosmos
               next
             end
             # Client has disconnected (or is invalidly sending data on the socket)
-            Logger.instance.info "Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
+            Logger.instance.info "#{@name}: Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
             interface_info.interface.disconnect
             interface_info.interface.raw_logger_pair.stop if interface_info.interface.raw_logger_pair
             indexes_to_delete.unshift(index) # Put later indexes at front of array
           rescue Errno::ECONNRESET, Errno::ECONNABORTED, IOError
             # Client has disconnected
-            Logger.instance.info "Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
+            Logger.instance.info "#{@name}: Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
             interface_info.interface.disconnect
             interface_info.interface.raw_logger_pair.stop if interface_info.interface.raw_logger_pair
             indexes_to_delete.unshift(index) # Put later indexes at front of array
@@ -600,13 +600,13 @@ module Cosmos
             need_disconnect = true
           rescue Exception => err
             if err.message != "Stream not connected for write_raw"
-              Logger.instance.error "Error sending to client: #{err.class} #{err.message}"
+              Logger.instance.error "#{@name}: Error sending to client: #{err.class} #{err.message}"
             end
             need_disconnect = true
           end
 
           if need_disconnect
-            Logger.instance.info "Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
+            Logger.instance.info "#{@name}: Tcpip server lost write connection to #{interface_info.hostname}(#{interface_info.host_ip}):#{interface_info.port}"
             interface_info.interface.disconnect
             interface_info.interface.raw_logger_pair.stop if interface_info.interface.raw_logger_pair
             indexes_to_delete.unshift(index) # Put later indexes at front of array

data/lib/cosmos/script/extract.rb

@@ -130,7 +130,7 @@ module Cosmos
       return [target_name, packet_name, item_name, comparison_to_eval] if split_string.length == 3
       raise "ERROR: Check improperly specified: #{text}" if split_string.length < 4
       split_string = text.split(/ /) # Split on regex spaces to preserve spaces in comparison
-      index = split_string.index(item_name)
+      index = split_string.rindex(item_name)
       comparison_to_eval = split_string[(index + 1)..(split_string.length - 1)].join(" ")
       raise "ERROR: Use '==' instead of '=': #{text}" if split_string[3] == '='
       return [target_name, packet_name, item_name, comparison_to_eval]

data/lib/cosmos/tools/handbook_creator/handbook_creator.rb

@@ -156,7 +156,7 @@ module Cosmos
             msg << "PDF Handbooks created successfully"
             progress_dialog.append_text(msg)
           else
-            progress_dialog.append_text("\nPDF Handbooks could not be created.\n\nIs wkhtmltopdf in your PATH and are all existing pdfs closed?\n\nUsing version 0.11.0_rc1 of wkhtmltox is recommended which can be found at: http://download.gna.org/wkhtmltopdf/obsolete/\n\nVersion 0.12.x has shown issues with Handbook Creator's default templates.")
+            progress_dialog.append_text("\nPDF Handbooks could not be created.\n\nIs wkhtmltopdf in your PATH and are all existing pdfs closed?\n\nwkhtmltopdf can be found at: https://wkhtmltopdf.org/downloads.html.")
           end
         rescue => error
           progress_dialog.append_text("\n\nError processing:\n#{error.formatted}")

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '4.4.1'
+COSMOS_VERSION = '4.4.2'
 module Cosmos
   module Version
     MAJOR = '4'
     MINOR = '4'
-    PATCH = '1'
-    BUILD = 'f8e9c89b2d7fcd0c558806ff6c9dd59d167786e4'
+    PATCH = '2'
+    BUILD = '41a1376a7b11d7bb3498dd6fd0a13c1a9b383946'
   end
-  VERSION = '4.4.1'
+  VERSION = '4.4.2'
 end

data/spec/interfaces/linc_interface_spec.rb

@@ -179,7 +179,7 @@ module Cosmos
         it "warns if an error code is set" do
           allow_any_instance_of(TcpipClientStream).to receive(:read).and_return @handshake.buffer(false)
           expect(Logger).to receive(:warn) do |msg|
-            expect(msg).to eql "Warning sending command (12345): BAD"
+            expect(msg).to eql "LincInterface: Warning sending command (12345): BAD"
           end
           t = Thread.new do
             sleep 0.1

data/spec/packet_logs/packet_log_reader_spec.rb

@@ -23,7 +23,10 @@ module Cosmos
       plw = PacketLogWriter.new(:CMD,nil,true,nil,10000000,nil,false)
       @cmd_packets = []
       pkt = System.commands.packet("SYSTEM","STARTLOGGING").clone
-      pkt.received_time = Time.new(2020,1,31,12,30,15)
+      # Avoid precision errors by rounding to nearest second and then add 1 to ensure
+      # the time is AFTER the initial META packet with the current time
+      @time = Time.now.round + 1
+      pkt.received_time = @time
       pkt.write('label','PKT1')
       plw.write(pkt)
       @cmd_packet_length = pkt.length
@@ -43,7 +46,7 @@ module Cosmos
       plw = PacketLogWriter.new(:TLM,nil,true,nil,10000000,nil,false)
       @tlm_packets = []
       pkt = System.telemetry.packet("SYSTEM","LIMITS_CHANGE").clone
-      pkt.received_time = Time.new(2020,2,1,12,30,15)
+      pkt.received_time = @time
       pkt.write('PACKET','PKT1')
       plw.write(pkt)
       @tlm_packet_length = pkt.length
@@ -239,10 +242,11 @@ module Cosmos
         expect(packet_offsets).to eql [PacketLogReader::COSMOS4_HEADER_LENGTH, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length + header_length + @cmd_packet_length, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length + (header_length + @cmd_packet_length) * 2]
 
         expect(@plr.open(Dir[File.join(@log_path,"*cmd.bin")][0])).to eql [true, nil]
-        pkt = @plr.read_at_offset(packet_offsets[2])
+        pkt = @plr.read_at_offset(packet_offsets[2]) # Grab the second STARTLOGGING (META is 0)
         expect(pkt.target_name).to eql "SYSTEM"
         expect(pkt.packet_name).to eql "STARTLOGGING"
-        expect(pkt.received_time).to eql Time.new(2020,1,31,12,30,16)
+        expect(pkt.read('LABEL')).to eql "PKT2"
+        expect(pkt.received_time).to eql @time + 1
         @plr.close
       end
 
@@ -257,10 +261,11 @@ module Cosmos
         expect(packet_offsets).to eql [PacketLogReader::COSMOS4_HEADER_LENGTH, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length + header_length + @tlm_packet_length, PacketLogReader::COSMOS4_HEADER_LENGTH + meta_header_length + meta_length + (header_length + @tlm_packet_length) * 2]
 
         expect(@plr.open(Dir[File.join(@log_path,"*tlm.bin")][0])).to eql [true, nil]
-        pkt = @plr.read_at_offset(packet_offsets[2])
+        pkt = @plr.read_at_offset(packet_offsets[2]) # Grab the second LIMITS_CHANGE (META is 0)
         expect(pkt.target_name).to eql "SYSTEM"
         expect(pkt.packet_name).to eql "LIMITS_CHANGE"
-        expect(pkt.received_time).to eql Time.new(2020,2,1,12,30,16)
+        expect(pkt.read('PACKET')).to eql "PKT2"
+        expect(pkt.received_time).to eql @time + 1
         @plr.close
       end
     end
@@ -415,9 +420,8 @@ module Cosmos
       end
 
       it "returns all packets if the start time is before all" do
-        time = Time.new(2000,1,31,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, @time) do |packet|
           next if packet.packet_name == 'META'
           expect(packet.target_name).to eql @cmd_packets[index].target_name
           expect(packet.packet_name).to eql @cmd_packets[index].packet_name
@@ -429,51 +433,48 @@ module Cosmos
       end
 
       it "returns no packets if the start time is after all" do
-        time = Time.new(2030,2,1,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, @time + 100) do |packet|
           index += 1
         end
         expect(index).to eql 0
       end
 
       it "returns all packets after a start time" do
-        time = Time.new(2020,1,31,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, time) do |packet|
-          expect(packet.target_name).to eql @cmd_packets[index+1].target_name
-          expect(packet.packet_name).to eql @cmd_packets[index+1].packet_name
-          expect(packet.received_time).to eql @cmd_packets[index+1].received_time
-          expect(packet.read('LABEL')).to eql @cmd_packets[index+1].read('LABEL')
+        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, @time) do |packet|
+          next if packet.packet_name == 'META'
+          expect(packet.target_name).to eql @cmd_packets[index].target_name
+          expect(packet.packet_name).to eql @cmd_packets[index].packet_name
+          expect(packet.received_time).to eql @cmd_packets[index].received_time
+          expect(packet.read('LABEL')).to eql @cmd_packets[index].read('LABEL')
           index += 1
         end
-        expect(index).to eql 2
+        expect(index).to eql 3
 
-        time = Time.new(2020,2,1,12,30,16)
-        index = 0
-        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, time) do |packet|
-          expect(packet.target_name).to eql @tlm_packets[index+1].target_name
-          expect(packet.packet_name).to eql @tlm_packets[index+1].packet_name
-          expect(packet.received_time).to eql @tlm_packets[index+1].received_time
-          expect(packet.read('PACKET')).to eql @tlm_packets[index+1].read('PACKET')
+        index = 1 # @time + 1
+        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, @time + 1) do |packet|
+          next if packet.packet_name == 'META'
+          expect(packet.target_name).to eql @tlm_packets[index].target_name
+          expect(packet.packet_name).to eql @tlm_packets[index].packet_name
+          expect(packet.received_time).to eql @tlm_packets[index].received_time
+          expect(packet.read('PACKET')).to eql @tlm_packets[index].read('PACKET')
           index += 1
         end
-        expect(index).to eql 2
+        expect(index).to eql 3
       end
 
       it "returns no packets if the end time is before all" do
-        time = Time.new(2000,1,31,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, nil, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, nil, @time - 10) do |packet|
           index += 1
         end
         expect(index).to eql 0
       end
 
       it "returns all packets if the end time is after all" do
-        time = Time.new(2030,2,1,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, nil, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, nil, @time + 10) do |packet|
           next if packet.packet_name == 'META'
           expect(packet.target_name).to eql @cmd_packets[index].target_name
           expect(packet.packet_name).to eql @cmd_packets[index].packet_name
@@ -485,9 +486,8 @@ module Cosmos
       end
 
       it "returns all packets before an end time" do
-        time = Time.new(2020,1,31,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, nil, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*cmd.bin")][0], true, nil, @time) do |packet|
           next if packet.packet_name == 'META'
           expect(packet.target_name).to eql @cmd_packets[index].target_name
           expect(packet.packet_name).to eql @cmd_packets[index].packet_name
@@ -495,11 +495,10 @@ module Cosmos
           expect(packet.read('LABEL')).to eql @cmd_packets[index].read('LABEL')
           index += 1
         end
-        expect(index).to eql 2
+        expect(index).to eql 1
 
-        time = Time.new(2020,2,1,12,30,16)
         index = 0
-        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, nil, time) do |packet|
+        @plr.each(Dir[File.join(@log_path,"*tlm.bin")][0], true, nil, @time + 1) do |packet|
           next if packet.packet_name == 'META'
           expect(packet.target_name).to eql @tlm_packets[index].target_name
           expect(packet.packet_name).to eql @tlm_packets[index].packet_name

data/spec/script/extract_spec.rb

@@ -148,6 +148,10 @@ module Cosmos
         expect(extract_fields_from_check_text("TARGET PACKET ITEM < 5")).to eql(['TARGET', 'PACKET', 'ITEM', '< 5'])
       end
 
+      it "should support target packet items named the same" do
+        expect(extract_fields_from_check_text("TEST TEST TEST == 5")).to eql(['TEST', 'TEST', 'TEST', '== 5'])
+      end
+
       it "should complain about trying to do an = comparison" do
         expect { extract_fields_from_check_text("TARGET PACKET ITEM = 5") }.to raise_error(/ERROR: Use/)
       end
@@ -160,4 +164,3 @@ module Cosmos
 
   end
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: java
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement