machine_setup 0.0.1 → 0.0.2

data/.gitignore

@@ -1,27 +1,30 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## RubyMine
-.idea
-
-## PROJECT::SPECIFIC
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## RubyMine
+.idea
+
+## PROJECT::SPECIFIC
 
 /test/trans.rb
-/test/y.rb
+/test/y.rb
+/examples/**/*.lng
+/examples/**/*.EXP
+/examples/**/mps3.ini

data/README.rdoc

@@ -1,17 +1,45 @@
-= machine_setup
-
-Generating configuration files for a machine setup.
-
-== Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== License
-
-MIT License. See the included MIT-LICENSE file.
+= Machine_setup: Generating configuration files for a machine setup
+
+  Github:       http://github.com/robi-wan/machine_setup/
+
+== Intro
+  
+Machine_setup is a gem which helps generating a set of configuration files for a machine setup. 
+It takes a parameter description file and translation files with german and english translations and generates
+the appropriate configuration files.
+  
+== Installation
+  
+You can install the gem with
+  
+  gem install machine_setup
+
+This gem depends on 'i18n'.
+
+== Usage
+
+Describe your setup configuration for a machine (including translations for supported languages) and set the main
+file as a parameter to 'setup_config_gen':
+    
+  setup_config_gen ../examples/underleaver/underleaver.setup.param
+
+=== Parameter descriptions
+
+=== Translations
+
+=== Generating
+
+
+== Note on Patches/Pull Requests
+
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== License
+
+MIT License. See the included MIT-LICENSE file.

data/Rakefile

@@ -5,13 +5,13 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "machine_setup"
-    gem.executables = ["setup_config_gen.rb"]
+    gem.executables = ["setup_config_gen"]
     gem.summary = %Q{Generating configuration for machine setup parameters.}
     gem.description = %Q{Helps generating configuration files for machine setup parameters.}
     gem.email = "robi-wan@suyu.de"
     gem.homepage = "http://github.com/robi-wan/machine_setup"
     gem.authors = ["robi-wan"]
-    gem.add_runtime_dependency "i18n", ">= 0.3.0"
+    gem.add_runtime_dependency "i18n", ">= 0.3.2"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -21,8 +21,8 @@ end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+  test.libs << 'test'
+  test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
 
@@ -30,7 +30,7 @@ begin
   require 'rcov/rcovtask'
   Rcov::RcovTask.new do |test|
     test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
+    test.pattern = 'test/**/*_test.rb'
     test.verbose = true
   end
 rescue LoadError
@@ -48,7 +48,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "plc_version_deploy #{version}"
+  rdoc.title = "machine_setup #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/TODO

@@ -1,9 +1,9 @@
-- complete underleaver example
+- code cleanup
 
-- rename drive params to make meaning more clear
+- cleaner file / module / class - structure
 
-- generate import file for epas with parameter numbers
+- check erb templates with mri ruby and jruby (erb.rb)
 
-- code cleanup
+- check erubis
 
-- add support for min-max-parameters (programme parameters)
+- rubygems usage: http://gist.github.com/54177

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/bin/setup_config_gen

@@ -0,0 +1,41 @@
+#!/usr/bin/env ruby
+
+begin
+  param_def=ARGV[0]
+
+  raise RuntimeError.new("Missing argument: file with parameter definition") if param_def.nil?
+  raise RuntimeError.new("Wrong argument: file '#{param_def}' with parameter definition not found") unless File.file?(param_def)
+
+  $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+  require 'setup_configuration'
+
+# load file with parameter dsl
+  load param_def
+
+# get reference to suite instance which holds parameter configuration
+  suite=SetupConfiguration::Suite.instance
+
+#set output path
+  generator = SetupConfiguration::SuiteGenerator.new()
+  generator.output_path=File.dirname(param_def)
+
+# load files with translations
+  SetupConfiguration::Translation.translation_files(suite.name).each() do |t|
+    trans_file=File.join(File.dirname(param_def), t)
+    if File.file?(trans_file)
+      SetupConfiguration::Translation::Translator.i18n_load_path(trans_file)
+    else
+      puts "WARNING: expected file with translations '#{trans_file}' not found."
+    end
+  end
+
+  generator.generate()
+
+  puts("#{File.basename(__FILE__)} completed.")
+rescue Exception => e
+  #puts("Error, program will exit => #{e}!")
+  puts(e.message)
+  #puts(e.backtrace().join("\n"))
+  exit(1)
+
+end

data/examples/underleaver/underleaver.setup.param

@@ -1,4 +1,15 @@
-SetupConfiguration :underleaver do
+SetupConfiguration :underleaver, :ul do
+
+  setting do
+    min 0..0
+    max 0..0
+    balance_min 3000..3029
+    balance_max 3030..3059
+    machine_type :all_machines, 0, 0..999
+    machine_type :underleaver_one, 1, 1000..1999
+    machine_type :underleaver_two, 2, 2000..2999
+    machine_type :underleaver_three, 3, 3000..3999
+  end
 
   category :common do
     param :underleaver_config, 1
@@ -24,82 +35,82 @@ SetupConfiguration :underleaver do
     end
 
     param :ext_enabling_previous_unit, 13
+    
+    param :source_parameter_working_velocity, 21
+    
+    param :roll_bracket_active, 22
+    param :factor_activation_point_roll_bracket, 23 do
+      depends_on :roll_bracket_active
+    end
   end
 
   category :drives do
 
     # paper roll drive
-    param :paper_roll_drive_config, 300
+    param :paper_roll_drive_selection, 300
     param :paper_roll_drive_distance_revolution, 301 do
-      depends_on :paper_roll_drive_config
+      depends_on :paper_roll_drive_selection
     end
     param :paper_roll_drive_gear_in, 302 do
-      depends_on :paper_roll_drive_config
+      depends_on :paper_roll_drive_selection
     end
     param :paper_roll_drive_gear_out, 303 do
-      depends_on :paper_roll_drive_config
+      depends_on :paper_roll_drive_selection
     end
 
     # blade drive
-    param :blade_drive_config, 310
+    param :blade_drive_selection, 310
     param :blade_drive_diameter, 311 do
-      depends_on :blade_drive_config
+      depends_on :blade_drive_selection
     end
     param :blade_drive_gear_in, 312 do
-      depends_on :blade_drive_config
+      depends_on :blade_drive_selection
     end
     param :blade_drive_gear_out, 313 do
-      depends_on :blade_drive_config
+      depends_on :blade_drive_selection
     end
 
     #paper feed drive
-    param :paper_feed_drive_config, 320
+    param :paper_feed_drive_selection, 320
     param :paper_feed_drive_distance_revolution, 321 do
-      depends_on :paper_feed_drive_config
+      depends_on :paper_feed_drive_selection
     end
     param :paper_feed_drive_gear_in, 322 do
-      depends_on :paper_feed_drive_config
+      depends_on :paper_feed_drive_selection
     end
     param :paper_feed_drive_gear_out, 323 do
-      depends_on :paper_feed_drive_config
+      depends_on :paper_feed_drive_selection
     end
 
     #transport drive
-    param :transport_drive_config, 330
+    param :transport_drive_selection, 330
     param :transport_drive_distance_revolution, 331 do
-      depends_on :transport_drive_config
+      depends_on :transport_drive_selection
     end
     param :transport_drive_gear_in, 332 do
-      depends_on :transport_drive_config
+      depends_on :transport_drive_selection
     end
     param :transport_drive_gear_out, 333 do
-      depends_on :transport_drive_config
+      depends_on :transport_drive_selection
     end
     param :transport_drive_belt_length, 334 do
-      depends_on :transport_drive_config
+      depends_on :transport_drive_selection
     end
 
     #infeed drive
-    param :infeed_drive_config, 350
+    param :infeed_drive_selection, 350
     param :infeed_drive_distance_revolution, 351 do
-      depends_on :infeed_drive_config
+      depends_on :infeed_drive_selection
     end
     param :infeed_drive_gear_in, 352 do
-      depends_on :infeed_drive_config
+      depends_on :infeed_drive_selection
     end
     param :infeed_drive_gear_out, 353 do
-      depends_on :infeed_drive_config
+      depends_on :infeed_drive_selection
     end
     param :infeed_drive_belt_length, 354 do
-      depends_on :infeed_drive_config
+      depends_on :infeed_drive_selection
     end
   end
 
-  setting do
-    min (0..0)
-    max (0..0)
-    balance_min (3000..3029)
-    balance_max (3030..3059)
-  end
-
-end
+end

data/examples/underleaver/underleaver.setup.param.de.yml

@@ -9,23 +9,26 @@ de:
   #parameter
   underleaver_config:
     name:  "Underleaver virtuell=1 / real=0"
-    comment:  "Einerstelle:\n
-              x0: Steuerung mit realen Achsen und Schutzhauben\n
-              x1: Steuerung simuliert alle nicht angew�hlten Achsen und Schutzhauben\n
-              \n
-              Zehnerstelle:\n
-              0x: CanBus einschalten\n
-              1x: CanBus ausschalten\n
-              \n
-              Hunderterstelle:\n
-              1xx: Steuerung simuliert alle Antriebe"
+    comment: |
+              Einerstelle:
+              x0: Steuerung mit realen Achsen und Schutzhauben
+              x1: Steuerung simuliert alle nicht angew�hlten Achsen und Schutzhauben
+              
+              
+              Zehnerstelle:
+              0x: CanBus einschalten
+              1x: CanBus ausschalten
+              
+              
+              Hunderterstelle:
+              1xx: Steuerung simuliert alle Antriebe
 
   distance_photo_sensor:
     name:  "Weg Lichtschranke bis Blattaustritt"
-    comment:  ""
+    comment:  "Abstand der Lichtschranke vom Blattaustritt."
 
   distance_blade_to_sheet_drive:
-    name:  "Weg Schneide bis Blattantrieb"
+    name: "Weg Schneide bis Blattantrieb"
     comment: ""
 
   distance_sheet_drive_to_sheet_exit:
@@ -38,12 +41,15 @@ de:
 
   paper_jam_detection_active:
     name:  "Papierstau�berwachung"
-    comment:  "Erm�glicht die Abschaltung der Papierstau�berwachung\n
-              \n
-              0=Abwahl\n
-              1=Anwahl\n
-              \n
-              (Standard: 1)"
+    comment:  |
+              Erm�glicht die Abschaltung der Papierstau�berwachung
+              
+              
+              0=Abwahl
+              1=Anwahl
+              
+              
+              (Standard: 1)
 
   paper_jam_detection_signal_length:
     name:  "Signaldauer f�r Papierstau"
@@ -52,7 +58,7 @@ de:
                 Bei Angabe von 0 wird die Zeitdauer programmintern festgelegt."
 
   paper_jam_detection_check_time:
-    name:  "Papierstau�berpr�fungszeit nach 'letzem' Produkt"
+    name:  "Papierstau�berpr�fungszeit nach 'letztem' Produkt"
     comment:  "Die �berpr�fung, ob ein Papierstau vorliegt, erfolgt bei Beginn der F�rderung des n�chsten Blattes.
               Kommt nach dem aktuellen Produkt eine Weile kein Produkt mehr, so erm�glicht dieser Parameter die Einstellung
               der Zeitdauer, nach deren Ablauf eine Papierstau�berpr�fung vorgenommen wird.\n
@@ -63,7 +69,7 @@ de:
               Die Angabe wird 1:1 im Programm verwendet."
 
   ext_enabling_following_unit:
-    name:  "Externe Freigabe nachgelagerter Einheit (NE)"
+    name:  "Externe Freigabe von nachgelagerter Einheit (NE)"
     comment:  "An/Abwahl der externen Freigabe der nachgelagerten Einheit.\n
               \n
               0: Der Underleaver arbeitet als 'Standalone'-Maschine oder besitzt innerhalb einer Linie keine nachgelagerte Einheit.\n
@@ -92,35 +98,79 @@ de:
               1: negatives Dauersignal - Freigabe bei 0V\n
               2: positives Dauersignal - Freigabe bei 12V"
 
-  paper_roll_drive_config:
+  source_parameter_working_velocity:
+    name:     "Parameterquelle f�r Bandgeschwindigkeit"
+    comment:  |
+              Dieser Parameter bestimmt den Programmparameter, dessen Wert f�r die Ermittlung der Bandgeschwindigkeit genutzt werden soll.
+
+
+              0:   Liniengeschwindigkeit
+               
+              12:  Wiegeschwindigkeit (Maschine steht z.B. hinter Waage)
+              14:  Liniengeschwindigkeit (Maschine steht z.B. hinter Wippe, Markierband oder Transportband)
+
+
+              Der Parameter mit der ausgew�hlten Nummer wird verwendet. 
+              Intern wird eine �berpr�fung des Geschwindigkeitswertes vorgenommen.
+
+  roll_bracket_active:
+    name:   "Rollenbremse aktiv"
+    comment: |
+              An/Abwahl der Steuerung der Rollenbremse
+              
+              
+              0: Die Rollenbremse wird nicht verwendet.
+              
+              
+              1: Die Rollenbremse wird angesteuert und an einem bestimmten Aktivierungspunkt (abh�ngig von der T�nzerposition) geschaltet.
+              
+              
+              
+              Standard: 1
+  
+  factor_activation_point_roll_bracket:
+    name:   "Faktor Aktivierungspunkt Rollenbremse"
+    comment: |
+              Faktor f�r den Aktivierungspunkt der Rollenbremse.
+              
+              
+              Standardm��ig wird die Rollenbremse unterhalb des unteren Teachpunktes des T�nzers aktiviert. Sollte ein h�herer Aktivierungspunkt notwendig sein, kann �ber diesen Parameter ein Prozentwert angegeben werden, um den der Aktivierungspunkt in Richtung des oberen Teachpunktes des T�nzers verschoben wird. Der Prozentwert bezieht sich auf den Abstand zwischen unteren und oberen Teachpunkt.              
+    
+  paper_roll_drive_selection:
     name:  "Bahnantrieb abgew�hlt=0/Servo=1/FU=2"
-    comment: &COMMON_DRIVE_CONFIG "Einerstelle: An/Abwahl\n
-            \n
-            XXX0: Achse im System nicht vorhanden ,wird vom System  simuliert.\n
-            XXX1: Achse ist im Antriebssystem als Servoantrieb vorhanden.\n
-            XXX2: Achse ist im Antriebssystem als Frequenzumrichterantrieb vorhanden.\n
-            \n
-            Zehner- und Hunderterstelle: Motortyp\n
-            \n
-            X00X = NORD_MOTOR_037\n
-            X01X = NORD_MOTOR_075\n
-            X02X = LENZE_063C32\n
-            X03X = LENZE_047C22\n
-            X04X = LENZE_063C22\n
-            X05X = INTERROLL_TM111_037_2_081\n
-            X06X = INTERROLL_TM082_012_2_056\n
-            X07X = LENZE_063C22_GEBER\n
-            X08X = LENZE_063C22_POSI\n
-            X17X = INTERROLL_111_2P_037_133V\n
-            X18X = INTERROLL_111_2P_037_133V_GEBER\n
-            X19X = INTERROLL_111_2P_037_133V_POSI\n
-            X20X = INTERROLL_111_2P_037_133V_GEBER_AUF_C400\n
-            X21X = HARMONIC_DRIVE_FHA_11C_D200_GEBER\n
-            \n
-            Tausenderstelle:\n
-            \n
-            0XXX = ohne PTC\n
-            1XXX = mit PTC"
+    comment: &COMMON_DRIVE_CONFIG | 
+            Einerstelle: An/Abwahl
+            
+            
+            XXX0: Achse im System nicht vorhanden ,wird vom System  simuliert.
+            XXX1: Achse ist im Antriebssystem als Servoantrieb vorhanden.
+            XXX2: Achse ist im Antriebssystem als Frequenzumrichterantrieb vorhanden.
+            
+            
+            Zehner- und Hunderterstelle: Motortyp
+            
+            
+            X00X = NORD_MOTOR_037
+            X01X = NORD_MOTOR_075
+            X02X = LENZE_063C32
+            X03X = LENZE_047C22
+            X04X = LENZE_063C22
+            X05X = INTERROLL_TM111_037_2_081
+            X06X = INTERROLL_TM082_012_2_056
+            X07X = LENZE_063C22_GEBER
+            X08X = LENZE_063C22_POSI
+            X17X = INTERROLL_111_2P_037_133V
+            X18X = INTERROLL_111_2P_037_133V_GEBER
+            X19X = INTERROLL_111_2P_037_133V_POSI
+            X20X = INTERROLL_111_2P_037_133V_GEBER_AUF_C400
+            X21X = HARMONIC_DRIVE_FHA_11C_D200_GEBER
+            
+            
+            Tausenderstelle:
+            
+            
+            0XXX = ohne PTC
+            1XXX = mit PTC
 
   paper_roll_drive_distance_revolution:
     name:  "Bahnantrieb Weg/Umdrehung [mm]"
@@ -134,7 +184,7 @@ de:
     name:  "Bahnantrieb Getriebefaktor Nenner"
     comment:  &COMMON_GEAR_OUT "Anzahl der Getriebez�hne abtriebseitig"
 
-  blade_drive_config:
+  blade_drive_selection:
     name:  "Messerwelle abgew�hlt=0/Servo=1/FU=2"
     comment: *COMMON_DRIVE_CONFIG
 
@@ -150,7 +200,7 @@ de:
     name:  "Messerwelle Getriebefaktor Nenner"
     comment:  *COMMON_GEAR_OUT
 
-  paper_feed_drive_config:
+  paper_feed_drive_selection:
     name:  "Blattantrieb abgew�hlt=0/Servo=1/FU=2"
     comment:  *COMMON_DRIVE_CONFIG
 
@@ -166,7 +216,7 @@ de:
     name:  "Blattantrieb Getriebefaktor Nenner"
     comment:  *COMMON_GEAR_OUT
 
-  transport_drive_config:
+  transport_drive_selection:
     name:  "Portionsauflageband abgew�hlt=0/Servo=1/FU=2"
     comment:  *COMMON_DRIVE_CONFIG
 
@@ -186,7 +236,7 @@ de:
     name:  "Portionsauflageband Bandl�nge"
     comment:  "Gesamte Bandl�nge des Portionsauflagebandes.\nAngabe erfolgt in Millimeter."
 
-  infeed_drive_config:
+  infeed_drive_selection:
     name:  "Einlegeband abgew�hlt=0/Servo=1/FU=2"
     comment:  *COMMON_DRIVE_CONFIG
 
@@ -204,4 +254,6 @@ de:
 
   infeed_drive_belt_length:
     name:  "Einlegeband Bandl�nge"
-    comment:  "Gesamte Bandl�nge des Einlegebandes.\nAngabe erfolgt in Millimeter."
+    comment:  | 
+              Gesamte Bandl�nge des Einlegebandes.
+              Angabe erfolgt in Millimeter.

data/examples/underleaver/underleaver.setup.param.en.yml

@@ -103,7 +103,43 @@ en:
               1: Negative continuously signal - enables by 0V\n
               2: Positiv continuously signal - enables by 12V"
 
-  paper_roll_drive_config:
+  source_parameter_working_velocity:
+    name:     "Parametersource for conveyor velocity"
+    comment:  |
+              This parameter defines the programme parameter whose value will be used to determine the conveyor velocity.
+
+
+              0:   Line velocity
+ 
+              12:  Weighing velocity
+              14:  Line velocity
+
+
+              Nevertheless the velocity value  will be internally validated.
+
+  roll_bracket_active:
+    name:   "Rollbracket active"
+    comment: |
+             Configuration of roll brake.
+             
+             
+             0: Deselect the roll brake.
+             
+             1: Select the roll brake.
+             
+             
+             Default: 1.
+
+  
+  factor_activation_point_roll_bracket:
+    name:   "Factor activation point rollbracket"
+    comment: |
+             Factor for activation point of roll brake.
+             
+             
+             If active, roll brake will be activated beneath lower loop position. This parameter allows to move this activation point towards the upper loop position. Movement is given in percent and relates to the distance between lower and upper loop position.
+
+  paper_roll_drive_selection:
     name:  "Paper roll drive - Select/Deselect"
     comment: &COMMON_DRIVE_CONFIG "Unit�s Place: 'Select/Deselect drive'\n
               \n
@@ -145,7 +181,7 @@ en:
     name:  "Paper roll drive - Gear OUT"
     comment: &COMMON_GEAR_OUT "Number of teeth - drive shaft sided."
 
-  blade_drive_config:
+  blade_drive_selection:
     name:  "Blade drive - Select/Deselect"
     comment: *COMMON_DRIVE_CONFIG
 
@@ -161,7 +197,7 @@ en:
     name:  "Blade drive - Gear OUT"
     comment:  *COMMON_GEAR_OUT
 
-  paper_feed_drive_config:
+  paper_feed_drive_selection:
     name:  "Paper feed drive - Select/Deselect"
     comment:  *COMMON_DRIVE_CONFIG
 
@@ -177,7 +213,7 @@ en:
     name:  "Paper feed drive - Gear OUT"
     comment:  *COMMON_GEAR_OUT
 
-  transport_drive_config:
+  transport_drive_selection:
     name:  "Transport drive - Select/Deselect"
     comment:  *COMMON_DRIVE_CONFIG
 
@@ -197,7 +233,7 @@ en:
     name:  "Transport drive - Length of belt [mm]"
     comment:  "Specify the length of the transport conveyor [in mm]"
 
-  infeed_drive_config:
+  infeed_drive_selection:
     name:  "Infeed drive - Select/Deselect"
     comment:  *COMMON_DRIVE_CONFIG
 

data/lib/setup_configuration/array.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+
+class Array
+  # Splits _self_ in arrays with maximal size of _len_ and returns an array with this arrays.
+  # :call-seq:
+  #  array%(len) -> an_array of arrays
+  #   [1,2,3,4,5,6] % 2 => [[1,2], [3,4], [5,6]]
+  def % len
+    inject([]) do |ary, x|
+      ary << [] if [*ary.last].nitems % len == 0
+      ary.last << x
+      ary
+    end
+  end
+end

data/lib/setup_configuration/parameter_machinetype_bridge.rb

@@ -0,0 +1,12 @@
+# encoding: utf-8
+
+module SetupConfiguration
+  
+  #
+  # Module which acts as a container for generated methods which will deliver binary values 
+  # of machine types.
+  #
+  module ParameterMachineTypeBridge    
+  end
+  
+end

data/lib/setup_configuration/setup_config.rb

@@ -1,7 +1,9 @@
+# encoding: utf-8
+
 module SetupConfiguration
 
   def self.description_ranges()
-    [(0..199), (200..599), (600..1299)]
+    [0..199, 200..599, 600..1299]
   end
 
   def self.parameter_range()
@@ -16,6 +18,7 @@ class SetupConfiguration::Suite
   attr_accessor :categories
   attr_accessor :settings
   attr_accessor :name
+  attr_accessor :abbreviation
 
   def initialize
     self.categories= Hash.new { |hash, key| hash[key] = [] }
@@ -47,7 +50,7 @@ class SetupConfiguration::Suite
 
   # Gets all known parameters.
   def parameters()
-    categories.values.flatten
+    categories.values.flatten.sort
   end
 
   #
@@ -79,6 +82,10 @@ class SetupConfiguration::Suite
   #
   def validate_params()
 
+    categories.each() do |key, value|
+      throw RuntimeError.new("ERROR: category '#{key}' contains more than 150 parameters. Reduce parameter count.") if value.size >150
+    end
+    
     keys=[]
     numbers=[]
     #valid parameter numbers start at 1
@@ -86,17 +93,17 @@ class SetupConfiguration::Suite
 
     self.parameters().each() do |p|
 
-      throw RuntimeError.new("ERROR: parameter number '#{p.number}' not supported. Number must be in range #{valid_param_numbers}") unless valid_param_numbers.member?(p.number)
+      puts "WARNING: parameter number 404 is reserved for machine type. you are using it for '#{p.key}'." if p.number.eql?(404)
+      throw RuntimeError.new("ERROR: parameter number '#{p.number}' not supported. Number must be in range #{valid_param_numbers}.") unless valid_param_numbers.member?(p.number)
 
       if keys.include? p.key
-        # todo error handling
         throw RuntimeError.new("ERROR: parameter key '#{p.key}' defined more than once")
       else
         keys << p.key
       end
 
+      
       if numbers.include? p.number
-        # todo error handling
         throw RuntimeError.new("ERROR: parameter number '#{p.number}' defined more than once")
       else
         numbers << p.number
@@ -115,10 +122,11 @@ class SetupConfiguration::Setting
   attr_reader :balance_maximum
 
   def initialize
-    @minimum=(0..0)
-    @maximum=(0..0)
-    @balance_minimum=(0..0)
-    @balance_maximum=(0..0)
+    @minimum=0..0
+    @maximum=0..0
+    @balance_minimum=0..0
+    @balance_maximum=0..0
+    @machine_types=[]
   end
 
   def min(range)
@@ -136,6 +144,22 @@ class SetupConfiguration::Setting
   def balance_max(range)
     @balance_maximum=range
   end
+  
+  def machine_type(name, number, range)
+    machine_type = SetupConfiguration::MachineType.new(name, number, range)
+    @machine_types << machine_type
+    # generates a method with given machine type name in a module
+    # this module is included in Parameter class so machine type dependencies can be
+    # given with machine type names (in DSL) instead of binary numbers
+    SetupConfiguration::ParameterMachineTypeBridge.send(:define_method, name) do
+      machine_type.binary_number
+    end
+  end
+  
+  def machine_types
+    @machine_types.sort {|a, b| a.sequence_number <=> b.sequence_number}
+  end
+  
 end
 
 class SetupConfiguration::ParameterFactory
@@ -149,8 +173,7 @@ class SetupConfiguration::ParameterFactory
   def param(parameter, number, &parameter_def)
 #    puts "executed param in Parameters: #{parameter}"
     # evaluate given block in Parameter context and return new parameter
-    p = SetupConfiguration::Parameter.new(parameter)
-    p.number=(number)
+    p = SetupConfiguration::Parameter.new(parameter, number)
     p.instance_eval(&parameter_def) if parameter_def
     params << p
   end
@@ -158,18 +181,21 @@ class SetupConfiguration::ParameterFactory
 end
 
 class SetupConfiguration::Parameter
+  include Enumerable
+  include SetupConfiguration::ParameterMachineTypeBridge
 
   attr_accessor :key
   attr_accessor :number
   attr_reader :dependency
   attr_reader :machine_type
 
-  def initialize(name)
+  def initialize(name, number)
     # depends upon no other parameter
     @dependency=:none
     # valid on all machines
     @machine_type=0
     @key= name
+    @number=number
   end
 
   def depends_on(dependency)
@@ -180,4 +206,33 @@ class SetupConfiguration::Parameter
     @machine_type=machine_type
   end
 
+  def <=>(parameter)
+    self.number <=> parameter.number
+  end
+  
+end
+
+class SetupConfiguration::MachineType
+  include Enumerable
+  
+  attr_reader :name
+  attr_reader :range
+  attr_reader :sequence_number
+  attr_reader :binary_number
+  
+  def initialize(name, sequence_number, range)
+    @name=name
+    @range=range
+    @sequence_number=sequence_number
+    if @sequence_number <= 0
+      @binary_number=0
+    else
+      @binary_number=2**(@sequence_number-1)
+    end
+  end
+
+  def <=>(machine_type)
+    self.range.first <=> machine_type.range.first
+  end
+  
 end

data/lib/setup_configuration/suite_generator.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module SetupConfiguration::Generator
   @output_path=""
 
@@ -56,13 +58,12 @@ module SetupConfiguration::Generator
     end
 
     def translate(number, &extractor)
-      #todo use suite as singleton!
       p=self.suite.find_param_by_number(number)
       if p
         key=p.key
         translation = SetupConfiguration::Translation::Translator.new().translate(key, @lang)
         if extractor
-          extractor.call( translation)
+          extractor.call( *translation )
         else
           translation
         end
@@ -101,7 +102,9 @@ module SetupConfiguration::Generator
         number << param.number
         depends << depends_on(param.dependency)
       end
-      [prepare(depends), prepare(machine_type), prepare(number) ]
+      #TODO compute value for max_number_parameters_per_tab of value maximum_numbers_per_category
+      max_number_parameters_per_tab=50
+      [depends, machine_type, number].collect(){ |arr| (arr%(max_number_parameters_per_tab)) .collect(){|a| prepare(a)}}
     end
 
     :private
@@ -189,6 +192,77 @@ module SetupConfiguration::Generator
 end
 
 
+
+class SetupConfiguration::SetupCodeBinding < SetupConfiguration::Generator::TemplateBinding
+  
+  def initialize
+    super
+  end
+  
+  def parameters
+    suite.parameters
+  end
+  
+  #
+  # Offset for setup parameter numbers. This offset is added to a parameter number when evaluated in controller.
+  #
+  def parameter_offset
+    1300
+  end
+  
+  def key(symbol)
+    s=symbol.to_s
+    delimiter='_'
+    s.split(delimiter).collect(){|splitter| splitter.capitalize}.join(delimiter).ljust(longest_key_length)
+  end
+  
+  :private
+
+  def longest_key_length
+    # find the length of the longest word
+    unless @longest
+     longest = parameters.inject(0) do |memo,param|
+        memo >= param.key.to_s.length ? memo : param.key.to_s.length
+     end
+     @longest=longest + 5
+    end
+    @longest
+  end
+end
+
+class SetupConfiguration::SetupCodeGenerator
+  
+  def generate(suite, output_path)
+    setup_code=SetupConfiguration::SetupCodeBinding.new
+    setup_code.output="LOGCODE#{suite.name.to_s.upcase}SETUP.EXP"
+    setup_code.suite=suite
+    
+    if template then
+      rhtml = ERB.new( template, nil, "<>")
+
+      File.open(File.join(output_path, setup_code.output), "w") do |f|
+        f << rhtml.result(setup_code.get_binding)
+      end
+    else
+      puts "WARNING: No template found. Generation of #{setup_code.output} aborted."
+    end
+    
+    
+  end
+  
+  :private
+  def template
+    template=File.join(File.dirname(__FILE__), "templates", "logcodesetup.exp.erb")
+    if File.file?(template)
+      File.read(template)
+    else
+      puts "WARNING: Template file #{template} expected but not found"
+    end
+  end
+  
+end
+
+
 class SetupConfiguration::SuiteGenerator
   include SetupConfiguration::Generator
 
@@ -247,6 +321,8 @@ class SetupConfiguration::SuiteGenerator
       puts "WARNING: No template found. Generation of #{bind.output} aborted."
     end
 
+    SetupConfiguration::SetupCodeGenerator.new.generate(self.suite, output_path)
+    
   end
 end
 

data/lib/setup_configuration/templates/logcodesetup.exp.erb

@@ -0,0 +1,15 @@
+(* @NESTEDCOMMENTS := 'Yes' *)
+(* @PATH := '\/Display' *)
+TYPE LogCode<%= suite.name.to_s.capitalize %>Setup :
+(
+
+(* WARNING: This file is generated - do not edit it. 
+   Edit instead the machine setup parameter description. *)
+
+<% parameters.each do | parameter | %>
+    SUP_<%= suite.abbreviation.to_s.upcase %>_<%= key(parameter.key) %>:= <%= parameter.number + parameter_offset %><% unless parameters.last.eql?(parameter) then %><%= "," %><% end %><% end %>
+
+);
+END_TYPE
+
+(* @END_DECLARATION := '0' *)

data/lib/setup_configuration/templates/mps3.ini.erb

@@ -17,22 +17,18 @@ END_WAAG_MIN=<%= settings.balance_minimum.last %>
 BEGIN_WAAG_MAX=<%= settings.balance_maximum.first %>
 END_WAAG_MAX=<%= settings.balance_maximum.last %>
 
-[MASCHINENTYP]
-BEGIN_TYP0=0
-BEGIN_TYP1=1000
-BEGIN_TYP2=2000
-BEGIN_TYP3=3000
-BEGIN_TYP4=4000
+[MASCHINENTYP]<% settings.machine_types.each do |machine_type| %>
+BEGIN_TYP<%= machine_type.sequence_number %>=<%= machine_type.range.first %><% end %>
 
 ;(0..16)
 ;generate param names as comment
-[PARAMANZEIGE]<%  categories.each_with_index do |category, index| %><%    dependencies, machine_types, parameters =  param_infos(category)%>
-2CF<%= index%>a=<%= dependencies %>
-1CF<%= index%>a=<%= machine_types %>
-TAB<%= index%>a=<%= parameters %>
-2CF<%= index%>b=
-1CF<%= index%>b=
-TAB<%= index%>b=
-2CF<%= index%>c=
-1CF<%= index%>c=
-TAB<%= index%>c=<% end %>
+[PARAMANZEIGE]<%  categories.each_with_index do |category, index| %><% dependencies, machine_types, parameters = param_infos(category) %>
+2CF<%= index%>a=<%= dependencies[0] %>
+1CF<%= index%>a=<%= machine_types[0] %>
+TAB<%= index%>a=<%= parameters[0] %>
+2CF<%= index%>b=<%= dependencies[1] %>
+1CF<%= index%>b=<%= machine_types[1] %>
+TAB<%= index%>b=<%= parameters[1] %>
+2CF<%= index%>c=<%= dependencies[2] %>
+1CF<%= index%>c=<%= machine_types[2] %>
+TAB<%= index%>c=<%= parameters[2] %><% end %>

data/lib/setup_configuration/translation.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module SetupConfiguration::Translation
 
   FILE_EXTENSION="setup.param".freeze

data/lib/setup_configuration.rb

@@ -1,9 +1,12 @@
+# encoding: utf-8
+
 module SetupConfiguration
 end
 
-def SetupConfiguration(name, &block)
+def SetupConfiguration(name, abbreviation=name, &block)
   suite=SetupConfiguration::Suite.instance
   suite.name=name
+  suite.abbreviation=abbreviation
   suite.instance_eval(&block)
   suite.validate_params()
 rescue
@@ -15,6 +18,8 @@ require 'singleton'
 require 'erb'
 require 'fileutils'
 require 'i18n'
+require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/array')
+require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/parameter_machinetype_bridge')
 require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/setup_config')
 require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/suite_generator')
 require File.expand_path(File.dirname(__FILE__) + '/setup_configuration/translation')

data/test/setup_configuration/machine_type_test.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+require File.dirname(__FILE__) + "/../test_helper"
+
+class MachineTypeTest < Test::Unit::TestCase
+
+  context "A Machine Type" do
+    setup do
+      @all_machines = SetupConfiguration::MachineType.new(:all_machines, 0, 0..999)
+      @machine_one = SetupConfiguration::MachineType.new(:machine_one, 1, 1000..1999)
+      @machine_three = SetupConfiguration::MachineType.new(:machine_one, 3, 3000..3999)
+    end
+
+    should "return its name" do
+      assert_equal :all_machines, @all_machines.name
+    end
+
+    should "return its machine type number range" do
+      assert_equal 0..999, @all_machines.range
+    end
+
+    should "return its sequence number" do
+      assert_equal 0, @all_machines.sequence_number
+      assert_equal 1, @machine_one.sequence_number
+      assert_equal 3, @machine_three.sequence_number
+    end
+
+    should "return its binary number" do
+      assert_equal 0, @all_machines.binary_number
+      assert_equal 1, @machine_one.binary_number
+      assert_equal 4, @machine_three.binary_number
+    end
+
+  end
+  
+  
+end

data/test/setup_configuration/parameter_test.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+require File.dirname(__FILE__) + "/../test_helper"
+
+class ParameterTest < Test::Unit::TestCase
+
+  context "A Parameter" do
+    setup do
+      @parameter = SetupConfiguration::Parameter.new(:drive_config, 42)
+    end
+
+    should "return its name" do
+      assert_equal :drive_config, @parameter.key
+    end
+
+    should "return its number" do
+      assert_equal 42, @parameter.number
+    end
+
+    should "return its default machine type" do
+      assert_equal 0, @parameter.machine_type
+    end
+
+    should "return its default parameter dependency" do
+      assert_equal :none, @parameter.dependency
+    end
+
+    context "with a defined machine type" do
+      setup do
+        @parameter.for_machine_type 13
+      end
+
+      should "return its given machine type" do
+        assert_equal 13, @parameter.machine_type
+      end
+
+    end
+
+    context "with a defined parameter dependency" do
+      setup do
+        @parameter.depends_on :machine_virtual
+      end
+
+      should "return its given parameter dependency" do
+        assert_equal :machine_virtual, @parameter.dependency
+      end
+
+    end
+
+  end
+
+end

data/test/setup_configuration/setup_configuration_test.rb

@@ -1,4 +1,4 @@
-require "test/unit"
+# encoding: utf-8
 require File.dirname(__FILE__) + "/../test_helper"
 
 class SetupConfigurationTest < Test::Unit::TestCase

data/test/test_helper.rb

@@ -1 +1,4 @@
+require "test/unit"
+require "shoulda"
+
 require File.dirname(__FILE__) + '/../lib/setup_configuration'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: machine_setup
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
   - robi-wan
@@ -9,8 +9,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-10 00:00:00 +01:00
-default_executable: setup_config_gen.rb
+date: 2010-02-23 00:00:00 +01:00
+default_executable: setup_config_gen
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: i18n
@@ -20,12 +20,12 @@ dependencies:
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.3.0
+            version: 0.3.2
       version: 
 description: Helps generating configuration files for machine setup parameters.
 email: robi-wan@suyu.de
 executables: 
-  - setup_config_gen.rb
+  - setup_config_gen
 extensions: []
 
 extra_rdoc_files: 
@@ -39,18 +39,23 @@ files:
   - Rakefile
   - TODO
   - VERSION
-  - bin/setup_config_gen.rb
+  - bin/setup_config_gen
   - examples/underleaver/underleaver.setup.param
   - examples/underleaver/underleaver.setup.param.de.yml
   - examples/underleaver/underleaver.setup.param.en.yml
   - lib/setup_configuration.rb
+  - lib/setup_configuration/array.rb
+  - lib/setup_configuration/parameter_machinetype_bridge.rb
   - lib/setup_configuration/setup_config.rb
   - lib/setup_configuration/suite_generator.rb
   - lib/setup_configuration/templates/deutsch.lng.erb
   - lib/setup_configuration/templates/english.lng.erb
+  - lib/setup_configuration/templates/logcodesetup.exp.erb
   - lib/setup_configuration/templates/mps3.ini.erb
   - lib/setup_configuration/translation.rb
   - setup.rb
+  - test/setup_configuration/machine_type_test.rb
+  - test/setup_configuration/parameter_test.rb
   - test/setup_configuration/setup_configuration_test.rb
   - test/test_helper.rb
 has_rdoc: true
@@ -83,4 +88,6 @@ specification_version: 3
 summary: Generating configuration for machine setup parameters.
 test_files: 
   - test/test_helper.rb
+  - test/setup_configuration/machine_type_test.rb
+  - test/setup_configuration/parameter_test.rb
   - test/setup_configuration/setup_configuration_test.rb

data/bin/setup_config_gen.rb

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-param_def=ARGV[0]
-
-throw RuntimeError.new("parameter definition nicht angegeben") if param_def.nil?
-throw RuntimeError.new("parameter definition existiert nicht") unless File.file?(param_def)
-
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'setup_configuration'
-
-# load file with parameter dsl
-load param_def
-
-# get reference to suite instance which holds parameter configuration
-suite=SetupConfiguration::Suite.instance
-
-#set output path
-generator = SetupConfiguration::SuiteGenerator.new()
-generator.output_path=File.dirname(param_def)
-
-# load files with translations
-SetupConfiguration::Translation.translation_files(suite.name).each() do |t|
-  trans_file=File.join(File.dirname(param_def), t)
-  if File.file?(trans_file)
-    SetupConfiguration::Translation::Translator.i18n_load_path(trans_file)
-  else
-    puts "WARNING: expected file with translations '#{trans_file}' not found."
-  end
-end
-
-generator.generate()