automotive-ecu 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3adf406568cc23075ab176db5d171365057400613aa2ea668e217247d2734dd0
-  data.tar.gz: d0367f0a39c76cc2094600440a22f39a8da32118acae23419e3d95abb68910e8
+  metadata.gz: b9258d168cddd58d8fe69e82099c079bab80e8c7568f7e6d6e94c64f86f96388
+  data.tar.gz: 984ff33b0ff2973a4d0e687241447eef1b263b2c4129d2f14d5daed44be56c79
 SHA512:
-  metadata.gz: f6027c77ae6110600b72ffab9611ba97e1ee6c95852f23cfbeb96c4afd09de25ddc84fd4ca220186f35b2922a8a7252d647a8d1c16f777c0b94b3b04e33cde05
-  data.tar.gz: 276b5f1382cc619af06908f6dfc5f090fe26f238b55c13ee07e3330f1cc233c2701f0b15a12ef1d12f7e24b0d3ef95ef4332dff7629d959060aa0f4f814c8dae
+  metadata.gz: 6418a2fadf25cda97567eaa0fc38a16b81c6fd841b33c0e1f5e85681f0ca38044f8524967b044ea53d6f4e4387af082529c7dbdbbc8ea2cc90c2d4b1fffc83e7
+  data.tar.gz: cf113d96b84b68c92acc3ae0d6485565da0db3491648a20448a7c286925d6d891e086d96bf97badd111d3115bc873bf0d07458ed37e70d1b9372f8f8c434803b

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

@@ -4,8 +4,10 @@ class Ecu
       %r{FESTWERT\s+(?<name>[A-Za-z0-9\._]+)}
     end
 
-    def to_dcm
-      "#{type.upcase} #{name}\n".tap do |str|
+    def to_dcm(indented=false)
+      fmtstr = indented ? "%-26s%s\n" : "%s %s\n"
+
+      sprintf(fmtstr, type.upcase, name).tap do |str|
         str << "  LANGNAME #{description.enquote}\n" if description
         str << "  FUNKTION #{function}\n"            if function
         str << "  EINHEIT_W #{unit.enquote}\n"       if unit

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

@@ -3,11 +3,13 @@ require_relative "../../../core_ext"
 class Ecu
   class Festwerteblock < Label
     def self.dcm_header
-      %r{FESTWERTEBLOCK\s+(?<name>[A-Za-z0-9\._]+)\s+(?<xdim>\d+)(?:\s+@\s+(?<ydim>\d+))?}
+      %r{^FESTWERTEBLOCK\s+(?<name>[A-Za-z0-9\._]+)\s+(?<xdim>\d+)(?:\s+@\s+(?<ydim>\d+))?}
     end
 
-    def to_dcm
-      "FESTWERTEBLOCK #{name} #{xdim}".tap do |str|
+    def to_dcm(indented=false)
+      fmtstr = indented ? "%-26s%s %s" : "%s %s %d"
+
+      sprintf(fmtstr, type.upcase, name, xdim).tap do |str|
         str << " @ #{ydim}" if ydim != 1
         str << "\n"
         str << "  LANGNAME #{description.enquote}\n" if description
@@ -15,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

@@ -4,16 +4,18 @@ class Ecu
       %r{^KENNFELD\s+(?<name>[A-Za-z0-9\._]+)\s+(?<xdim>\d+)\s+(?<ydim>\d+)}
     end
 
-    def to_dcm
-      "#{type.upcase} #{name} #{xdim} #{ydim}\n".tap do |str|
+    def to_dcm(indented=false)
+      fmtstr = indented ? "%-26s%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
         str << "  FUNKTION #{function}\n"            if function
         str << "  EINHEIT_X #{xunit.enquote}\n"      if xunit
         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
@@ -21,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

@@ -4,19 +4,21 @@ class Ecu
       %r{^KENNLINIE\s+(?<name>[A-Za-z0-9\._]+)\s+(?<xdim>\d+)}
     end
 
-    def to_dcm
-      "#{type.upcase} #{name} #{xdim}\n".tap do |str|
+    def to_dcm(indented=false)
+      fmtstr = indented ? "%-26s%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 << "  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/label_list.rb

@@ -73,7 +73,7 @@ class Ecu
       line.chomp.gsub(/[[:space:]]/, " ").rstrip
     end
 
-    def to_dcm
+    def to_dcm(indented=false)
       out = []
 
       unless headers.empty?
@@ -86,7 +86,7 @@ class Ecu
         out += subheaders.map { "* " + _1 }.push("")
       end
 
-      out += map(&:to_dcm)
+      out += map { _1.to_dcm(indented) }
 
       out.join("\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

@@ -4,14 +4,16 @@ class Ecu
       %r{STUETZSTELLENVERTEILUNG\s+(?<name>[A-Za-z0-9\._]+)\s+(?<xdim>\d+)}
     end
 
-    def to_dcm
-      "#{type.upcase} #{name} #{xdim}\n".tap do |str|
+    def to_dcm(indented=false)
+      fmtstr = indented ? "%-26s%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.3"
+  VERSION = "0.1.5"
 end

metadata

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