automotive-ecu 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3adf406568cc23075ab176db5d171365057400613aa2ea668e217247d2734dd0
-  data.tar.gz: d0367f0a39c76cc2094600440a22f39a8da32118acae23419e3d95abb68910e8
+  metadata.gz: ad8f4f30b32824a37a57939951230876c96e1e6de5d89939fe831eb68b6fd92f
+  data.tar.gz: 397829925fb22b56f76ddd60820c52b8a89739b2e0dccbfc94ad8fb174acec94
 SHA512:
-  metadata.gz: f6027c77ae6110600b72ffab9611ba97e1ee6c95852f23cfbeb96c4afd09de25ddc84fd4ca220186f35b2922a8a7252d647a8d1c16f777c0b94b3b04e33cde05
-  data.tar.gz: 276b5f1382cc619af06908f6dfc5f090fe26f238b55c13ee07e3330f1cc233c2701f0b15a12ef1d12f7e24b0d3ef95ef4332dff7629d959060aa0f4f814c8dae
+  metadata.gz: d51985201cc46cfe5f4cdab85903f71b3018983fd2053752487cc0295587f9788760e97249da7f0fca07c277fd2fd0982c7d7825d414d21c19654c0afe6da4b6
+  data.tar.gz: 611e2e6b00449f3303f4edf383af46151cce36d340bf6ca67cd932a95739e86865a146f76b5e1b436088c175620db376bef8995fe74c8d61d63d3e6b4dce8623

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

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

@@ -4,8 +4,10 @@ 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

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

@@ -4,8 +4,10 @@ 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

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/stuetzstellenverteilung.rb

@@ -4,8 +4,10 @@ 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

data/lib/ecu/version.rb

@@ -1,3 +1,3 @@
 class Ecu
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 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.4
 platform: ruby
 authors:
 - Jonas Mueller