eneuber/paramod-rust
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: eneuber:84eb4b2365911ec1ac6935474f844b19e85ebb36
Branches Tags
eneuber:master
..
compare: eneuber:3fb6051e4ae1828a7839c8dffb53814ddef09499
Branches Tags
eneuber:master

No commits in common. "84eb4b2365911ec1ac6935474f844b19e85ebb36" and "3fb6051e4ae1828a7839c8dffb53814ddef09499" have entirely different histories.
84eb4b2365 ... 3fb6051e4a

6 changed files with 87 additions and 116 deletions
Show Stats Expand all files Collapse all files

1
paramod.yaml
View File

@ -1,6 +1,5 @@
default:
loglevel: "DEBUG"
darkmode: true
mqtt:
broker: "192.168.178.2"

29
src/config.rs
View File

@ -1,21 +1,6 @@
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct DefaultConfig {
pub loglevel: Option<String>,
pub darkmode: Option<bool>,
}
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct ModbusConfig {
pub host: String,
pub port: u16,
pub max_coils_addr: Option<u16>,
pub max_input_addr: Option<u16>,
pub max_holding_addr: Option<u16>,
}
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct MqttConfig {
pub broker: String,
@ -45,6 +30,20 @@ pub struct ModbusRegisterConfig {
pub comment: Option<String>,
}
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct ModbusConfig {
pub host: String,
pub port: u16,
pub max_coils_addr: Option<u16>,
pub max_input_addr: Option<u16>,
pub max_holding_addr: Option<u16>,
}
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct DefaultConfig {
pub loglevel: Option<String>,
}
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct AppConfig {
pub default: DefaultConfig,

25
src/main.rs
View File

@ -1,3 +1,4 @@
use actix_web::{web, App, HttpResponse, HttpServer, Result};
use actix_files as actix_fs;
use std::sync::{Mutex, Arc};
@ -11,6 +12,9 @@ mod modbus;
use crate::config::{AppConfig, ModbusRegisterConfig, ModbusValueMaps};
// ...existing code...
struct AppState {
config: Mutex<AppConfig>,
value_maps: Arc<Mutex<ModbusValueMaps>>,
@ -40,6 +44,9 @@ impl AppState {
}
}
// ...existing code...
async fn index(data: web::Data<AppState>) -> Result<HttpResponse> {
let config = data.config.lock().unwrap();
let value_maps = data.value_maps.lock().unwrap();
@ -161,17 +168,7 @@ async fn save_settings(
settings: web::Json<AppConfig>,
) -> Result<HttpResponse> {
let mut config = data.config.lock().unwrap();
let mut new_config = settings.into_inner();
// Tabellenwerte erhalten, falls sie im Request null sind
if new_config.modbus_coils.is_none() {
new_config.modbus_coils = config.modbus_coils.clone();
}
if new_config.modbus_input_register.is_none() {
new_config.modbus_input_register = config.modbus_input_register.clone();
}
if new_config.modbus_holding_register.is_none() {
new_config.modbus_holding_register = config.modbus_holding_register.clone();
}
let new_config = settings.into_inner();
// Value-Maps neu initialisieren
let mut value_maps = data.value_maps.lock().unwrap();
*value_maps = ModbusValueMaps::from_config(&new_config);
@ -187,11 +184,6 @@ async fn save_settings(
Ok(HttpResponse::Ok().body("success"))
}
async fn get_config(data: web::Data<AppState>) -> HttpResponse {
let config = data.config.lock().unwrap();
HttpResponse::Ok().json(&*config)
}
#[actix_web::main]
async fn main() -> std::io::Result<()> {
@ -223,7 +215,6 @@ async fn main() -> std::io::Result<()> {
.route("/settings", web::get().to(settings_page))
.route("/api/save", web::post().to(save_table))
.route("/api/save-settings", web::post().to(save_settings))
.route("/api/config", web::get().to(get_config))
.service(actix_fs::Files::new("/static", "./static"))
})
.bind("0.0.0.0:8080")?

16
static/script.js
View File

@ -1,15 +1,11 @@
// Sortiere die Tabelle nach Adresse (addr) beim Laden der Seite
document.addEventListener('DOMContentLoaded', function() {
// Darkmode-Status aus Konfiguration übernehmen
fetch('/api/config')
.then(response => response.json())
.then(config => {
if (config && config.default && config.default.darkmode === true) {
document.body.classList.add('darkmode');
} else {
document.body.classList.remove('darkmode');
}
});
// Darkmode-Status aus localStorage übernehmen
if (localStorage.getItem('darkmode') === 'true') {
document.body.classList.add('darkmode');
} else {
document.body.classList.remove('darkmode');
}
const tableBody = document.getElementById('tableBody');
if (tableBody) {
// Extrahiere alle Zeilen und deren addr

74
static/settings.js
View File

@ -1,44 +1,4 @@
// Setze den Wert des Darkmode-Schalters beim Laden der Seite, sobald das Element existiert
document.addEventListener('DOMContentLoaded', function() {
fetch('/api/config')
.then(response => response.json())
.then(config => {
function setSwitch() {
const el = document.getElementById('darkmode_switch');
if (el) {
if (config && config.default && (config.default.darkmode === true || config.default.darkmode === 'true')) {
el.checked = true;
} else {
el.checked = false;
}
} else {
// Falls das Element noch nicht existiert, erneut versuchen
setTimeout(setSwitch, 50);
}
}
setSwitch();
});
});
async function saveSettings() {
// Default (für [default])
const darkmode = document.getElementById('darkmode_switch')?.checked ?? null;
const defaultConfig = {
loglevel: document.getElementById('loglevel')?.value || null,
darkmode: darkmode
};
// Modbus
const modbus = {
host: document.getElementById('modbus_host').value,
port: parseInt(document.getElementById('modbus_port').value, 10),
max_coils_addr: parseInt(document.getElementById('modbus_max_coils_addr').value, 10) || null,
max_input_addr: parseInt(document.getElementById('modbus_max_input_addr').value, 10) || null,
max_holding_addr: parseInt(document.getElementById('modbus_max_holding_addr').value, 10) || null,
modbus_coils: null,
modbus_input_register: null,
modbus_holding_register: null
};
// MQTT
const mqtt = {
broker: document.getElementById('mqtt_broker').value,
@ -58,11 +18,28 @@ async function saveSettings() {
measurement: document.getElementById('influxdb_measurement').value || null
};
// Modbus
const modbus = {
host: document.getElementById('modbus_host').value,
port: parseInt(document.getElementById('modbus_port').value, 10),
max_coils_addr: parseInt(document.getElementById('modbus_max_coils_addr').value, 10) || null,
max_input_addr: parseInt(document.getElementById('modbus_max_input_addr').value, 10) || null,
max_holding_addr: parseInt(document.getElementById('modbus_max_holding_addr').value, 10) || null,
modbus_coils: null,
modbus_input_register: null,
modbus_holding_register: null
};
// Default (für [default])
const defaultConfig = {
loglevel: document.getElementById('loglevel')?.value || null
};
const settings = {
default: defaultConfig,
modbus,
mqtt,
influxdb
influxdb,
modbus
};
try {
@ -93,3 +70,16 @@ async function saveSettings() {
}
}
// Darkmode Toggle
document.addEventListener('DOMContentLoaded', function() {
const btn = document.getElementById('darkmode-toggle');
if (!btn) return;
// Initialer Zustand aus LocalStorage
if (localStorage.getItem('darkmode') === 'true') {
document.body.classList.add('darkmode');
}
btn.addEventListener('click', function() {
document.body.classList.toggle('darkmode');
localStorage.setItem('darkmode', document.body.classList.contains('darkmode'));
});
});

58
templates/settings.html
View File

@ -41,37 +41,9 @@
<option value="WARN">WARN</option>
<option value="ERROR">ERROR</option>
</select>
</div>
<div class="form-group" style="display: flex; align-items: center; gap: 12px;">
<label for="darkmode_switch">Darkmode:</label>
<label class="switch">
<input type="checkbox" id="darkmode_switch">
<span class="slider"></span>
</label>
</div>
</div>
<div class="settings-section">
<h2>Modbus Konfiguration</h2>
<div class="form-group">
<label for="modbus_host">Host:</label>
<input type="text" id="modbus_host" class="text-input" value="{{ modbus.host }}" />
</div>
<div class="form-group">
<label for="modbus_port">Port:</label>
<input type="text" id="modbus_port" class="text-input" value="{{ modbus.port }}" />
</div>
<div class="form-group">
<label for="modbus_max_coils_addr">Max Coils Addr:</label>
<input type="text" id="modbus_max_coils_addr" class="text-input" value="{{ modbus.max_coils_addr | default(value="") }}" />
</div>
<div class="form-group">
<label for="modbus_max_input_addr">Max Input Addr:</label>
<input type="text" id="modbus_max_input_addr" class="text-input" value="{{ modbus.max_input_addr | default(value="") }}" />
</div>
<div class="form-group">
<label for="modbus_max_holding_addr">Max Holding Addr:</label>
<input type="text" id="modbus_max_holding_addr" class="text-input" value="{{ modbus.max_holding_addr | default(value="") }}" />
</div>
<div class="form-group" style="text-align:right;">
<button id="darkmode-toggle" class="add-btn" type="button">🌙 Darkmode umschalten</button>
</div>
</div>
@ -127,6 +99,30 @@
</div>
</div>
<div class="settings-section">
<h2>Modbus Konfiguration</h2>
<div class="form-group">
<label for="modbus_host">Host:</label>
<input type="text" id="modbus_host" class="text-input" value="{{ modbus.host }}" />
</div>
<div class="form-group">
<label for="modbus_port">Port:</label>
<input type="text" id="modbus_port" class="text-input" value="{{ modbus.port }}" />
</div>
<div class="form-group">
<label for="modbus_max_coils_addr">Max Coils Addr:</label>
<input type="text" id="modbus_max_coils_addr" class="text-input" value="{{ modbus.max_coils_addr | default(value="") }}" />
</div>
<div class="form-group">
<label for="modbus_max_input_addr">Max Input Addr:</label>
<input type="text" id="modbus_max_input_addr" class="text-input" value="{{ modbus.max_input_addr | default(value="") }}" />
</div>
<div class="form-group">
<label for="modbus_max_holding_addr">Max Holding Addr:</label>
<input type="text" id="modbus_max_holding_addr" class="text-input" value="{{ modbus.max_holding_addr | default(value="") }}" />
</div>
</div>
<button class="save-btn" onclick="saveSettings()">💾 Einstellungen speichern</button>
</div>