Support firmware version 5.2

Bump version to 5.2
hvxl · Dec 28, 2021 · 9caed8f · 9caed8f
1 parent 8cd4a94
commit 9caed8f
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 12 deletions.
diff --git a/otmonitor.vfs/gui.tcl b/otmonitor.vfs/gui.tcl
@@ -38,14 +38,12 @@ namespace eval gui {
 
 proc gui::savedialogs {} {}
 
-proc gui::loaddialogs {} {
+proc gui::loaddialogs {args} {
     global cfg
     # Only do this once per run
     proc loaddialogs args {}
 
-    if {[tk windowingsystem] ne "x11" || [catch {package require fsdialog}]} {
-	return
-    }
+    if {[catch {package require fsdialog}]} return
     set prefs {}
     set hist {}
     foreach n [array names cfg fsdialog,*] {
@@ -69,6 +67,12 @@ proc gui::loaddialogs {} {
     }
 }
 
+if {[tk windowingsystem] eq "x11"} {
+    trace add execution tk_getOpenFile enter gui::loaddialogs
+    trace add execution tk_getSaveFile enter gui::loaddialogs
+    trace add execution tk_chooseDirectory enter gui::loaddialogs
+}
+
 proc gui::passthrough {cmd subcmd args} {return [namespace which $subcmd]}
 
 proc gui::img {fn {disabled 0}} {
@@ -572,7 +576,6 @@ proc gui::tvselect {} {
 }
 
 proc gui::selfile {str} {
-    loaddialogs
     set types {
 	{"Text Files"		.txt}
 	{"All Files"		*}
@@ -600,7 +603,6 @@ proc gui::datalayout {} {
 
 proc gui::cfgselectdir {} {
     global cfg
-    loaddialogs
     set dir [tk_chooseDirectory -initialdir $cfg(logfile,directory) \
       -parent .cfg -title "Select the directory for log files"]
     if {$dir ne ""} {
@@ -1964,7 +1966,6 @@ proc gui::showsettings {} {
 
 proc gui::hexfile {} {
     global cfg
-    loaddialogs
     set dir [file dirname [append cfg(firmware,hexfile) ""]]
     set name [file tail $cfg(firmware,hexfile)]
     set types {

diff --git a/otmonitor.vfs/otmonitor.inf b/otmonitor.vfs/otmonitor.inf
@@ -1,9 +1,9 @@
 Language		"0409"
 CodePage		"04b0"
-FileDescription 	"Opentherm Monitor 5.1"
-FileVersion		"5.1"
+FileDescription 	"Opentherm Monitor 5.2"
+FileVersion		"5.2"
 ProductName		"Opentherm Monitor"
-ProductVersion		"5.1.0.0"
+ProductVersion		"5.2.0.0"
 OriginalFilename	"otmonitor.exe"
 InternalName		"otmonitor"
 CompanyName		"Tclcode"

diff --git a/otmonitor.vfs/otmonitor.tcl b/otmonitor.vfs/otmonitor.tcl
@@ -3,7 +3,7 @@
 # Opentherm monitor utility.
 # For more information, see http://otgw.tclcode.com/otmonitor.html
 
-set version 5.1
+set version 5.2
 set reportflags 0
 set appendlog 0
 set setpt 20.00
@@ -451,6 +451,12 @@ proc process {line} {
     } elseif {[string match {*WDT reset!*} $line]} {
 	output "[ts]\t$line"
 	alert watchdogtimer
+    } elseif {[scan $line {CS: %f} ctrlsetpt] == 1} {
+	output "[ts]\t$line"
+	after cancel commandexpired
+	if {$ctrlsetpt != 0.0} {
+	    after 62915 commandexpired
+	}
     } else {
 	# Filter out non-printable characters
 	output "[ts]\t[regsub -all {[\0-\x1f]} $line {}]"
@@ -1541,6 +1547,19 @@ proc sync {{force 0}} {
     }
 }
 
+proc commandexpired {} {
+    global cfg
+    if {$cfg(clock,auto)} {
+	# Some party has issued a CS command. But since OTmonitor periodically
+	# updates the clock, that command would never expire if the other
+	# application crashes. For that reason, the command is specifically
+	# cancelled here after a little over a minute.
+	sercmd CS=0
+	# Repeat if not acknowledged
+	after 2000 commandexpired
+    }
+}
+
 proc signal {args} {
     global signalproc
     foreach n $signalproc {

diff --git a/otmonitor.vfs/upgrade.tcl b/otmonitor.vfs/upgrade.tcl
@@ -506,7 +506,7 @@ proc upgrade::eeprom {version} {
 	4.0a9 4.0a9.1 4.0a10 4.0a11 4.0a11.1 4.0a11.2 4.0a12
     }
     if {$version == 0 || \
-      $version ni $supported && ![package vsatisfies $version 4.0b0-5.2]} {
+      $version ni $supported && ![package vsatisfies $version 4.0b0-5.3]} {
 	return {}
     }
     set rc {