zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge individual Battery.[ch] files into Platform.[ch] 

Small changes from review - keep headers sorted and keep local
variable declarations at the top of source files.
This commit is contained in:
Nathan Scott 2020-11-18 09:19:42 +11:00
parent ea9622b8c9
commit 0eb3c7589d
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BatteryMeter.c
View File

@ -11,9 +11,9 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
#include <math.h> #include <math.h>
#include "Platform.h"
#include "CRT.h" #include "CRT.h"
#include "Object.h" #include "Object.h"
#include "Platform.h"
#include "XUtils.h" #include "XUtils.h"

11
linux/Platform.c
View File

@ -102,6 +102,11 @@ const SignalItem Platform_signals[] = {
const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals); const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
static enum { BAT_PROC, BAT_SYS, BAT_ERR } Platform_Battery_method = BAT_PROC;
static time_t Platform_Battery_cacheTime;
static double Platform_Battery_cacheLevel = NAN;
static ACPresence Platform_Battery_cacheIsOnAC;
static Htop_Reaction Platform_actionSetIOPriority(State* st) { static Htop_Reaction Platform_actionSetIOPriority(State* st) {
Panel* panel = st->panel; Panel* panel = st->panel;
@ -832,12 +837,6 @@ static void Platform_Battery_getSysData(double* level, ACPresence* isOnAC) {
*level = totalFull > 0 ? ((double) totalRemain * 100.0) / (double) totalFull : NAN; *level = totalFull > 0 ? ((double) totalRemain * 100.0) / (double) totalFull : NAN;
} }
static enum { BAT_PROC, BAT_SYS, BAT_ERR } Platform_Battery_method = BAT_PROC;
static time_t Platform_Battery_cacheTime;
static double Platform_Battery_cacheLevel = NAN;
static ACPresence Platform_Battery_cacheIsOnAC;
void Platform_getBattery(double* level, ACPresence* isOnAC) { void Platform_getBattery(double* level, ACPresence* isOnAC) {
time_t now = time(NULL); time_t now = time(NULL);
// update battery reading is slow. Update it each 10 seconds only. // update battery reading is slow. Update it each 10 seconds only.