automotive-ecu 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24338ba9633d36789c4ba4f5c7ae67659c2dca146a878ae426555afcc18419cc
-  data.tar.gz: 70103adf18b506ab21d62bd5d8c9a95266d19dac8a7d2688c55ed85748fa6d10
+  metadata.gz: ad8f4f30b32824a37a57939951230876c96e1e6de5d89939fe831eb68b6fd92f
+  data.tar.gz: 397829925fb22b56f76ddd60820c52b8a89739b2e0dccbfc94ad8fb174acec94
 SHA512:
-  metadata.gz: 1c4624a8d94693d35d9db642d677816b26bb461e7676837147ae4c81fb013f2097d884e90b00dcb92f0781ee335c939360ec20ab40712c5ff223921c030da169
-  data.tar.gz: 5f92059a106311e053750e57f36b5341850b4dfab169ec1edcb7a263d1078191c339a9b4b221b668539a2ded36dc356f2b8a5fc55968cd1743a74aad86bb8003
+  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

@@ -28,31 +28,31 @@ class Ecu
       str.each_line.lazy.with_index(1).each do |line, n|
         line = normalize_whitespace(line)
         case line
-        when BLANKLINE_REGEX then next
-        when COMMENT_REGEX
+        in BLANKLINE_REGEX then next
+        in COMMENT_REGEX
           case buffer.header
-          when :pre   then headers << line[1..].strip
-          when :after then subheaders << line[1..].strip
-          when :done  then # Header time over, do nothing
+          in :pre   then headers << line[1..].strip
+          in :after then subheaders << line[1..].strip
+          in :done  then # Header time over, do nothing
           end
-        when DCM_HEADER                         then buffer.header_seen!
-        when Functions.dcm_header               then buffer.start!(Functions, [line])
-        when Festwert.dcm_header                then buffer.start!(Festwert, [line])
-        when Festwerteblock.dcm_header          then buffer.start!(Festwerteblock, [line])
-        when Kennlinie.dcm_header               then buffer.start!(Kennlinie, [line])
-        when Gruppenkennlinie.dcm_header        then buffer.start!(Gruppenkennlinie, [line])
-        when Festkennlinie.dcm_header           then buffer.start!(Festkennlinie, [line])
-        when Kennfeld.dcm_header                then buffer.start!(Kennfeld, [line])
-        when Gruppenkennfeld.dcm_header         then buffer.start!(Gruppenkennfeld, [line])
-        when Festkennfeld.dcm_header            then buffer.start!(Festkennfeld, [line])
-        when Stuetzstellenverteilung.dcm_header then buffer.start!(Stuetzstellenverteilung, [line])
-        when "END"                              then
+        in DCM_HEADER                            then buffer.header_seen!
+        in ^(Functions.dcm_header)               then buffer.start!(Functions, [line])
+        in ^(Festwert.dcm_header)                then buffer.start!(Festwert, [line])
+        in ^(Festwerteblock.dcm_header)          then buffer.start!(Festwerteblock, [line])
+        in ^(Kennlinie.dcm_header)               then buffer.start!(Kennlinie, [line])
+        in ^(Gruppenkennlinie.dcm_header)        then buffer.start!(Gruppenkennlinie, [line])
+        in ^(Festkennlinie.dcm_header)           then buffer.start!(Festkennlinie, [line])
+        in ^(Kennfeld.dcm_header)                then buffer.start!(Kennfeld, [line])
+        in ^(Gruppenkennfeld.dcm_header)         then buffer.start!(Gruppenkennfeld, [line])
+        in ^(Festkennfeld.dcm_header)            then buffer.start!(Festkennfeld, [line])
+        in ^(Stuetzstellenverteilung.dcm_header) then buffer.start!(Stuetzstellenverteilung, [line])
+        in "END"
           case obj = buffer.finish!(line)
-          when Label
+          in Label
             fail "Duplicate label #{obj.name}" unless labels[obj.name].nil?
 
             labels[obj.name] = obj
-          when Functions
+          in Functions
             fail "Duplicate functions definition" unless functions.empty?
 
             functions = obj
@@ -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

@@ -31,12 +31,18 @@ class Ecu
     end
 
     def self.numeric_array(str)
-      str.split.map { Float(_1) }
+      str.split.map { numeric_value(_1) }
     end
 
     def self.string_array(str)
       str.scan(/"([^"]*)"/).flatten
     end
 
+    def self.numeric_value(str)
+      return str.to_f if str.match?(/^\d+\.$/)
+
+      Float(str)
+    end
+
   end
 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.2"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: automotive-ecu
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Jonas Mueller
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-18 00:00:00.000000000 Z
+date: 2024-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: terminal-table