RADevice.py: deleted, moved logic to RAConnect class

[renesas-ra-flasher] / src / RAConnect.py

diff --git a/src/RAConnect.py b/src/RAConnect.py
index 77bb970..d6d454a 100644 (file)
--- a/src/RAConnect.py
+++ b/src/RAConnect.py
@@ -2,6 +2,7 @@ import sys
 import time
 import usb.core
 import usb.util
+from RAPacker import *
 
 MAX_TRANSFER_SIZE = 2048 + 6 # include header and footer
 
@@ -16,7 +17,13 @@ class RAConnect:
         self.dev = None
         self.rx_ep = None
         self.tx_ep = None
+        self.chip_layout = []
+        self.sel_area = 0 # default to Area 0
+
         self.find_device()
+        status_conn = self.inquire_connection()
+        if not status_conn:
+            self.confirm_connection()
 
     def find_device(self):
         self.dev = usb.core.find(idVendor=self.vendor_id, idProduct=self.product_id)
@@ -25,7 +32,8 @@ class RAConnect:
 
         for config in self.dev:
             intf = config[(1,0)]
-            print(f'Found usb device {self.vendor_id}:{self.product_id}')
+            product_name = usb.util.get_string(self.dev, self.dev.iProduct)
+            print(f'Found {product_name} ({self.vendor_id}:{self.product_id})')
             if self.dev.is_kernel_driver_active(intf.bInterfaceNumber):
                 print("Found kernel driver, detaching ... ")
                 self.dev.detach_kernel_driver(intf.bInterfaceNumber)
@@ -37,19 +45,18 @@ class RAConnect:
                         self.tx_ep = ep
             return True
 
-        raise ValueError("Device does not have a serial interface")
+        raise ValueError("Device does not have a CDC interface")
 
-    def establish_connection(self):
-        for i in range(self.max_tries):
-            try:
-                self.tx_ep.write(bytes([0x00]), self.timeout_ms)
-                ret = self.rx_ep.read(1, self.timeout_ms)
-                if ret[0] == 0x00:
-                    print("Reply ACK received (0x00)")
-                    return True
-            except usb.core.USBError as e:
-                print(f"Timeout: retry #{i}", e)
-        return False
+
+    def inquire_connection(self):
+        packed = pack_pkt(INQ_CMD, "")
+        self.send_data(packed)
+        info = self.recv_data(7)
+        if info == bytearray(b'\x00') or info == bytearray(b''):
+            return False
+        msg = unpack_pkt(info)
+        #print("Connection already established")
+        return True
 
     def confirm_connection(self):
         for i in range(self.max_tries):
@@ -66,6 +73,11 @@ class RAConnect:
     def authenticate_connection(self):
         raise Exception("Not implemented")
 
+    def set_chip_layout(self, cfg):
+        if cfg == None:
+            raise ValueError("Could net get chip layout")
+        self.chip_layout = cfg
+
     def send_data(self, packed_data):
         if (self.tx_ep == None):
             return False
@@ -76,7 +88,7 @@ class RAConnect:
             return False
         return True
 
-    def recv_data(self, exp_len):
+    def recv_data(self, exp_len, timeout=100):
         msg = bytearray(b'')
         if (exp_len > MAX_TRANSFER_SIZE):
             raise ValueError(f"length package {exp_len} over max transfer size")
@@ -85,7 +97,7 @@ class RAConnect:
         try:
             received = 0
             while received != exp_len:
-                buf = self.rx_ep.read(exp_len, self.timeout_ms)
+                buf = self.rx_ep.read(exp_len, timeout)
                 msg += buf
                 received += len(buf)
                 if received == exp_len: