Merge branch 'dev'

This commit is contained in:
NGnius (Graham) 2024-05-08 22:08:05 -04:00
commit 1996eb7e16
3 changed files with 9 additions and 8 deletions

View file

@ -612,8 +612,8 @@
"provider": "GabeBoy", "provider": "GabeBoy",
"limits": { "limits": {
"charge_rate": { "charge_rate": {
"min": 250, "min": 0,
"max": 2500 "max": 100
}, },
"charge_modes": [ "charge_modes": [
"normal", "normal",
@ -878,8 +878,8 @@
"provider": "GabeBoySP", "provider": "GabeBoySP",
"limits": { "limits": {
"charge_rate": { "charge_rate": {
"min": 250, "min": 0,
"max": 2500 "max": 100
}, },
"charge_modes": [ "charge_modes": [
"normal", "normal",

View file

@ -384,7 +384,7 @@ fn print_messages(msgs: &Vec<String>) {
impl ApiMessageHandler { impl ApiMessageHandler {
pub fn process_forever(&mut self, settings: &mut Settings) { pub fn process_forever(&mut self, settings: &mut Settings) {
crate::utility::ioperm_power_ec(); crate::utility::ioperm_power_ec();
//let mut dirty_echo = true; // set everything twice, to make sure PowerTools wins on race conditions let mut dirty_echo = true; // set everything twice, to make sure PowerTools wins on race conditions
while let Ok(msg) = self.intake.recv() { while let Ok(msg) = self.intake.recv() {
let mut messages = vec![msg.to_string()]; // keep messages for logging let mut messages = vec![msg.to_string()]; // keep messages for logging
let mut dirty = self.process(settings, msg); let mut dirty = self.process(settings, msg);
@ -393,9 +393,9 @@ impl ApiMessageHandler {
dirty |= self.process(settings, msg); dirty |= self.process(settings, msg);
} }
if dirty if dirty
/*|| dirty_echo */ || dirty_echo
{ {
//dirty_echo = dirty; // echo only once dirty_echo = dirty; // echo only once
print_messages(&messages); print_messages(&messages);
// run on_set // run on_set
if let Err(e) = settings.on_set() { if let Err(e) = settings.on_set() {

View file

@ -69,7 +69,8 @@ pub fn chown_settings_dir() -> std::io::Result<()> {
.parse() .parse()
.unwrap_or(1000); .unwrap_or(1000);
log::info!( log::info!(
"chmod/chown ~/.config/powertools for user `{}` ({})", "chmod/chown {} for user `{}` ({})",
dir.display(),
deck_user, deck_user,
uid uid
); );