Mercurial > mbsePi-apps / changeset

--- a/brewpanel/Makefile	Sat Feb 25 10:53:42 2023 +0100
+++ b/brewpanel/Makefile	Thu Mar 14 17:07:09 2024 +0100
@@ -23,7 +23,7 @@
 		rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak
 
 install:	all
-		${INSTALL} -c -s -g root -o root -m 0755 brewpanel ${BINDIR}
+		${INSTALL} -c -s -g root -o root -m 0755 brewpanel ${DESTDIR}${BINDIR}
 
 filelist:	Makefile
 		BASE=`pwd`; \

--- a/kicad/ThermFerm.kicad_prl	Sat Feb 25 10:53:42 2023 +0100
+++ b/kicad/ThermFerm.kicad_prl	Thu Mar 14 17:07:09 2024 +0100
@@ -3,10 +3,12 @@
     "active_layer": 0,
     "active_layer_preset": "",
     "auto_track_width": true,
+    "hidden_netclasses": [],
     "hidden_nets": [],
     "high_contrast_mode": 0,
     "net_color_mode": 1,
     "opacity": {
+      "images": 0.6,
       "pads": 1.0,
       "tracks": 1.0,
       "vias": 1.0,

--- a/kicad/ThermFerm.kicad_pro	Sat Feb 25 10:53:42 2023 +0100
+++ b/kicad/ThermFerm.kicad_pro	Thu Mar 14 17:07:09 2024 +0100
@@ -1,5 +1,6 @@
 {
   "board": {
+    "3dviewports": [],
     "design_settings": {
       "defaults": {
         "board_outline_line_width": 0.1,
@@ -22,7 +23,8 @@
       "track_widths": [],
       "via_dimensions": []
     },
-    "layer_presets": []
+    "layer_presets": [],
+    "viewports": []
   },
   "boards": [],
   "cvpcb": {
@@ -206,18 +208,23 @@
     "rule_severities": {
       "bus_definition_conflict": "error",
       "bus_entry_needed": "error",
-      "bus_label_syntax": "error",
       "bus_to_bus_conflict": "error",
       "bus_to_net_conflict": "error",
+      "conflicting_netclasses": "error",
       "different_unit_footprint": "error",
       "different_unit_net": "error",
       "duplicate_reference": "error",
       "duplicate_sheet_names": "error",
+      "endpoint_off_grid": "warning",
       "extra_units": "error",
       "global_label_dangling": "warning",
       "hier_label_mismatch": "error",
       "label_dangling": "error",
       "lib_symbol_issues": "warning",
+      "missing_bidi_pin": "warning",
+      "missing_input_pin": "warning",
+      "missing_power_pin": "error",
+      "missing_unit": "warning",
       "multiple_net_names": "warning",
       "net_not_bus_member": "warning",
       "no_connect_connected": "warning",
@@ -227,6 +234,7 @@
       "pin_to_pin": "warning",
       "power_pin_not_driven": "error",
       "similar_labels": "warning",
+      "simulation_model_issue": "ignore",
       "unannotated": "error",
       "unit_value_mismatch": "error",
       "unresolved_variable": "error",
@@ -244,7 +252,7 @@
   "net_settings": {
     "classes": [
       {
-        "bus_width": 12.0,
+        "bus_width": 12,
         "clearance": 0.2,
         "diff_pair_gap": 0.25,
         "diff_pair_via_gap": 0.25,
@@ -258,13 +266,15 @@
         "track_width": 0.25,
         "via_diameter": 0.8,
         "via_drill": 0.4,
-        "wire_width": 6.0
+        "wire_width": 6
       }
     ],
     "meta": {
-      "version": 2
+      "version": 3
     },
-    "net_colors": null
+    "net_colors": null,
+    "netclass_assignments": null,
+    "netclass_patterns": []
   },
   "pcbnew": {
     "last_paths": {
@@ -280,6 +290,8 @@
   "schematic": {
     "annotate_start_num": 0,
     "drawing": {
+      "dashed_lines_dash_length_ratio": 12.0,
+      "dashed_lines_gap_length_ratio": 3.0,
       "default_line_thickness": 6.0,
       "default_text_size": 50.0,
       "field_names": [],
@@ -311,7 +323,11 @@
     "page_layout_descr_file": "",
     "plot_directory": "",
     "spice_adjust_passive_values": false,
+    "spice_current_sheet_as_root": false,
     "spice_external_command": "spice \"%I\"",
+    "spice_model_current_sheet_as_root": true,
+    "spice_save_all_currents": false,
+    "spice_save_all_voltages": false,
     "subpart_first_id": 65,
     "subpart_id_separator": 0
   },

--- a/thermferm/Makefile	Sat Feb 25 10:53:42 2023 +0100
+++ b/thermferm/Makefile	Thu Mar 14 17:07:09 2024 +0100
@@ -23,7 +23,7 @@
 		rm -f ${TARGET} *.o *.h~ *.c~ core filelist Makefile.bak
 
 install:	all
-		${INSTALL} -c -s -g root -o root -m 0755 thermferm ${BINDIR}
+		${INSTALL} -c -s -g root -o root -m 0755 thermferm ${DESTDIR}${BINDIR}
 
 filelist:	Makefile
 		BASE=`pwd`; \

--- a/tools/Makefile	Sat Feb 25 10:53:42 2023 +0100
+++ b/tools/Makefile	Thu Mar 14 17:07:09 2024 +0100
@@ -2,7 +2,7 @@
 
 include ../Makefile.global
 
-OTHER		= Makefile init.debian init.slackware setup.slackware
+OTHER		= Makefile init.debian init.slackware
 
 #############################################################################
 
@@ -22,10 +22,8 @@
 			[ -x /bin/systemctl ] && /bin/systemctl daemon-reload ; \
 			echo "[ -x /bin/systemctl ] && /bin/systemctl daemon-reload" ; \
 		elif [ -f /etc/slackware-version ]; then \
-			${INSTALL} -c -g root -o root -m 0755 init.slackware /etc/rc.d/init.d/thermferm ; \
-			echo "${INSTALL} -c -g root -o root -m 0755 init.slackware /etc/rc.d/init.d/thermferm" ; \
-			${INSTALL} -c -g root -o root -m 0755 setup.slackware /var/lib/pkgtools/setup/setup.thermferm ; \
-			echo "${INSTALL} -c -g root -o root -m 0755 setup.slackware /var/lib/pkgtools/setup/setup.thermferm" ; \
+			${INSTALL} -c -g root -o root -m 0755 init.slackware ${DESTDIR}/etc/rc.d/rc.thermferm ; \
+			echo "${INSTALL} -c -g root -o root -m 0755 init.slackware ${DESTDIR}/etc/rc.d/rc.thermferm" ; \
 		else \
 			echo "Unsupported distribution" ; \
 		fi

--- a/tools/init.slackware	Sat Feb 25 10:53:42 2023 +0100
+++ b/tools/init.slackware	Thu Mar 14 17:07:09 2024 +0100
@@ -2,9 +2,9 @@
 #
 # thermferm init script for Slackware.
 #
-# Copyright 2022 Michiel Broek, the Netherlands.
+# Copyright 2022-2024 Michiel Broek, the Netherlands.
 
-PIDFILE=/var/run/thermferm.pid
+PIDFILE=/run/thermferm.pid
 
 case "$1" in
   start)
@@ -12,7 +12,7 @@
     if [ -f ${PIDFILE} ]; then
   	echo "already running."
     else
-	/usr/local/bin/thermferm
+	/usr/bin/thermferm
         echo "done."
     fi
     ;;

--- a/tools/setup.slackware	Sat Feb 25 10:53:42 2023 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-#BLURB="Enable/disable the Fermentation Controller at boot"
-#
-# System setup script for Slackware
-#
-#
-T_PX=$1
-TMP=/var/lib/pkgtools/setup/tmp
-if [ "$COLOR" = "on" -o -r $TMP/SeTcolor ]; then
-  dialog --title "ENABLE thermferm DAEMON AT BOOT?" --yesno \
- "Thermferm is a brewery fermentation controller that controls \
-  fermenters temperatures. This is done by controlling cooling \
-  or heating. Comminucation to the upper level is done via an \
-  MQTT broker. For local maintenance there is a web interface." 10 70
-  if [ $? = 0 ]; then
-    mkdir -p /etc/rc.d/rc0.d /etc/rc.d/rc1.d /etc/rc.d/rc3.d /etc/rc.d/rc4.d /etc/rc.d/rc6
-    ln -s /etc/rc.d/init.d/thermferm /etc/rc.d/rc0.d/K14thermferm
-    ln -s /etc/rc.d/init.d/thermferm /etc/rc.d/rc1.d/K14thermferm
-    ln -s /etc/rc.d/init.d/thermferm /etc/rc.d/rc3.d/S86thermferm
-    ln -s /etc/rc.d/init.d/thermferm /etc/rc.d/rc4.d/S86thermferm
-    ln -s /etc/rc.d/init.d/thermferm /etc/rc.d/rc6.d/K14thermferm
-  else
-    rm -f /etc/rc.d/rc{0,1,6}.d/K14thermferm /etc/rc.d/rc{3,4}.d/S86thermferm
-  fi
-fi