localhorst/reHDDPrinter
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Add Checkbox connection type (SATA/NVME) to label #22

Merged
localhorst merged 6 commits from feature/drive-type-marker into main 2025-12-06 23:38:30 +01:00
Conversation 0 Commits 6 Files Changed 6 +110 -349
9 changed files with 110 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit da4fbd09f0 - Show all commits

1
dummy_receiver.py
View File

@ -39,6 +39,7 @@ try:
driveData.add('utf-8', 'driveModelFamiliy', length=str_buffer_size) driveData.add('utf-8', 'driveModelFamiliy', length=str_buffer_size)
driveData.add('utf-8', 'driveModelModel', 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', 'driveSerialnumber', length=str_buffer_size)
#driveData.add('utf-8', 'driveConnectionType', length=str_buffer_size)
driveData.add('utf-8', 'driveReHddVersion', length=str_buffer_size) driveData.add('utf-8', 'driveReHddVersion', length=str_buffer_size)
# Dictionary representation # Dictionary representation

4
reHDDPrinter.py
View File

@ -46,6 +46,7 @@ class TDriveData(ctypes.Structure):
("caDriveModelFamily", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveModelFamily", ctypes.c_char * STR_BUFFER_SIZE),
("caDriveModelName", ctypes.c_char * STR_BUFFER_SIZE), ("caDriveModelName", ctypes.c_char * STR_BUFFER_SIZE),
("caDriveSerialnumber", 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), ("caDriveReHddVersion", ctypes.c_char * STR_BUFFER_SIZE),
] ]
@ -101,6 +102,7 @@ def create_drive_objects(drive_info):
modelname=drive_info["driveModelName"], modelname=drive_info["driveModelName"],
capacity=int(drive_info["driveCapacity"]), capacity=int(drive_info["driveCapacity"]),
serialnumber=drive_info["driveSerialnumber"], serialnumber=drive_info["driveSerialnumber"],
drive_connection_type=drive_info["driveConnectionType"],
power_on_hours=int(drive_info["driveHours"]), power_on_hours=int(drive_info["driveHours"]),
power_cycle=int(drive_info["driveCycles"]), power_cycle=int(drive_info["driveCycles"]),
smart_error_count=int(drive_info["driveErrors"]), smart_error_count=int(drive_info["driveErrors"]),
@ -132,6 +134,7 @@ def worker(queue_id, test_mode=False):
"driveModelFamily": "modelFamily", "driveModelFamily": "modelFamily",
"driveModelName": "modelName", "driveModelName": "modelName",
"driveSerialnumber": "serial", "driveSerialnumber": "serial",
"driveConnectionType": "sata",
"driveReHddVersion": "V1.1.2", "driveReHddVersion": "V1.1.2",
} }
else: else:
@ -165,6 +168,7 @@ def worker(queue_id, test_mode=False):
"driveModelFamily": d.caDriveModelFamily.decode().strip("\x00"), "driveModelFamily": d.caDriveModelFamily.decode().strip("\x00"),
"driveModelName": d.caDriveModelName.decode().strip("\x00"), "driveModelName": d.caDriveModelName.decode().strip("\x00"),
"driveSerialnumber": d.caDriveSerialnumber.decode().strip("\x00"), "driveSerialnumber": d.caDriveSerialnumber.decode().strip("\x00"),
"driveConnectionType": d.caDriveConnectionType.decode().strip("\x00"),
"driveReHddVersion": d.caDriveReHddVersion.decode().strip("\x00"), "driveReHddVersion": d.caDriveReHddVersion.decode().strip("\x00"),
} }
time.sleep(3) time.sleep(3)