Jan/Adalm1000_Battery_SMU
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert 165e27204b80d6368b69532100a7487eb48c853c

Browse Source 
revert MainCode/adalm1000_logger.py aktualisiert

Charge Time handeling geändert (ChatGPT)
This commit is contained in:
Jan 2025-05-23 20:26:55 +02:00
parent 165e27204b
commit a9a871bff5
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MainCode/adalm1000_logger.py
View File

@ -506,10 +506,8 @@ class BatteryTester:
time_elapsed = time.time() - self.last_update_time time_elapsed = time.time() - self.last_update_time
# Update charge capacity # Update charge capacity
now = time.time() self.charge_capacity.set(self.charge_capacity.get() + measured_current * time_elapsed / 3600)
delta_t = now - self.last_update_time self.last_update_time = time.time()
self.last_update_time = now
self.charge_capacity.set(self.charge_capacity.get() + measured_current * delta_t / 3600)
self.status_var.set( self.status_var.set(
f"Charging: {current_voltage:.3f}V / {target_voltage}V | " f"Charging: {current_voltage:.3f}V / {target_voltage}V | "
@ -564,10 +562,8 @@ class BatteryTester:
current_current = abs(self.current_data[-1]) current_current = abs(self.current_data[-1])
# Calculate discharged capacity # Calculate discharged capacity
now = time.time() self.capacity_ah.set(self.capacity_ah.get() + current_current * (time.time() - self.last_update_time) / 3600)
delta_t = now - self.last_update_time self.last_update_time = time.time()
self.last_update_time = now
self.charge_ah.set(self.charge_ah.get() + current_current * delta_t / 3600)
self.status_var.set( self.status_var.set(
f"Discharging: {current_voltage:.3f}V / {self.discharge_cutoff.get()}V | " f"Discharging: {current_voltage:.3f}V / {self.discharge_cutoff.get()}V | "