automotive-ecu 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad8f4f30b32824a37a57939951230876c96e1e6de5d89939fe831eb68b6fd92f
-  data.tar.gz: 397829925fb22b56f76ddd60820c52b8a89739b2e0dccbfc94ad8fb174acec94
+  metadata.gz: a191c6cadff7a9e20bf0a1065f3b041b3f2374e8a0a93babcbadf5cd44f96bc3
+  data.tar.gz: 2b87b8a19a794165daf7fa7d4c682e004ac0fd8cc2cc0f2d349ea8fc13b0dd33
 SHA512:
-  metadata.gz: d51985201cc46cfe5f4cdab85903f71b3018983fd2053752487cc0295587f9788760e97249da7f0fca07c277fd2fd0982c7d7825d414d21c19654c0afe6da4b6
-  data.tar.gz: 611e2e6b00449f3303f4edf383af46151cce36d340bf6ca67cd932a95739e86865a146f76b5e1b436088c175620db376bef8995fe74c8d61d63d3e6b4dce8623
+  metadata.gz: d030f9137511a93fa52dd8266f819721e84603b6a9a317976082d29e0be7c7300b14e3c7abac5a9a77bf6dfb0b47f0c504b064c96ae714f8914176d22777ad57
+  data.tar.gz: 83df1db99999d6d8e77c5591c6fd01be988774cc40f149ed6c954867db6204f8e7c238e1ad7b43592b8ebacd2745cf355f3c6970664278f394fb9b0a72429a34

data/lib/ecu/interfaces/dcm/festwert.rb

@@ -5,7 +5,7 @@ class Ecu
     end
 
     def to_dcm(indented=false)
-      fmtstr = indented ? "%-26s%s\n" : "%s %s\n"
+      fmtstr = indented ? "%-25s%s\n" : "%s %s\n"
 
       sprintf(fmtstr, type.upcase, name).tap do |str|
         str << "  LANGNAME #{description.enquote}\n" if description

data/lib/ecu/interfaces/dcm/festwerteblock.rb

@@ -7,7 +7,7 @@ class Ecu
     end
 
     def to_dcm(indented=false)
-      fmtstr = indented ? "%-26s%s %s" : "%s %s %d"
+      fmtstr = indented ? "%-25s%s %s" : "%s %s %d"
 
       sprintf(fmtstr, type.upcase, name, xdim).tap do |str|
         str << " @ #{ydim}" if ydim != 1
@@ -17,8 +17,8 @@ class Ecu
         str << "  EINHEIT_W #{unit.enquote}\n"       if unit
         value.each do |row|
           str << case row.first
-                 when Numeric then "  WERT #{row.join(" ")}\n"
-                 when String  then "  TEXT #{row.map(&:enquote).join(" ")}\n"
+                 when Numeric then "  WERT #{row.join("   ")}\n"
+                 when String  then "  TEXT #{row.map(&:enquote).join("   ")}\n"
                  end
         end
         str << "END\n"

data/lib/ecu/interfaces/dcm/kennfeld.rb

@@ -5,7 +5,7 @@ class Ecu
     end
 
     def to_dcm(indented=false)
-      fmtstr = indented ? "%-26s%s %s %s\n" : "%s %s %d %d\n"
+      fmtstr = indented ? "%-25s%s %s %s\n" : "%s %s %d %d\n"
 
       sprintf(fmtstr, type.upcase, name, xdim, ydim).tap do |str|
         str << "  LANGNAME #{description.enquote}\n" if description
@@ -14,8 +14,8 @@ class Ecu
         str << "  EINHEIT_Y #{yunit.enquote}\n"      if yunit
         str << "  EINHEIT_W #{unit.enquote}\n"       if unit
         str << case xvalue.first
-              when Numeric then "  ST/X #{xvalue.join(" ")}\n"
-              when String  then "  ST_TX/X #{xvalue.map(&:enquote).join(" ")}\n"
+              when Numeric then "  ST/X #{xvalue.join("   ")}\n"
+              when String  then "  ST_TX/X #{xvalue.map(&:enquote).join("   ")}\n"
               end
         yvalue.each_with_index do |entry, idx|
           str << case entry
@@ -23,8 +23,8 @@ class Ecu
                 when String  then "  ST_TX/Y #{entry.enquote}\n"
                 end
           str << case value[idx].first
-                when Numeric then "  WERT #{value[idx].join(" ")}\n"
-                when String  then "  TEXT #{value[idx].map(&:enquote).join(" ")}\n"
+                when Numeric then "  WERT #{value[idx].join("   ")}\n"
+                when String  then "  TEXT #{value[idx].map(&:enquote).join("   ")}\n"
                 end
         end
         str << "END\n"

data/lib/ecu/interfaces/dcm/kennlinie.rb

@@ -5,7 +5,7 @@ class Ecu
     end
 
     def to_dcm(indented=false)
-      fmtstr = indented ? "%-26s%s %s\n" : "%s %s %d\n"
+      fmtstr = indented ? "%-25s%s %s\n" : "%s %s %d\n"
 
       sprintf(fmtstr, type.upcase, name, xdim).tap do |str|
         str << "  LANGNAME #{description.enquote}\n" if description
@@ -13,12 +13,12 @@ class Ecu
         str << "  EINHEIT_X #{xunit.enquote}\n"      if xunit
         str << "  EINHEIT_W #{unit.enquote}\n"       if unit
         str << case xvalue.first
-              when Numeric then "  ST/X #{xvalue.join(" ")}\n"
-              when String  then "  ST_TX/X #{xvalue.map(&:enquote).join(" ")}\n"
+              when Numeric then "  ST/X #{xvalue.join("   ")}\n"
+              when String  then "  ST_TX/X #{xvalue.map(&:enquote).join("   ")}\n"
               end
         str << case value.first
-              when Numeric then "  WERT #{value.join(" ")}\n"
-              when String  then "  TEXT #{value.map(&:enquote).join(" ")}\n"
+              when Numeric then "  WERT #{value.join("   ")}\n"
+              when String  then "  TEXT #{value.map(&:enquote).join("   ")}\n"
               end
         str << "END\n"
       end

data/lib/ecu/interfaces/dcm/property_parser.rb

@@ -39,9 +39,11 @@ class Ecu
     end
 
     def self.numeric_value(str)
-      return str.to_f if str.match?(/^\d+\.$/)
-
-      Float(str)
+      case str
+      in /^\d+$/   then str.to_i
+      in /^\d+\.$/ then str.to_f
+      else              Float(str)
+      end
     end
 
   end

data/lib/ecu/interfaces/dcm/stuetzstellenverteilung.rb

@@ -5,15 +5,15 @@ class Ecu
     end
 
     def to_dcm(indented=false)
-      fmtstr = indented ? "%-26s%s %s\n" : "%s %s %d\n"
+      fmtstr = indented ? "%-25s%s %s\n" : "%s %s %d\n"
 
       sprintf(fmtstr, type.upcase, name, xdim).tap do |str|
         str << "  LANGNAME #{description.enquote}\n" if description
         str << "  FUNKTION #{function}\n"            if function
         str << "  EINHEIT_X #{xunit.enquote}\n"      if xunit
         str << case xvalue.first
-        when Numeric then "  ST/X #{xvalue.join(" ")}\n"
-        when String then  "  ST_TX/X #{xvalue.map(&:enquote).join(" ")}\n"
+        when Numeric then "  ST/X #{xvalue.join("   ")}\n"
+        when String then  "  ST_TX/X #{xvalue.map(&:enquote).join("   ")}\n"
         end
         str << "END\n"
       end

data/lib/ecu/version.rb

@@ -1,3 +1,3 @@
 class Ecu
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automotive-ecu
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Jonas Mueller