commit 10/31/2015

lib/sim900/gsm.py

@@ -33,7 +33,6 @@ import time
 import serial
 import logging
 from lib.sim900.simshared import *
-import struct
 
 class GsmSpecialCharacters:
     ctrlz = 26        #//Ascii character for ctr+z. End of a SMS.
@@ -133,7 +132,7 @@ class SimGsmSerialPortHandler(AminisLastErrorHolderWithLogging):
         """
         return self.print(commandLine, encoding)
 
-    def printLn(self, commandString, bytes=None, encoding = "ascii"):
+    def printLn(self, commandString, encoding = "ascii"):
         """
         Sends string data and CR/LF in the end to the SIM module
 
@@ -141,16 +140,33 @@ class SimGsmSerialPortHandler(AminisLastErrorHolderWithLogging):
         :param encoding: before sending string it will be converted to the bytearray with this encoding
         :return: True if data sent, otherwise returns False
         """
-        if bytes is not None:
-            data = bytearray(commandString, encoding) + bytes + bytearray([GsmSpecialCharacters.cr, GsmSpecialCharacters.lf])
+        if not isinstance(commandString, bytes):
+            data = bytearray(commandString, encoding) + bytearray([GsmSpecialCharacters.cr, GsmSpecialCharacters.lf])
         else:
-            data= bytearray(commandString, encoding) + bytearray([GsmSpecialCharacters.cr, GsmSpecialCharacters.lf])
-
-        # print("Print Line data: {}".format(data))
-
+            data = commandString + bytearray([GsmSpecialCharacters.cr, GsmSpecialCharacters.lf])
         return self.__sendRawBytes(data)
 
-    def simpleWriteLn(self, commandLine, bytes=None, encoding = "ascii"):
+    def simpleWriteLns(self, commandLines, encoding = "ascii"):
+        for i, l in enumerate(commandLines):
+
+            if i < len(commandLines)-1:
+                if not isinstance(l, bytes):
+                    data = bytearray(l, encoding)
+                else:
+                    data = l
+            else:
+                if not isinstance(l, bytes):
+                    data = bytearray(l, encoding) + bytearray([GsmSpecialCharacters.cr, GsmSpecialCharacters.lf])
+                else:
+                    data = l + bytearray([GsmSpecialCharacters.cr, GsmSpecialCharacters.lf])
+
+            r = self.__sendRawBytes(data)
+            if r is False:
+                return r
+
+        return r
+
+    def simpleWriteLn(self, commandLine, encoding = "ascii"):
         """
         Just alias for printLn() method
 
@@ -159,7 +175,7 @@ class SimGsmSerialPortHandler(AminisLastErrorHolderWithLogging):
         :return: True if data sent, otherwise returns False
         """
 
-        return self.printLn(commandLine, encoding=encoding, bytes=bytes)
+        return self.printLn(commandLine, encoding)
 
     def flushInput(self):
         """