shinys000114/odroid-power-mate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logger: align output format with main.js and csv_2_plot expectations

Browse Source 
Signed-off-by: YoungSoo Shin <shinys000114@gmail.com>
This commit is contained in:
YoungSoo Shin
2025-12-09 16:31:30 +09:00
parent 649f05d330
commit ce40257fea
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
example/logger/logger.py
View File

@@ -68,7 +68,7 @@ class OdroidPowerLogger:
csv_file = open(self.output_file, 'w', newline='', encoding='utf-8') csv_file = open(self.output_file, 'w', newline='', encoding='utf-8')
csv_writer = csv.writer(csv_file) csv_writer = csv.writer(csv_file)
# Write header # Write header - matches main.js and csv_2_plot.py expectations
header = [ header = [
'timestamp', 'uptime_ms', 'timestamp', 'uptime_ms',
'vin_voltage', 'vin_current', 'vin_power', 'vin_voltage', 'vin_current', 'vin_power',
@@ -97,24 +97,27 @@ class OdroidPowerLogger:
# Process only if the payload type is 'sensor_data' # Process only if the payload type is 'sensor_data'
if status_message.WhichOneof('payload') == 'sensor_data': if status_message.WhichOneof('payload') == 'sensor_data':
sensor_data = status_message.sensor_data sensor_data = status_message.sensor_data
# Format timestamp to ISO format with 'Z' for UTC, matching main.js
ts_dt = datetime.fromtimestamp(sensor_data.timestamp_ms / 1000) ts_dt = datetime.fromtimestamp(sensor_data.timestamp_ms / 1000)
ts_str = ts_dt.strftime('%Y-%m-%d %H:%M:%S') ts_iso = ts_dt.isoformat(timespec='milliseconds') + 'Z'
print(f"--- {ts_str} (Uptime: {sensor_data.uptime_ms / 1000}s) ---") # Print data for console output (can be adjusted if needed)
print(f"--- {ts_iso} (Uptime: {sensor_data.uptime_ms / 1000:.3f}s) ---")
# Print data for each channel
for name, channel in [('VIN', sensor_data.vin), ('MAIN', sensor_data.main), for name, channel in [('VIN', sensor_data.vin), ('MAIN', sensor_data.main),
('USB', sensor_data.usb)]: ('USB', sensor_data.usb)]:
print( print(
f" {name:<4}: {channel.voltage:5.2f} V | {channel.current:5.3f} A | {channel.power:5.2f} W") f" {name:<4}: {channel.voltage:.3f} V | {channel.current:.3f} A | {channel.power:.3f} W")
# Write to CSV if enabled # Write to CSV if enabled
if csv_writer: if csv_writer:
# Format numerical values to 3 decimal places, matching main.js
row = [ row = [
ts_dt.isoformat(), sensor_data.uptime_ms, ts_iso,
sensor_data.vin.voltage, sensor_data.vin.current, sensor_data.vin.power, sensor_data.uptime_ms,
sensor_data.main.voltage, sensor_data.main.current, sensor_data.main.power, f"{sensor_data.vin.voltage:.3f}", f"{sensor_data.vin.current:.3f}", f"{sensor_data.vin.power:.3f}",
sensor_data.usb.voltage, sensor_data.usb.current, sensor_data.usb.power f"{sensor_data.main.voltage:.3f}", f"{sensor_data.main.current:.3f}", f"{sensor_data.main.power:.3f}",
f"{sensor_data.usb.voltage:.3f}", f"{sensor_data.usb.current:.3f}", f"{sensor_data.usb.power:.3f}"
] ]
csv_writer.writerow(row) csv_writer.writerow(row)