diff --git a/dummy_receiver.py b/dummy_receiver.py index bfcd21d..0a00581 100644 --- a/dummy_receiver.py +++ b/dummy_receiver.py @@ -39,6 +39,7 @@ try: driveData.add('utf-8', 'driveModelFamiliy', length=str_buffer_size) driveData.add('utf-8', 'driveModelModel', length=str_buffer_size) driveData.add('utf-8', 'driveSerialnumber', length=str_buffer_size) + #driveData.add('utf-8', 'driveConnectionType', length=str_buffer_size) driveData.add('utf-8', 'driveReHddVersion', length=str_buffer_size) # Dictionary representation diff --git a/reHDDPrinter.py b/reHDDPrinter.py index d9f18c9..e80582a 100644 --- a/reHDDPrinter.py +++ b/reHDDPrinter.py @@ -46,6 +46,7 @@ class TDriveData(ctypes.Structure): ("caDriveModelFamily", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveModelName", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveSerialnumber", ctypes.c_char * STR_BUFFER_SIZE), + ("caDriveConnectionType", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveReHddVersion", ctypes.c_char * STR_BUFFER_SIZE), ] @@ -101,6 +102,7 @@ def create_drive_objects(drive_info): modelname=drive_info["driveModelName"], capacity=int(drive_info["driveCapacity"]), serialnumber=drive_info["driveSerialnumber"], + drive_connection_type=drive_info["driveConnectionType"], power_on_hours=int(drive_info["driveHours"]), power_cycle=int(drive_info["driveCycles"]), smart_error_count=int(drive_info["driveErrors"]), @@ -132,6 +134,7 @@ def worker(queue_id, test_mode=False): "driveModelFamily": "modelFamily", "driveModelName": "modelName", "driveSerialnumber": "serial", + "driveConnectionType": "sata", "driveReHddVersion": "V1.1.2", } else: @@ -165,6 +168,7 @@ def worker(queue_id, test_mode=False): "driveModelFamily": d.caDriveModelFamily.decode().strip("\x00"), "driveModelName": d.caDriveModelName.decode().strip("\x00"), "driveSerialnumber": d.caDriveSerialnumber.decode().strip("\x00"), + "driveConnectionType": d.caDriveConnectionType.decode().strip("\x00"), "driveReHddVersion": d.caDriveReHddVersion.decode().strip("\x00"), } time.sleep(3)