RAPacker: data package can aso start with 0x81

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

diff --git a/src/RAFlasher.py b/src/RAFlasher.py
index d6f53d5..b77268e 100644 (file)
--- a/src/RAFlasher.py
+++ b/src/RAFlasher.py
@@ -1,6 +1,8 @@
 import os
 import math
+import time
 import argparse
+from tqdm import tqdm
 from RAConnect import *
 from RAPacker import *
 
@@ -12,6 +14,30 @@ def int_to_hex_list(num):
     hex_list = [f'0x{hex_string[c:c+2]}' for c in range(0, 8, 2)]
     return hex_list
 
+def inquire_connection(dev):
+    packed = pack_pkt(INQ_CMD, "")
+    dev.send_data(packed)
+    info = dev.recv_data(7)
+    #print(info)
+    if info == bytearray(b'\x00') or info == bytearray(b''):
+        return False
+    msg = unpack_pkt(info)
+    print("Connection already established")
+    #print(msg)
+    return True
+
+def get_area_info(dev):
+    for i in [0,1,2]:
+        print("===================")
+        packed = pack_pkt(ARE_CMD, [str(i)])
+        dev.send_data(packed)
+        info = dev.recv_data(23)
+        msg = unpack_pkt(info)
+        fmt = '>BIIII'
+        KOA, SAD, EAD, EAU, WAU = struct.unpack(fmt, bytes(int(x, 16) for x in msg))
+        print(f'Area {KOA} - {hex(SAD)}:{hex(EAD)}')
+        print(f'Erase {hex(EAU)} bytes - write {hex(WAU)} bytes')
+
 def get_dev_info(dev):
 
     packed = pack_pkt(SIG_CMD, "")
@@ -26,6 +52,9 @@ def get_dev_info(dev):
     print('====================')
     print(f'Serial interface speed: {SCI} Hz')
     print(f'Recommend max UART baud rate {RMB} bps')
+    print(f'User area in Code flash [{NOA & 0x1}|{NOA & 0x02 >> 1}]')
+    print(f'User area in Data flash [{NOA & 0x03 >> 2}]')
+    print(f'Config area [{NOA & 0x04 >> 3}]')
     if TYP == 0x02:
         print('RA MCU + RA2/RA4 Series')
     elif TYP == 0x03:
@@ -39,6 +68,46 @@ def get_dev_info(dev):
 def verify_img(dev, img, start_addr, end_addr):
     raise Exception("Not implemented")
 
+def read_img(dev, img, start_addr, end_addr):
+    
+    # calculate / check start and end address 
+    if start_addr == None or end_addr == None:
+        if start_addr == None:
+            start_addr = 0
+        # align start addr
+        if start_addr % SECTOR_SIZE:
+            raise ValueError(f"start addr not aligned on sector size {SECTOR_SIZE}")
+        blocks = (file_size + SECTOR_SIZE - 1) // SECTOR_SIZE
+        end_addr = blocks * SECTOR_SIZE + start_addr
+        print(end_addr)
+    
+    if (start_addr > 0xFF800): # for RA4 series
+        raise ValueError("start address value error")
+    if (end_addr <= start_addr or end_addr > 0xFF800):
+        raise ValueError("end address value error")
+    
+    # setup initial communication
+    SAD = int_to_hex_list(start_addr)
+    EAD = int_to_hex_list(end_addr)
+    packed = pack_pkt(REA_CMD, SAD + EAD)
+    dev.send_data(packed)
+
+    # calculate how many packets are have to be received
+    nr_packet = (end_addr - start_addr) // 1024 # TODO: set other than just 1024
+    print(f'Sending {nr_packet} packets to MCU')
+
+    with open('output.bin', 'wb') as f:
+        for i in tqdm(range(0, nr_packet+1), desc="Reading progess"):
+            ret = dev.recv_data(1024 + 6)
+            #print(f'Packet nr: {i}')
+            chunk = unpack_pkt(ret)
+            chunky = bytes(int(x, 16) for x in chunk)
+            f.write(chunky)
+            #print(ret)
+            packed = pack_pkt(REA_CMD, ['0x00'], ack=True)
+            dev.send_data(packed)
+
+
 def write_img(dev, img, start_addr, end_addr, verify=False):
 
     if os.path.exists(img):
@@ -115,9 +184,13 @@ def main():
         print('read command')
     elif args.command == "info":
         dev = RAConnect(vendor_id=0x045B, product_id=0x0261)
-        dev.establish_connection()
-        dev.confirm_connection()
+        status_con = inquire_connection(dev)
+        if not status_con:
+            #dev.establish_connection()
+            dev.confirm_connection()
         get_dev_info(dev)
+        get_area_info(dev)
+        read_img(dev, "save.bin", 0x0000, 0x3FFFF)
     else:
         parser.print_help()