equal
deleted
inserted
replaced
521 |
521 |
522 target_fname = "svghmi_"+location_str+".xhtml" |
522 target_fname = "svghmi_"+location_str+".xhtml" |
523 |
523 |
524 build_path = self._getBuildPath() |
524 build_path = self._getBuildPath() |
525 target_path = os.path.join(build_path, target_fname) |
525 target_path = os.path.join(build_path, target_fname) |
526 hash_path = os.path.join(build_path, "svghmi.md5") |
526 hash_path = os.path.join(build_path, "svghmi_"+location_str+".md5") |
527 |
527 |
528 self.GetCTRoot().logger.write("SVGHMI:\n") |
528 self.GetCTRoot().logger.write("SVGHMI:\n") |
529 |
529 |
530 if os.path.exists(svgfile): |
530 if os.path.exists(svgfile): |
531 |
531 |
605 <h1> No SVG file provided </h1> |
605 <h1> No SVG file provided </h1> |
606 </body> |
606 </body> |
607 </html> |
607 </html> |
608 """) |
608 """) |
609 target_file.close() |
609 target_file.close() |
|
610 |
|
611 # In case no SVG is given, watchdog is useless |
|
612 svghmi_options["enable_watchdog"] = False |
610 |
613 |
611 res += ((target_fname, open(target_path, "rb")),) |
614 res += ((target_fname, open(target_path, "rb")),) |
612 |
615 |
613 svghmi_cmds = {} |
616 svghmi_cmds = {} |
614 for thing in ["Start", "Stop", "Watchdog"]: |
617 for thing in ["Start", "Stop", "Watchdog"]: |