Update with Watchtower

bassmaster187 · Feb 10, 2025 · e9731fb · e9731fb
1 parent c1d899f
commit e9731fb
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 66 deletions.
diff --git a/TeslaLogger/UpdateTeslalogger.cs b/TeslaLogger/UpdateTeslalogger.cs
@@ -12,6 +12,7 @@
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using System.Diagnostics;
+using System.Net.Http;
 
 namespace TeslaLogger
 {
@@ -1279,7 +1280,15 @@ public static async void DownloadUpdateAndInstall()
             Logfile.Log("Start update");
             ExceptionlessClient.Default.CreateLog("Install", "Start update from " + Assembly.GetExecutingAssembly().GetName().Version).Submit();
 
-            if (Tools.IsMono())
+            if (Tools.IsDockerNET8())
+            {
+                Logfile.Log("use Watchtower");
+                HttpClient client = new HttpClient();
+                client.DefaultRequestHeaders.Add("Authorization", "Bearer teslalogger");
+                client.GetAsync("http://watchtower:8080/v1/update").Wait();
+                return;
+            }
+            else if (Tools.IsMono())
             {
                 Chmod("VERSION", 666);
                 Chmod("settings.json", 666);

diff --git a/TeslaLogger/www/admin/index.php b/TeslaLogger/www/admin/index.php
@@ -193,8 +193,17 @@ function GetCurrentData()
 				var datetime = at.toLocaleTimeString(loc, { hour: '2-digit', minute: '2-digit' });
 
 				$('#car_statusLabel').text("<?php t("Charging"); ?>:");
-				$('#car_status').html(jsonData["charger_power"] + " kW / +" + jsonData["charge_energy_added"] + " kWh<br>" +
+				if(jsonData["charger_phases_calc"] > 0)
+                                {
+                                        $('#car_status').html(jsonData["charger_power_calc_w"] + " W / +" + jsonData["charge_energy_added"] + " kWh<br>" +
+                                        jsonData["charger_voltage"]+"V / " + jsonData["charger_actual_current_calc"]+"A / "+ jsonData["charger_phases_calc"]+"P<br>" +
                                         "<?php t("Done"); ?>: "+ hour +"h "+minute+"m <br><?php t("Done at"); ?>: " + datetime +  " / " + jsonData["charge_limit_soc"] +"%");
+                                }
+                                else
+                                {
+                                        $('#car_status').html(jsonData["charger_power"] + " kW / +" + jsonData["charge_energy_added"] + " kWh<br>" +
+                                        "<?php t("Done"); ?>: "+ hour +"h "+minute+"m <br><?php t("Done at"); ?>: " + datetime +  " / " + jsonData["charge_limit_soc"] +"%");
+                                }
 
 				updateSMT(jsonData);
 			}
@@ -203,9 +212,14 @@ function GetCurrentData()
 				$('#car_statusLabel').text("<?php t("Driving"); ?>:");
 				var str = "";
 				if (LengthUnit == "mile")
-					str = (jsonData["speed"]/ km2mls).toFixed(0) + " mph"
+					str = (jsonData["speed"]/ km2mls).toFixed(0) + " mph / "
+				else
+					str = jsonData["speed"] + " <?php t("km/h"); ?> / ";
+
+				if (PowerUnit == "kw")
+					str += (jsonData["power"] / 1.35962).toFixed(0) + " <?php t("kW"); ?>";
 				else
-					str = jsonData["speed"] + " <?php t("km/h"); ?>";
+					str += jsonData["power"] + " <?php t("PS"); ?>";
 
 				if (jsonData["active_route_destination"])
 				{
@@ -282,6 +296,17 @@ function GetCurrentData()
 				$("#trip_distance").text(jsonData["trip_distance"].toLocaleString(loc,{maximumFractionDigits:1, minimumFractionDigits: 1}));
 			}
 
+			if (PowerUnit == "kw")
+			{
+				$("#max_power").text((jsonData["trip_max_power"] / 1.35962).toFixed(0));
+				$("#lt_trip_PS").text("<?php t("kW"); ?>");
+			}
+			else
+			{
+				$("#max_power").text(jsonData["trip_max_power"]);
+				$("#lt_trip_PS").text("<?php t("PS"); ?>");
+			}
+
 			var ts2 = new Date(Date.parse(jsonData["trip_start_dt"]));
 			$("#trip_start").text(ts2.toLocaleTimeString(loc, { day: '2-digit', month: '2-digit', year: 'numeric' }));
 
@@ -427,64 +452,6 @@ function updateSMT(jsonData)
 
 	}
 
-function ShowInfo()
-{
-	<?php
-	$prefix = "/etc/teslalogger/";
-    if (isDocker())
-		$prefix = "/tmp/";
-
-	if (file_exists($prefix."cmd_gosleep_$carid.txt"))
-	{?>
-		$("#InfoText").html("<h1><?php t("TextSuspendTeslalogger"); ?></h1>");
-		$(".HeaderT").show();
-		$("#PositiveButton").text("<?php t("Resume Teslalogger"); ?>");
-		$("#PositiveButton").click(function(){window.location.href='/wakeup.php?id=' + <?= $carid ?>;});
-		$("#NegativeButton").hide();
-	<?php
-	}
-	else if (!file_exists("/etc/teslalogger/sharedata.txt") &&
-	!file_exists("/etc/teslalogger/nosharedata.txt") &&
-	!file_exists("/tmp/sharedata.txt") &&
-	!file_exists("/tmp/nosharedata.txt")
-	)
-	{?>
-		$("#InfoText").html("<?php t("TextShare"); ?>");
-		$(".HeaderT").show();
-		$("#PositiveButton").click(function(){window.location.href='settings_share.php?a=yes';});
-		$("#NegativeButton").click(function(){window.location.href='settings_share.php?a=no';});
-	<?php
-	}
-	else if(isDocker() && GrafanaVersion() != "10.0.1")
-	{?>
-		<?php
-		$t1=get_text("Please update to latest docker-compose.yml file. Check: {LINK}<br>Grafana 10.0.1 not installed!");
-		$t1=str_replace("{", "<a href='https://github.com/bassmaster187/TeslaLogger/blob/master/docker_setup.md#docker-update--upgrade'>", $t1);
-		$t1=str_replace("}", '</a>', $t1);
-		?>
-		$("#InfoText").html("<h1><?php echo $t1; ?></h1>");
-		$(".HeaderT").show();
-		$("#PositiveButton").click(function(){window.location.href='https://github.com/bassmaster187/TeslaLogger/blob/master/docker_setup.md#docker-update--upgrade';});
-		$("#NegativeButton").hide();
-	<?php
-	} else if (isDocker() && !DatasourceUpdated() && !isDockerNET8())
-	{?>
-		$("#InfoText").html("<h1>Please update datasource.yaml file. Check: <a href='https://github.com/bassmaster187/TeslaLogger/blob/master/docker_setup.md#docker-update--upgrade'>LINK</a></h1>");
-		$(".HeaderT").show();
-		$("#PositiveButton").click(function(){window.location.href='https://github.com/bassmaster187/TeslaLogger/blob/master/docker_setup.md#docker-update--upgrade';});
-		$("#NegativeButton").hide();
-	<?php
-	}
-	else if (!files_are_equal("/tmp/changelog_last.md","/tmp/changelog.md"))
-	{?>
-		$.get("changelog_plain.php").success(function(data){
-			$("#InfoText").html(data);
-		});
-
-		$(".HeaderT").show();
-		$("#PositiveButton").text("<?php t("OK"); ?>");
-		$("#PositiveButton").click(function(){window.location.href='changelogread.php';});
-		$("#NegativeButton").hide();
 	<?php
 	?>
   </script>
@@ -560,7 +527,7 @@ function ShowInfo()
 	  <tr><td><b><?php t("Distance"); ?>:</b></td><td><span id="trip_distance">---</span> <span id="lt_trip_distance_km"><?php t("km"); ?></span></td></tr>
 	  <tr><td><b><?php t("Consumption"); ?>:</b></td><td><span id="trip_kwh">---</span> <?php t("kWh"); ?></td></tr>
 	  <tr><td><b><?php t("Ø Consumption"); ?>:</b></td><td><span id="trip_avg_kwh">---</span> <span id="lt_whkm"><?php t("Wh/km"); ?></span></td></tr>
-	  <tr><td><b><?php t("Max km/h"); ?>:</b></td><td><span id="max_speed">---</span> <?php t("km/h"); ?></span> </td></tr>
+	  <tr><td><b><?php t("Max km/h"); ?> / <?php t("PS"); ?>:</b></td><td><span id="max_speed">---</span> <span id="lt_kmh"><?php t("km/h"); ?></span> / <span id="max_power">---</span> <span id="lt_trip_PS"><span></td></tr>
   </table>
   </div>
 

diff --git a/TeslaLogger/www/admin/menu.php b/TeslaLogger/www/admin/menu.php
@@ -132,12 +132,9 @@ function menu($title, $prefix = "")
 					<li id="menu-item-2" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-2">
 						<a href="javascript:BackgroudRun('restartlogger.php', '<?php t("Reboot!"); ?>')"><?php t("Restart"); ?></a>
 					</li>
-<?php if (!isDockerNET8())
-{?>
 					<li id="menu-item-3" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-3">
 						<a href="javascript:BackgroudRun('update.php', '<?php t("Reboot!"); ?>')"><?php t("Update"); ?></a>
 					</li>
-<?php } ?>
 					<li id="menu-item-7" class="page_item_has_children">
 						<a href="#"><?php t("Dashboards"); ?></a>
 						<ul class='children menu-columns'>