Merge pull request #105 from PropGit/encode_64

Added base64 encoding

Author: PropGit

BlocklyPropClient.py

@@ -36,7 +36,7 @@
 # Please verify that the version number in the local about.txt and the
 # ./package/win-resources/blocklypropclient-installer.iss matches this.
 # -----------------------------------------------------------------------
-VERSION = "0.6.4"
+VERSION = "0.7.0"
 
 
 # Enable logging for functions outside of the class definition

SerialSocket.py

@@ -4,6 +4,7 @@
 import thread
 import re
 import logging
+import base64
 
 __author__ = 'Michel'
 
@@ -46,20 +47,21 @@ def received_message(self, message):
             except SerialException as se:
                 self.logger.error("Failed to connect to %s", port)
                 self.logger.error("Serial exception message: %s", se.message)
-                self.send("Failed to connect to: %s using baud rate %s\n\r(%s)\n\r" % (port, baudrate, se.message))
+                self.send(base64.b64encode("Failed to connect to: %s using baud rate %s\n\r(%s)\n\r" % (port, baudrate, se.message)))
                 return
 
             if self.serial.isOpen():
                 self.logger.info("Serial port %s is open.", port)
-                self.send("Connection established with: %s using baud rate %s\n\r" % (port, baudrate))
+                self.send(base64.b64encode("Connection established with: %s using baud rate %s\n\r" % (port, baudrate)))
                 thread.start_new_thread(serial_poll, (self.serial, self))
             else:
-                self.send("Failed to connect to: %s using baud rate %s\n\r" % (port, baudrate))
+                self.send(base64.b64encode("Failed to connect to: %s using baud rate %s\n\r" % (port, baudrate)))
         else:
             if self.serial.isOpen():
-                self.logger.info("Sending serial data")
-                self.send(message.data)
-                self.serial.write(message.data)
+                #self.send(message.data)
+                data = base64.b64decode(message.data)
+                self.logger.info("Sending data to device: %s", data)
+                self.serial.write(data)
 
     # close serial connection
     def close(self, code=1000, reason=''):
@@ -74,9 +76,9 @@ def serial_poll(serial, socket):
     try:
         while serial.isOpen():
             data = serial.read(serial.inWaiting())
-            if len(data) > 0:
+            if data:
                 module_logger.debug('Data received from device: %s', data)
-                socket.send(data)
+                socket.send(base64.b64encode(data))
             # Wait a half-second before listening again.
             sleep(0.5)
     except SerialException as se:

about.txt

@@ -1,4 +1,4 @@
-Version: v0.6.4
+Version: v0.7.0
 
 Contributors:
 - Michel Lampo

package/blocklypropclient-installer.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "BlocklyPropClient"
-#define MyAppVersion "0.6.4"
+#define MyAppVersion "0.7.0"
 #define MyAppPublisher "Parallax Inc."
 #define MyAppURL "http://blockly.parallax.com/"
 #define MyAppExeName "BlocklyPropClient.exe"