Merge branch 'rockin2015' into rockin

Author: Sven Schneider

Makefile

@@ -17,6 +17,10 @@ BASEDIR = .
 
 SUBDIRS = src rockin
 
+# Explicit dependencies, this is needed to have make bail out if there is any
+# error. This is also necessary for working parallel builds
+rockin: src
+
 include $(BASEDIR)/etc/buildsys/config.mk
 include $(BUILDSYSDIR)/rules.mk
 include $(BUILDSYSDIR)/root/root.mk

cfg/config.yaml

@@ -3,26 +3,20 @@
 # Main configuration document
 
 llsfrb:
-  plugins: "drilling_machine,conveyor_belt,quality_control_camera,force_fitting_machine"
+  plugins: "drilling_machine,triggered_conveyor_belt,force_fitting_machine"
 
   log:
     level: info
     general: refbox.log
     clips: clips.log
     game: game.log
 
-  conveyor-belt:
+  triggered-conveyor-belt:
     enable: false
     host: !ipv4 eth0
     command_port: !tcp-port 55502
     status_port: !tcp-port 55501
 
-  quality-control-camera:
-    enable: false
-    host: !ipv4 192.168.1.102
-    service_port: !tcp-port 55522
-    status_port: !tcp-port 55521
-
   drilling-machine:
     enable: false
     host: !ipv4 eth0
@@ -44,8 +38,8 @@ llsfrb:
     debug: true
     # debug levels: 0 ~ none, 1 ~ minimal, 2 ~ more, 3 ~ maximum
     debug-level: 2
-    unwatch-facts: [time, signal, benchmark-state]
-    unwatch-rules: [retract-time, benchmark-update-last-time,
+    unwatch-facts: [time, signal]
+    unwatch-rules: [retract-time,
                     net-send-beacon, net-send-BenchmarkState, net-send-OrderInfo,
                     net-send-Inventory, net-send-VersionInfo,
                     net-send-DrillingMachineStatus, net-send-ConveyorBeltStatus]
@@ -61,24 +55,42 @@ llsfrb:
       #send-port: !udp-port 4444
       #recv-port: !udp-port 4445
 
-    b-it-bots-peer:
+    AugsburgDublin-peer:
       host: !ipv4 192.168.1.255
       port: !udp-port 4446
       #send-port: !udp-port 4446
       #recv-port: !udp-port 4447
 
-    IASLab-peer:
+    RobOTTO-peer:
       host: !ipv4 192.168.1.255
       port: !udp-port 4448
       #send-port: !udp-port 4448
       #recv-port: !udp-port 4449
 
-    SPQR-peer:
+    smARTLab-peer:
       host: !ipv4 192.168.1.255
       port: !udp-port 4450
       #send-port: !udp-port 4450
       #recv-port: !udp-port 4451
 
+    SPQR-peer:
+      host: !ipv4 192.168.1.255
+      port: !udp-port 4452
+      #send-port: !udp-port 4452
+      #recv-port: !udp-port 4453
+
+    UvA-peer:
+      host: !ipv4 192.168.1.255
+      port: !udp-port 4454
+      #send-port: !udp-port 4454
+      #recv-port: !udp-port 4455
+
+    wits-peer:
+      host: !ipv4 192.168.1.255
+      port: !udp-port 4456
+      #send-port: !udp-port 4456
+      #recv-port: !udp-port 4457
+
   mongodb:
     enable: true
     hostport: localhost
@@ -88,11 +100,14 @@ llsfrb:
       protobuf: llsfrb.protobuf
 
   game:
-    teams: [b-it-bots, IASLab, SPQR]
+    teams: [AugsburgDublin, RobOTTO, smARTLab, SPQR, UvA, wits]
     crypto-keys:
-      ART: randomkey
-      b-it-bots: randomkey
+      AugsburgDublin: randomkey
+      RobOTTO: randomkey
+      smARTLab: randomkey
+      SPQR: randomkey
       UvA: randomkey
+      wits: randomkey
 
   shell:
     refbox-host: !ipv4 192.168.1.100

rockin/clips/benchmark-time.clp

@@ -0,0 +1,13 @@
+;---------------------------------------------------------------------------
+;  benchmark-time.clp - RoCKIn RefBox CLIPS benchmark timer
+;
+;  Licensed under BSD license, cf. LICENSE file
+;---------------------------------------------------------------------------
+
+(defclass BenchmarkTime (is-a USER) (role concrete)
+  (slot timer (type FLOAT) (default 0.0))
+
+  ; cardinality 2: sec msec
+  (multislot start-time (type INTEGER) (cardinality 2 2) (default 0 0))
+  (multislot end-time (type INTEGER) (cardinality 2 2) (default 0 0))
+)