Changed ac_line_status to on_battery_power.

This commit is contained in:
Dion Ahmetaj 2017-02-07 10:55:49 -05:00
parent 23c73269ca
commit e4dfd2fb63
2 changed files with 6 additions and 6 deletions

View file

@ -575,7 +575,7 @@ namespace cryptonote
continue; // if interrupted because stop called, loop should end .. continue; // if interrupted because stop called, loop should end ..
} }
bool on_ac_power = ac_line_status(); bool on_ac_power = !on_battery_power();
if( m_is_background_mining_started ) if( m_is_background_mining_started )
{ {
@ -642,7 +642,7 @@ namespace cryptonote
uint64_t total_diff = (current_total_time - prev_total_time); uint64_t total_diff = (current_total_time - prev_total_time);
uint64_t idle_diff = (current_idle_time - prev_idle_time); uint64_t idle_diff = (current_idle_time - prev_idle_time);
uint8_t idle_percentage = get_percent_of_total(idle_diff, total_diff); uint8_t idle_percentage = get_percent_of_total(idle_diff, total_diff);
bool on_ac_power = ac_line_status();
MGINFO("idle percentage is " << unsigned(idle_percentage)); MGINFO("idle percentage is " << unsigned(idle_percentage));
if( idle_percentage >= get_idle_threshold() && on_ac_power ) if( idle_percentage >= get_idle_threshold() && on_ac_power )
{ {
@ -763,14 +763,14 @@ namespace cryptonote
return (uint8_t)( ceil( (other * 1.f / total * 1.f) * 100) ); return (uint8_t)( ceil( (other * 1.f / total * 1.f) * 100) );
} }
//----------------------------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------------------------
bool miner::ac_line_status() bool miner::on_battery_power()
{ {
#ifdef _WIN32 #ifdef _WIN32
SYSTEM_POWER_STATUS power_status; SYSTEM_POWER_STATUS power_status;
if ( GetSystemPowerStatus( &power_status ) != 0 ) if ( GetSystemPowerStatus( &power_status ) != 0 )
{ {
return power_status.ACLineStatus == 1; return power_status.ACLineStatus != 1;
} }
#elif defined(__linux__) #elif defined(__linux__)
@ -792,7 +792,7 @@ namespace cryptonote
return false; return false;
} }
return power_stream.get() == '1'; return power_stream.get() != '1';
#endif #endif

View file

@ -164,6 +164,6 @@ namespace cryptonote
static bool get_system_times(uint64_t& total_time, uint64_t& idle_time); static bool get_system_times(uint64_t& total_time, uint64_t& idle_time);
static bool get_process_time(uint64_t& total_time); static bool get_process_time(uint64_t& total_time);
static uint8_t get_percent_of_total(uint64_t some_time, uint64_t total_time); static uint8_t get_percent_of_total(uint64_t some_time, uint64_t total_time);
static bool ac_line_status(); // true = plugged in, else nope static bool on_battery_power();
}; };
} }