From 72fd0e33956ec16f0ae35a146ea86567480b6a67 Mon Sep 17 00:00:00 2001
From: Rick Jennings <rjennings055@gmail.com>
Date: Mon, 14 Sep 2026 08:19:50 -0400
Subject: [PATCH] move surface temp and occupied specs to ph.points.sugar;
 rename HeatsinkSurfaceTempSensor to HeatsinkTempSensor

---
 src/xeto/ph.points.sugar/occupied.xeto        | 27 +++++++++++++++++++
 .../surface-temp.xeto                         | 12 +--------
 src/xeto/ph.points/occupied.xeto              | 20 --------------
 src/xeto/ph.points/surface.xeto               | 17 ++++++++++++
 4 files changed, 45 insertions(+), 31 deletions(-)
 create mode 100644 src/xeto/ph.points.sugar/occupied.xeto
 rename src/xeto/{ph.points => ph.points.sugar}/surface-temp.xeto (76%)
 create mode 100644 src/xeto/ph.points/surface.xeto

diff --git a/src/xeto/ph.points.sugar/occupied.xeto b/src/xeto/ph.points.sugar/occupied.xeto
new file mode 100644
index 0000000..352b7a1
--- /dev/null
+++ b/src/xeto/ph.points.sugar/occupied.xeto
@@ -0,0 +1,27 @@
+//
+// Copyright (c) 2026, Project-Haystack
+// Licensed under the Academic Free License version 3.0
+//
+// History:
+//   14 Sep 2026  Rick Jennings  Creation
+//
+
+//////////////////////////////////////////////////////////////////////////
+// Zone
+//////////////////////////////////////////////////////////////////////////
+
+// Sensor for the occupied state of a zone space; true when occupied,
+// false when unoccupied
+ZoneOccupiedSensor : OccupiedSensor { zone }
+
+// Setpoint for the occupied state of a zone space; true when occupied,
+// false when unoccupied
+ZoneOccupiedSp : OccupiedSp { zone }
+
+//////////////////////////////////////////////////////////////////////////
+// Other
+//////////////////////////////////////////////////////////////////////////
+
+// Sensor for the occupied state of a parking bay; true when occupied,
+// false when unoccupied
+ParkingBayOccupiedSensor : OccupiedSensor { parkingBay }
diff --git a/src/xeto/ph.points/surface-temp.xeto b/src/xeto/ph.points.sugar/surface-temp.xeto
similarity index 76%
rename from src/xeto/ph.points/surface-temp.xeto
rename to src/xeto/ph.points.sugar/surface-temp.xeto
index 2503e6d..bb6f823 100644
--- a/src/xeto/ph.points/surface-temp.xeto
+++ b/src/xeto/ph.points.sugar/surface-temp.xeto
@@ -6,18 +6,8 @@
 //   10 Dec 2025  Rick Jennings  Creation
 //
 
-// Point associated with surface temperature
-SurfaceTempPoint : NumberPoint <abstract> {
-  surface
-  temp
-  unit: Unit <quantity:"temperature"> "°F"
-}
-
-// Sensor that measures surface temperature
-SurfaceTempSensor : SurfaceTempPoint & SensorPoint <abstract>
-
 // Sensor that measures temperature of a heatsink
-HeatsinkSurfaceTempSensor : SurfaceTempSensor { heatsink }
+HeatsinkTempSensor : SurfaceTempSensor { heatsink }
 
 // Sensor that measures temperature of an electric cable
 ElecCableTempSensor : SurfaceTempSensor {
diff --git a/src/xeto/ph.points/occupied.xeto b/src/xeto/ph.points/occupied.xeto
index cf01a5a..e681d10 100644
--- a/src/xeto/ph.points/occupied.xeto
+++ b/src/xeto/ph.points/occupied.xeto
@@ -30,23 +30,3 @@ OccupancyPoint : NumberPoint <abstract> {
 
 // Sensor for counting the number of occupants
 OccupancySensor : OccupancyPoint & SensorPoint <abstract>
-
-//////////////////////////////////////////////////////////////////////////
-// Zone
-//////////////////////////////////////////////////////////////////////////
-
-// Sensor for the occupied state of a zone space; true when occupied,
-// false when unoccupied
-ZoneOccupiedSensor : OccupiedSensor { zone }
-
-// Setpoint for the occupied state of a zone space; true when occupied,
-// false when unoccupied
-ZoneOccupiedSp : OccupiedSp { zone }
-
-//////////////////////////////////////////////////////////////////////////
-// Other
-//////////////////////////////////////////////////////////////////////////
-
-// Sensor for the occupied state of a parking bay; true when occupied,
-// false when unoccupied
-ParkingBayOccupiedSensor : OccupiedSensor { parkingBay }
diff --git a/src/xeto/ph.points/surface.xeto b/src/xeto/ph.points/surface.xeto
new file mode 100644
index 0000000..bc329ca
--- /dev/null
+++ b/src/xeto/ph.points/surface.xeto
@@ -0,0 +1,17 @@
+//
+// Copyright (c) 2026, Project-Haystack
+// Licensed under the Academic Free License version 3.0
+//
+// History:
+//   14 Sep 2026  Rick Jennings  Creation
+//
+
+// Point associated with surface temperature
+SurfaceTempPoint : NumberPoint <abstract> {
+  surface
+  temp
+  unit: Unit <quantity:"temperature"> "°F"
+}
+
+// Sensor that measures surface temperature
+SurfaceTempSensor : SurfaceTempPoint & SensorPoint <abstract>