Skip to content

Commit

Permalink
Update battery statistics on the analysis page
Browse files Browse the repository at this point in the history
  • Loading branch information
@rafa0128
rafa0128 committed Aug 17, 2023
1 parent b2d9ea5 commit 90d77ae
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions solox/public/common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -545,10 +545,10 @@ def _setAndroidPerfs(self, scene):
cpuSystemRate = f'{round(sum(cpuSystemData) / len(cpuSystemData), 2)}%'

batteryLevelData = self.readLog(scene=scene, filename=f'battery_level.log')[1]
batteryLevel = f'{round(sum(batteryLevelData) / len(batteryLevelData), 2)}%'
batteryLevel = f'{batteryLevelData[-1]}%'

batteryTemlData = self.readLog(scene=scene, filename=f'battery_tem.log')[1]
batteryTeml = f'{round(sum(batteryTemlData) / len(batteryTemlData), 2)}°C'
batteryTeml = f'{batteryTemlData[-1]}°C'

totalPassData = self.readLog(scene=scene, filename=f'mem_total.log')[1]
totalPassAvg = f'{round(sum(totalPassData) / len(totalPassData), 2)}MB'
Expand Down Expand Up @@ -609,16 +609,16 @@ def _setiOSPerfs(self, scene):
flowRecv = f'{round(float(sum(flowRecvData) / 1024), 2)}MB'

batteryTemlData = self.readLog(scene=scene, filename='battery_tem.log')[1]
batteryTeml = round(sum(batteryTemlData) / len(batteryTemlData), 2)
batteryTeml = batteryTemlData[-1]

batteryCurrentData = self.readLog(scene=scene, filename='battery_current.log')[1]
batteryCurrent = round(sum(batteryCurrentData) / len(batteryCurrentData), 2)
batteryCurrent = sum(batteryCurrentData)

batteryVoltageData = self.readLog(scene=scene, filename='battery_voltage.log')[1]
batteryVoltage = round(sum(batteryVoltageData) / len(batteryVoltageData), 2)
batteryVoltage = sum(batteryVoltageData)

batteryPowerData = self.readLog(scene=scene, filename='battery_power.log')[1]
batteryPower = round(sum(batteryPowerData) / len(batteryPowerData), 2)
batteryPower = sum(batteryPowerData)

gpuData = self.readLog(scene=scene, filename='gpu.log')[1]
gpu = round(sum(gpuData) / len(gpuData), 2)
Expand Down
12 changes: 6 additions & 6 deletions solox/templates/analysis.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
Level
</div>
<div class="text-muted">
Avg：{{ apm_data.batteryLevel }}
Final: {{ apm_data.batteryLevel }}
</div>
</div>
</div>
Expand All @@ -240,7 +240,7 @@
Temperature
</div>
<div class="text-muted">
Avg：{{ apm_data.batteryTeml }}
Final: {{ apm_data.batteryTeml }}
</div>
</div>
</div>
Expand All @@ -262,7 +262,7 @@
Temperature
</div>
<div class="text-muted">
Avg：{{ apm_data.batteryTeml }}
Final: {{ apm_data.batteryTeml }}
</div>
</div>
</div>
Expand All @@ -283,7 +283,7 @@
Current
</div>
<div class="text-muted">
Avg：{{ apm_data.batteryCurrent }}
All: {{ apm_data.batteryCurrent }}
</div>
</div>
</div>
Expand All @@ -304,7 +304,7 @@
Voltage
</div>
<div class="text-muted">
Avg：{{ apm_data.batteryVoltage }}
All: {{ apm_data.batteryVoltage }}
</div>
</div>
</div>
Expand All @@ -325,7 +325,7 @@
Power
</div>
<div class="text-muted">
Avg：{{ apm_data.batteryPower }}
All: {{ apm_data.batteryPower }}
</div>
</div>
</div>
Expand Down

0 comments on commit 90d77ae

Please sign in to comment.