Bump to 3.60 pre-release

Author: Bjoern Kerler

README.md

@@ -65,6 +65,17 @@ pip3 install -r requirements.txt
 - Test on device connect using "UsbDkController -n" if you see a device with pid 0x9008
 - Works fine under Windows 10 and 11 :D
 
+#### Using serial port instead of usb
+With Port autodetection
+```bash
+edl --serial
+```
+
+or Port name
+```bash
+edl --portname \\.\COM1
+```
+
 ------------------------------------------------------------------------------------------------------------------------------------
 ## Get Loaders
 You should get these automatically if you do a ``` git submodule update --init --recursive ```

edl

@@ -141,10 +141,10 @@
     0x13F0E1: "bitra_SDM", # soc_vers 0x6012 SDM690
     0x1410E1: "bitra_SDA",
     0x1590E1: "cedros", # soc_vers 0x6017
-    0x1360E1: "kamorta", # soc_vers 0x9002 SnapDragon 460 SM4350, bengal
-    0x1370E1: "kamorta_P", # soc_vers 0x9002 SnapDragon 460 SM4350, bengal
-    0x1730E1: "kamorta_IoT_modem", # soc_vers 0x9002 SnapDragon 460 SM4350, bengal
-    0x1740E1: "kamorta_IoT_APQ", # soc_vers 0x9002 SnapDragon 460 SM4350, bengal
+    0x1360E1: "kamorta", # soc_vers 0x9002 SnapDragon 460 SM4350
+    0x1370E1: "kamorta_P", # soc_vers 0x9002 SnapDragon 460 SM4350
+    0x1730E1: "kamorta_IoT_modem", # soc_vers 0x9002 SnapDragon 460 SM4350
+    0x1740E1: "kamorta_IoT_APQ", # soc_vers 0x9002 SnapDragon 460 SM4350
     0x1350E1: "lahaina", # soc_vers 0x600F sm8350, SDM875
     0x1420E1: "lahaina_premier",
     0x14A0E1: "SC8280X", # soc_vers 0x6014, makena
@@ -189,7 +189,7 @@
     0x0B80E1: "sc8180x", # Snapdragon 8CX, soc_vers 0x6006
     0x1560E1: "SM8250", # HDK 8250
     0x1510E1: "SA2150p",
-    0x14D0E1: "SDM662", # sm6115
+    0x14D0E1: "SDM662", # sm6115, bengal
     0x18A0E1: "fraser", #soc_vers 0x600D
     0x1920E1: "sm7325", #soc_vers 0x6018
     0x1930E1: "sc7280", #soc_vers 0x6018

edlclient/Config/qualcomm_config.py

@@ -23,15 +23,17 @@
     xiaomi = None
     pass
 
+
 class modules(metaclass=LogBase):
     def __init__(self, fh, serial, supported_functions, loglevel, devicemodel, args):
         self.fh = fh
         self.args = args
         self.serial = serial
         self.error = self.__logger.error
+        self.info = self.__logger.info
         self.supported_functions = supported_functions
         self.__logger.setLevel(loglevel)
-        if loglevel==logging.DEBUG:
+        if loglevel == logging.DEBUG:
             logfilename = "log.txt"
             fh = logging.FileHandler(logfilename)
             self.__logger.addHandler(fh)
@@ -45,10 +47,10 @@ def __init__(self, fh, serial, supported_functions, loglevel, devicemodel, args)
         self.ops = None
         try:
             self.ops = oneplus(fh=self.fh, projid=self.devicemodel, serial=self.serial,
-                               supported_functions=self.supported_functions, args=self.args,loglevel=loglevel)
+                               supported_functions=self.supported_functions, args=self.args, loglevel=loglevel)
         except Exception as e:
             pass
-        self.xiaomi=None
+        self.xiaomi = None
         try:
             self.xiaomi = xiaomi(fh=self.fh)
         except Exception as e:
@@ -84,7 +86,7 @@ def run(self, command, args):
                     options[option[0]] = option[1]
             else:
                 options[args[i]] = True
-        if command=="":
+        if command == "":
             print("Valid commands are:\noemunlock\n")
             return False
         if self.generic is not None and command == "oemunlock":
@@ -96,4 +98,3 @@ def run(self, command, args):
                 self.error("Unknown mode given. Available are: enable, disable.")
                 return False
             return self.generic.oem_unlock(enable)
-        return False

edlclient/Library/Modules/init.py

@@ -143,7 +143,7 @@ def __init__(self, fh, projid="18825", serial=123456, ATOBuild=0, Flash_Mode=0,
                 lun = res[1]
                 rpartition = res[2]
                 data = self.fh.cmd_read_buffer(lun, rpartition.sector, 1, False)
-                value = data[24:24 + 5]
+                value = data.data[24:24 + 5]
                 try:
                     test = int(value.decode('utf-8'))
                     self.info("Oneplus protection with prjid %d detected" % test)
@@ -155,7 +155,7 @@ def __init__(self, fh, projid="18825", serial=123456, ATOBuild=0, Flash_Mode=0,
             logfilename = "log.txt"
             filehandler = logging.FileHandler(logfilename)
             self.__logger.addHandler(filehandler)
-            self.ops_parm = None
+        self.ops_parm = None
         self.ops = self.convert_projid(fh, projid, serial)
 
     def getprodkey(self, projid):
@@ -227,9 +227,6 @@ def demacia(self):
         if self.ops.demacia():
             return self.ops.demacia()
 
-    def enable_ops(self, data, enable, projid, serial):
-        return None
-
     def addpatch(self):
         if "setprojmodel" in self.supported_functions or "setswprojmodel" in self.supported_functions:
             pk, token = self.ops.generatetoken(True)