new library v1.26.1806.1

jcalderon09 · jcalderon09 · commit 02f379739486 · 2018-06-19T16:30:58.000+02:00
Fixed bug related to new firmware version v1.16
diff --git a/Examples_IOT/RFE_Example_IoT_1.py b/Examples_IOT/RFE_Example_IoT_1.py
@@ -34,7 +34,7 @@ def PrintPeak(objAnalazyer):
 # global variables and initialization
 #---------------------------------------------------------
 
-SERIALPORT = None    #serial port data 
+SERIALPORT = None    #serial port identifier, use None to autodetect
 BAUDRATE = 500000
 
 objRFE = RFExplorer.RFECommunicator()     #Initialize object and thread
diff --git a/Examples_IOT/RFE_Example_IoT_2.py b/Examples_IOT/RFE_Example_IoT_2.py
@@ -67,7 +67,7 @@ def ControlSettings(objAnalazyer):
 # global variables and initialization
 #---------------------------------------------------------
 
-SERIALPORT = None    #serial port data  
+SERIALPORT = None    #serial port identifier, use None to autodetect 
 BAUDRATE = 500000
 
 objRFE = RFExplorer.RFECommunicator()     #Initialize object and thread
diff --git a/Examples_USB/RFE6GEN_Example_USB.py b/Examples_USB/RFE6GEN_Example_USB.py
@@ -19,7 +19,7 @@
 # global variables and initialization
 #---------------------------------------------------------
 
-SERIALPORT = None    #serial port data 
+SERIALPORT = None    #serial port identifier, use None to autodetect 
 BAUDRATE = 500000
 
 objRFEGenerator = RFExplorer.RFECommunicator()     #Initialize object and thread
diff --git a/Examples_USB/RFE_Example_USB_1.py b/Examples_USB/RFE_Example_USB_1.py
@@ -34,7 +34,7 @@ def PrintPeak(objAnalazyer):
 # global variables and initialization
 #---------------------------------------------------------
 
-SERIALPORT = None    #serial port data 
+SERIALPORT = None    #serial port identifier, use None to autodetect 
 BAUDRATE = 500000
 
 objRFE = RFExplorer.RFECommunicator()     #Initialize object and thread
diff --git a/Examples_USB/RFE_Example_USB_2.py b/Examples_USB/RFE_Example_USB_2.py
@@ -67,7 +67,7 @@ def ControlSettings(objAnalazyer):
 # global variables and initialization
 #---------------------------------------------------------
 
-SERIALPORT = None    #serial port data  
+SERIALPORT = None    #serial port identifier, use None to autodetect  
 BAUDRATE = 500000
 
 objRFE = RFExplorer.RFECommunicator()     #Initialize object and thread
diff --git a/RFExplorer/RFE6GEN_CalibrationData.py b/RFExplorer/RFE6GEN_CalibrationData.py
@@ -5,7 +5,7 @@
 
 #============================================================================
 #RF Explorer Python Libraries - A Spectrum Analyzer for everyone!
-#Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+#Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 #
 #This application is free software; you can redistribute it and/or
 #modify it under the terms of the GNU Lesser General Public
diff --git a/RFExplorer/RFEAmplitudeTableData.py b/RFExplorer/RFEAmplitudeTableData.py
@@ -5,7 +5,7 @@
 
 #============================================================================
 #RF Explorer Python Libraries - A Spectrum Analyzer for everyone!
-#Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+#Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 #
 #This application is free software; you can redistribute it and/or
 #modify it under the terms of the GNU Lesser General Public
diff --git a/RFExplorer/RFEConfiguration.py b/RFExplorer/RFEConfiguration.py
@@ -5,7 +5,7 @@
 
 #============================================================================
 #RF Explorer Python Libraries - A Spectrum Analyzer for everyone!
-#Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+#Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 #
 #This application is free software; you can redistribute it and/or
 #modify it under the terms of the GNU Lesser General Public
diff --git a/RFExplorer/RFESweepData.py b/RFExplorer/RFESweepData.py
@@ -5,7 +5,7 @@
 
 #============================================================================
 #RF Explorer Python Libraries - A Spectrum Analyzer for everyone!
-#Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+#Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 #
 #This application is free software; you can redistribute it and/or
 #modify it under the terms of the GNU Lesser General Public
diff --git a/RFExplorer/RFESweepDataCollection.py b/RFExplorer/RFESweepDataCollection.py
@@ -5,7 +5,7 @@
 
 #============================================================================
 #RF Explorer Python Libraries - A Spectrum Analyzer for everyone!
-#Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+#Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 #
 #This application is free software; you can redistribute it and/or
 #modify it under the terms of the GNU Lesser General Public
diff --git a/RFExplorer/RFE_Common.py b/RFExplorer/RFE_Common.py
@@ -5,7 +5,7 @@
 
 #============================================================================
 #RF Explorer Python Libraries - A Spectrum Analyzer for everyone!
-#Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+#Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 #
 #This application is free software; you can redistribute it and/or
 #modify it under the terms of the GNU Lesser General Public
diff --git a/RFExplorer/RFExplorer.py b/RFExplorer/RFExplorer.py
@@ -5,7 +5,7 @@
 
 #============================================================================
 #RF Explorer Python Libraries - A Spectrum Analyzer for everyone!
-#Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+#Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 #
 # Contributed by:
 # 
@@ -128,6 +128,7 @@ def DecorateSerialNumberRAWString(sRAWSerialNumber):
 g_arrModels[RFE_Common.eModel.MODEL_2400.value] = "2.4G"
 g_arrModels[RFE_Common.eModel.MODEL_WSUB3G.value] = "WSUB3G"
 g_arrModels[RFE_Common.eModel.MODEL_6G.value] = "6G"
+g_arrModels[RFE_Common.eModel.MODEL_WSUB1G_PLUS.value] = "WSUB1G_PLUS";
 g_arrModels[RFE_Common.eModel.MODEL_RFGEN.value] = "RFE6GEN"
 g_arrModels[RFE_Common.eModel.MODEL_NONE.value] = "NONE"
 
@@ -145,7 +146,7 @@ def GetModelEnumFromText(sText):
     """Returns model enumerator based on text provided
 
     Parameters:
-        sText -- One of "433M", "868M", "915M", "WSUB1G", "2.4G", "WSUB3G", "6G"
+        sText -- One of "433M", "868M", "915M", "WSUB1G", "2.4G", "WSUB3G", "6G", "WSUB1G_PLUS" or "RFE6GEN"
     Returns:
         RFE_Common.eModel Valid model enumerator or will set to MODEL_NONE if not found
 	"""
@@ -1488,7 +1489,7 @@ def SendCommand_SweepDataPoints(self, nDataPoints):
         Parameters:
             nDataPoints -- A value in the range of 16-4096, note a value multiple of 16 will be used, so any other number will be truncated to nearest 16 multiple
 		"""
-        self.SendCommand("CJ" + chr(int(nDataPoints / 16)))
+        self.SendCommand("CJ" + chr(int((nDataPoints - 16)/ 16)))
 
     def SendCommand(self, sCommand):
         """Format and send command - for instance to reboot just use "r", the '#' decorator and byte length char will be included within
diff --git a/RFExplorer/ReceiveSerialThread.py b/RFExplorer/ReceiveSerialThread.py
@@ -5,7 +5,7 @@
 
 #============================================================================
 #RF Explorer Python Libraries - A Spectrum Analyzer for everyone!
-#Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+#Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 #
 #This application is free software; you can redistribute it and/or
 #modify it under the terms of the GNU Lesser General Public
@@ -158,7 +158,7 @@ def ReceiveThreadfunc(self):
                                 nReceivedLength *= 16
                             elif (strReceived[1] == 'z'):
                                 nReceivedLength *= 256
-                                nReceivedLength += int(strReceived[3])
+                                nReceivedLength += ord(strReceived[3])
                                 nSizeChars+=1
                             if (self.m_objRFECommunicator.VerboseLevel > 9):
                                 print("Spectrum data: " + str(nReceivedLength) + " " + str(nLen))
diff --git a/RFExplorer/__init__.py b/RFExplorer/__init__.py
@@ -5,7 +5,7 @@
 
 #============================================================================
 #RF Explorer Python Libraries - A Spectrum Analyzer for everyone!
-#Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com
+#Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com
 #
 #This application is free software; you can redistribute it and/or
 #modify it under the terms of the GNU Lesser General Public

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`#============================================================================`
`7`	`7`	`#RF Explorer Python Libraries - A Spectrum Analyzer for everyone!`
`8`		`-#Copyright © 2010-17 Ariel Rocholl, www.rf-explorer.com`
	`8`	`+#Copyright © 2010-18 Ariel Rocholl, www.rf-explorer.com`
`9`	`9`	`#`
`10`	`10`	`#This application is free software; you can redistribute it and/or`
`11`	`11`	`#modify it under the terms of the GNU Lesser General Public`