move hass config to main
This commit is contained in:
20
src/app.cpp
20
src/app.cpp
@@ -18,13 +18,17 @@
|
||||
|
||||
void Application::hassThread(const std::stop_token& st) {
|
||||
applog(LOG::START, "Thread started");
|
||||
HomeAssistant pc_power("home.drath.win", "sensor.gniazdko_komputer_moc");
|
||||
HomeAssistant::Config config;
|
||||
config.address = m_config.hass_url;
|
||||
config.entity = m_config.hass_entity;
|
||||
config.token = m_config.hass_token;
|
||||
HomeAssistant pc_power(config);
|
||||
|
||||
pc_power.connect();
|
||||
while (!st.stop_requested()) {
|
||||
pc_power.service();
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(m_sensors.mtx);
|
||||
std::lock_guard lock(m_control.sensors);
|
||||
m_sensors.hass_state = pc_power.state;
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(10));
|
||||
@@ -41,10 +45,10 @@ void Application::sensorsThread(const std::stop_token& st) {
|
||||
while (!st.stop_requested()) {
|
||||
auto start = std::chrono::steady_clock::now();
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(m_sensors.mtx);
|
||||
std::lock_guard lock(m_control.sensors);
|
||||
|
||||
sys::getTimeDate(&m_sensors.td);
|
||||
getloadavg(m_sensors.avg, 3);
|
||||
getloadavg(m_sensors.loadavg, 3);
|
||||
sys::getRam(&m_sensors.ram);
|
||||
sys::getDisk(&m_sensors.home);
|
||||
sys::getNetwork(&m_sensors.net, m_config.sys_ifname);
|
||||
@@ -85,7 +89,7 @@ void Application::displayThread(const std::stop_token& st) {
|
||||
m_control.display.try_acquire_for(std::chrono::milliseconds(static_cast<int>(m_config.lcd_interval_ms * 1.25))); // holds the loop until sensor data is ready, max 1.25x of the loop time
|
||||
if (st.stop_requested()) break; // needed, otherwise it wont quit correctly
|
||||
{
|
||||
std::lock_guard<std::mutex> lock(m_sensors.mtx);
|
||||
std::lock_guard lock(m_control.sensors);
|
||||
|
||||
// prepare some tricky sensors
|
||||
std::string gpu_temps = std::to_string(m_sensors.gpu.temp_edge);
|
||||
@@ -102,9 +106,9 @@ void Application::displayThread(const std::stop_token& st) {
|
||||
|
||||
// write to display buffer
|
||||
lcd.writeBuf(0, 0, utils::pad(m_sensors.td.date, 11, utils::just::left) + " " + m_sensors.td.time + lcd.bar(7, m_sensors.gpu.usage_core / 100.0));
|
||||
lcd.writeBuf(0, 26, utils::pNum(m_sensors.avg[0], m_sensors.avg[0] > 10 ? 1 : 2));
|
||||
lcd.writeBuf(0, 31, utils::pNum(m_sensors.avg[1], m_sensors.avg[1] > 10 ? 1 : 2));
|
||||
lcd.writeBuf(0, 36, utils::pNum(m_sensors.avg[2], m_sensors.avg[2] > 10 ? 1 : 2));
|
||||
lcd.writeBuf(0, 26, utils::pNum(m_sensors.loadavg[0], m_sensors.loadavg[0] > 10 ? 1 : 2));
|
||||
lcd.writeBuf(0, 31, utils::pNum(m_sensors.loadavg[1], m_sensors.loadavg[1] > 10 ? 1 : 2));
|
||||
lcd.writeBuf(0, 36, utils::pNum(m_sensors.loadavg[2], m_sensors.loadavg[2] > 10 ? 1 : 2));
|
||||
|
||||
lcd.writeBuf(1, 0, utils::pad(std::to_string(m_sensors.cpu.tctl) + "/" + std::to_string(m_sensors.cpu.tccd1) + LCDDisplay::cc(0), 8, utils::just::left));
|
||||
lcd.writeBuf(1, 7, utils::pad(utils::pBytes(m_sensors.ram.used, true), 6, utils::just::left));
|
||||
|
||||
Reference in New Issue
Block a user