merge from master

lib/c/labcomm_encoder.c

@@ -18,7 +18,7 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-#define CURRENT_VERSION "LabComm20141009"
+#define CURRENT_VERSION "LabComm2014"
 
 #include <errno.h>
 #include "labcomm.h"

lib/csharp/se/lth/control/labcomm/Constant.cs

@@ -2,7 +2,7 @@ namespace se.lth.control.labcomm {
 
   public class Constant {
 
-    public const string CURRENT_VERSION = "LabComm20141009";
+    public const string CURRENT_VERSION = "LabComm2014";
 
     /*
      * Allowed packet tags

lib/java/Makefile

@@ -14,13 +14,13 @@ MODULES=Constant \
 	Writer \
 	WriterWrapper
 
-all: labcomm.jar labcomm20141009.jar labcomm2006.jar
+all: labcomm.jar labcomm2014.jar labcomm2006.jar
 
 labcomm.jar: gen/JAVAC
 	echo $@
 	cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class se/lth/control/labcomm2006/*.class
 
-labcomm20141009.jar: gen/JAVAC
+labcomm2014.jar: gen/JAVAC
 	echo $@
 	cd gen ; jar cf ../$@ se/lth/control/labcomm/*.class
 
@@ -39,5 +39,5 @@ gen/JAVAC: $(MODULES:%=se/lth/control/labcomm/%.java) $(MODULES:%=se/lth/control
 .PHONY: clean
 
 clean:
-	rm -rf labcomm.jar labcomm2006.jar labcomm20141009.jar gen 
+	rm -rf labcomm.jar labcomm2006.jar labcomm2014.jar gen 
 

lib/java/se/lth/control/labcomm/Constant.java

@@ -2,7 +2,7 @@ package se.lth.control.labcomm;
 
 public class Constant {
 
-  public static final String CURRENT_VERSION = "LabComm20141009";
+  public static final String CURRENT_VERSION = "LabComm2014";
 
   /*
    * Allowed packet tags

lib/java/se/lth/control/labcomm2006/DecoderChannel.java

@@ -134,7 +134,7 @@ public class DecoderChannel implements Decoder {
   }
 
   /**
-     method for API harmonization with labcomm20141009.
+     method for API harmonization with labcomm2014.
      Labcomm2006 encodes lengths etc as 32 bit ints.
   */
   public int decodePacked32() throws IOException {

lib/java/se/lth/control/labcomm2006/EncoderChannel.java

@@ -81,7 +81,7 @@ public class EncoderChannel implements Encoder {
   }
 
   /**
-     method for API harmonization with labcomm20141009.
+     method for API harmonization with labcomm2014.
      Labcomm2006 encodes lengths etc as 32 bit ints.
   */
   public void encodePacked32(long value) throws IOException {

lib/python/labcomm/LabComm.py

 #!/usr/bin/python
 #
-# LabComm20141009 packet has the following layout
+# LabComm2014 packet has the following layout
 #
 #   +----+----+----+----+
 #   | id                    (packed32)
@@ -11,7 +11,7 @@
 #   | ...
 #   +----+--
 #
-# LabComm220141009 SAMPLE_DEF:
+# LabComm2014 SAMPLE:
 #
 #   +----+----+----+----+
 #   | id = 0x02             (packed32)
@@ -29,7 +29,7 @@
 #   | ...
 #   +----+--
 #
-# LabComm220141009 TYPE_DEF: (as SAMPLE_DEF, but signatures are hierarchical,
+# LabComm2014 TYPE_DEF: (as SAMPLE_DEF, but signatures are hierarchical,
 #                             i.e., may contain references to other types
 #
 #   +----+----+----+----+
@@ -48,7 +48,7 @@
 #   | ...
 #   +----+--
 #
-# LabComm220141009 TYPE_BINDING
+# LabComm2014 TYPE_BINDING
 #
 #   +----+----+----+----+
 #   | id = 0x04             (packed32)
@@ -60,7 +60,7 @@
 #   | type number           (packed32)
 #   +----+----+----+----+
 #
-# LabComm20141009 User data:
+# LabComm2014 User data:
 #
 #   +----+----+----+----+
 #   | id >= 0x00000040      (packed32)
@@ -151,7 +151,7 @@
 import types
 import struct as packer
 
-DEFAULT_VERSION = "LabComm20141009"
+DEFAULT_VERSION = "LabComm2014"
 
 # Allowed packet tags
 i_VERSION     = 0x01
@@ -177,7 +177,7 @@ i_STRING      = 0x27
 
 # Version testing
 def usePacketLength(version):
-    return version in [ None, "LabComm20141009" ]
+    return version in [ None, "LabComm2014" ]
 
 class length_encoder:
     def __init__(self, encoder):
@@ -619,7 +619,7 @@ class Encoder(Codec):
         super(Encoder, self).__init__()
         self.writer = writer
         self.version = version
-        if self.version in [ "LabComm20141009" ]:
+        if self.version in [ "LabComm2014" ]:
             self.encode_type(i_VERSION)
             with length_encoder(self) as e:
                 e.encode_string(version)
@@ -654,7 +654,7 @@ class Encoder(Codec):
             decl.encode_decl(self)
             
     def encode_packed32(self, v):
-        if self.version in [ None, "LabComm20141009" ]:
+        if self.version in [ None, "LabComm2014" ]:
             v = v & 0xffffffff
             tmp = [ v & 0x7f ]
             v = v >> 7
@@ -771,7 +771,7 @@ class Decoder(Codec):
         return result
     
     def decode_packed32(self):
-        if self.version in [ "LabComm2013", "LabComm20141009" ] :
+        if self.version in [ "LabComm2013", "LabComm2014" ] :
             result = 0
             while True:
                 tmp = self.decode_byte()