Bumping up version to 0.5.3.

Author: pjewald

BlocklyLogger.py

@@ -6,14 +6,17 @@
 
 import os
 import logging
-from sys import platform
+import platform
+
 
 __author__ = 'Jim Ewald'
 
+
 # Platform constants
-PLATFORM_LINUX = 'linux2'
-PLATFORM_MACOS = 'darwin'
-PLATFORM_WINDOWS = 'win32'
+PLATFORM_LINUX = 'Linux'
+PLATFORM_MACOS = 'MacOS'
+PLATFORM_DARWIN = 'MacOS'
+PLATFORM_WINDOWS = 'Windows'
 
 # Default log path for each platform
 DEFAULT_PATH_MACOS = '/Library/Logs/Parallax'
@@ -23,6 +26,8 @@
 # Resulting path for log file
 path = None
 
+loglevel = logging.DEBUG
+
 
 def init(filename = 'BlocklyPropClient.log'):
     global path
@@ -42,11 +47,12 @@ def emit(self, record):
     disable_filelogging = False
 
     # Set correct log file location
-    if platform == PLATFORM_MACOS:
+    system = platform.system()
+    if (system == PLATFORM_MACOS) or (system == PLATFORM_DARWIN):
         logfile_name = __set_macos_logpath(filename)
-    elif platform == PLATFORM_WINDOWS:
+    elif system == PLATFORM_WINDOWS:
         logfile_name = __set_windows_logpath(filename)
-    elif platform == PLATFORM_LINUX:
+    elif system == PLATFORM_LINUX:
         logfile_name = __set_linux_logpath(filename)
 
     # Verify that we have a valid location
@@ -58,11 +64,11 @@ def emit(self, record):
 
     # Create a logger
     logger = logging.getLogger('blockly')
-    logger.setLevel(logging.DEBUG)
+    logger.setLevel(loglevel)
 
     # create a console handler for error-level events
     console = logging.StreamHandler()
-    console.setLevel(logging.ERROR)
+    console.setLevel(loglevel)
 
     # create a logging format
     formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
@@ -72,7 +78,7 @@ def emit(self, record):
     #  Log file is overwritten each time the app runs.
     if not disable_filelogging:
         handler = logging.FileHandler(logfile_name, mode='w')
-        handler.setLevel(logging.DEBUG)
+        handler.setLevel(loglevel)
         handler.setFormatter(formatter)
         logger.addHandler(handler)
 

BlocklyPropClient.py

@@ -1,6 +1,12 @@
 """
     BlocklyProp Client
 
+    0.5.3  February 22, 2017
+    - Correct error in path to propeller-load executable.
+    - Detect condition where serial port has disappeared
+    - Correct error where browser request for specific port
+      speed was disregarded.
+
 """
 import Tkinter as tk
 import ttk as ttk
@@ -23,20 +29,29 @@
 __author__ = 'Michel & Vale'
 
 PORT = 6009
-VERSION = "0.5.2"
 
+# -----------------------------------------------------------------------
+# NOTE:
+#
+# Please verify that the version number in the local about.txt and the
+# ./package/win0resources/blocklypropclient-installer.iss
+# -----------------------------------------------------------------------
+VERSION = "0.5.3"
 
 
 # Enable logging for functions outside of the class definition
-module_logger = logging.getLogger('blockly')
+module_logger = None
 
 
 class BlocklyPropClient(tk.Tk):
     def __init__(self, *args, **kwargs):
+        global module_logger
 
         # Enable application logging
         BlocklyLogger.init()
         self.logger = logging.getLogger('blockly.main')
+        module_logger = logging.getLogger('blockly')
+
         self.logger.info('Creating logger.')
 
         BlocklyHardware.init()

PropellerLoad.py

@@ -35,7 +35,7 @@ def __init__(self):
             exit(1)
 
         self.appdir = os.getcwd()
-        self.appdir = os.path.dirname(sys.argv[0])
+        # self.appdir = os.path.dirname(sys.argv[0])
 
     def get_ports(self):
         self.logger.info('Getting ports')

about.txt

@@ -1,4 +1,4 @@
-CurrentVersion: v0.5.2
+CurrentVersion: v0.5.3
 
 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.5.2"
+#define MyAppVersion "0.5.3"
 #define MyAppPublisher "Parallax, Inc."
 #define MyAppURL "http://blockly.parallax.com/"
 #define MyAppExeName "BlocklyPropClient.exe"