2 Commits

Author SHA1 Message Date
0f91960ef9 Adapt version 2022-10-06 10:47:55 +02:00
d9192f10be Add SIGTERM handling, adjust limit finding step 2022-10-06 10:39:43 +02:00
4 changed files with 13 additions and 6 deletions

View File

@@ -1,5 +1,5 @@
pkgname=fantasize pkgname=fantasize
pkgver=0.1.4 pkgver=0.1.5
pkgrel=1 pkgrel=1
pkgdesc='C++ fan control for Linux' pkgdesc='C++ fan control for Linux'
url='https://github.com/Tabascl/fantasize.git' url='https://github.com/Tabascl/fantasize.git'

View File

@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
project(fantasize VERSION 0.1.4) project(fantasize VERSION 0.1.5)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

View File

@@ -8,6 +8,7 @@
#include <fan/HwmonFan.h> #include <fan/HwmonFan.h>
#define TIMEOUT 10 #define TIMEOUT 10
#define STEP 2
using namespace std; using namespace std;
@@ -43,12 +44,12 @@ void HwmonFan::FindPWMLimits() {
mMinPWM = 0; mMinPWM = 0;
mStartPWM = 0; mStartPWM = 0;
for (int curPWM = 100; curPWM > 0; curPWM -= 5) { for (int curPWM = 100; curPWM > 0; curPWM -= STEP) {
PWM(curPWM); PWM(curPWM);
this_thread::sleep_for(chrono::seconds(TIMEOUT)); this_thread::sleep_for(chrono::seconds(TIMEOUT));
if (RPM() <= 0) { if (RPM() <= 0) {
minPWM = curPWM + 5; minPWM = curPWM + STEP;
break; break;
} }
} }
@@ -62,7 +63,7 @@ void HwmonFan::FindPWMLimits() {
int startPWM = 0; int startPWM = 0;
cout << "Looking for start PWM!" << endl; cout << "Looking for start PWM!" << endl;
for (int curPWM = minPWM - 5; curPWM < 100; curPWM += 5) { for (int curPWM = minPWM - STEP; curPWM < 100; curPWM += STEP) {
PWM(curPWM); PWM(curPWM);
this_thread::sleep_for(chrono::seconds(TIMEOUT)); this_thread::sleep_for(chrono::seconds(TIMEOUT));

View File

@@ -1,4 +1,3 @@
#include <boost/log/expressions/formatters/named_scope.hpp>
#include <csignal> #include <csignal>
#include <iostream> #include <iostream>
@@ -6,6 +5,7 @@
#include <boost/log/attributes/named_scope.hpp> #include <boost/log/attributes/named_scope.hpp>
#include <boost/log/core.hpp> #include <boost/log/core.hpp>
#include <boost/log/expressions.hpp> #include <boost/log/expressions.hpp>
#include <boost/log/expressions/formatters/named_scope.hpp>
#include <boost/log/expressions/message.hpp> #include <boost/log/expressions/message.hpp>
#include <boost/log/support/date_time.hpp> #include <boost/log/support/date_time.hpp>
#include <boost/log/trivial.hpp> #include <boost/log/trivial.hpp>
@@ -20,6 +20,8 @@
#include <App.h> #include <App.h>
#define PROJECT_VERSION "v0.1.5"
namespace po = boost::program_options; namespace po = boost::program_options;
namespace logging = boost::log; namespace logging = boost::log;
@@ -59,7 +61,11 @@ void InitLogging(bool verbose) {
} }
int main(int argc, char **argv) { int main(int argc, char **argv) {
BOOST_LOG_FUNCTION()
BOOST_LOG_TRIVIAL(info) << "Version: " << PROJECT_VERSION;
signal(SIGINT, signal_handler); signal(SIGINT, signal_handler);
signal(SIGTERM, signal_handler);
po::options_description desc("Allowed options"); po::options_description desc("Allowed options");
desc.add_options()("help,h", "produce help message")( desc.add_options()("help,h", "produce help message")(