Merge pull request #113 from fel115/nc_status_update

added Ping module to information output; added Status for Battery
ElektraInitiative · Oct 16, 2023 · a446ad4 · a446ad4
2 parents ff54734 + fb63437
commit a446ad4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/bat.rs b/src/bat.rs
@@ -12,6 +12,7 @@ use tokio::time::interval;
 
 use crate::nextcloud::NextcloudChat;
 use crate::nextcloud::NextcloudEvent;
+use crate::nextcloud::NextcloudStatus;
 use crate::types::ModuleError;
 
 const START_CAPACITY_THRESHOLD: u8 = 50;
@@ -24,7 +25,7 @@ pub struct Bat {
 impl Bat {
 	pub fn new() -> Self {
 		Self {
-			capacity: 0,
+			capacity: 100,
 			capacity_threshold: START_CAPACITY_THRESHOLD,
 		}
 	}
@@ -48,6 +49,12 @@ impl Bat {
 			if new_capacity != self.capacity {
 				self.capacity = new_capacity;
 				if self.capacity < self.capacity_threshold {
+					nextcloud_sender
+						.send(NextcloudEvent::Status(
+							NextcloudStatus::Online,
+							gettext!("🪫 ON {}", self.capacity),
+						))
+						.await?;
 					nextcloud_sender
 						.send(NextcloudEvent::Chat(
 							NextcloudChat::Default,
@@ -65,6 +72,12 @@ impl Bat {
 					}
 				} else if self.capacity == 100 {
 					self.capacity_threshold = START_CAPACITY_THRESHOLD;
+					nextcloud_sender
+						.send(NextcloudEvent::Status(
+							NextcloudStatus::Online,
+							gettext!("🔋 ON {}", self.capacity),
+						))
+						.await?;
 					nextcloud_sender
 						.send(NextcloudEvent::Chat(
 							NextcloudChat::Default,

diff --git a/src/main.rs b/src/main.rs
@@ -228,7 +228,7 @@ async fn main() -> Result<(), ModuleError> {
 
 	nextcloud_sender.send(
 		NextcloudEvent::Chat(NextcloudChat::Default,
-			gettext!("Enabled Modules: \nButtons: {}\n, Garage: {}\n, Sensors: {}\n, ModIR: {}\n, Environment: {}\n, Weatherstation: {}\n, Battery: {}\n, Watchdog: {}\n",
+			gettext!("Enabled Modules: \nButtons: {},\n Garage: {},\n Sensors: {},\n ModIR: {},\n Environment: {},\n Weatherstation: {},\n Battery: {},\n Watchdog: {},\n Ping: {}\n",
 	buttons_enabled,
 	garage_enabled,
 	sensors_enabled,
@@ -237,6 +237,7 @@ async fn main() -> Result<(), ModuleError> {
 	weatherstation_enabled,
 	bat_enabled,
 	watchdog_enabled,
+	ping_enabled,
 ))).await?;
 
 	join_all(tasks).await;