no message
This commit is contained in:
+39
-44
@@ -30,77 +30,76 @@ class VGT_Sub extends IPSModule
|
|||||||
$this->RegisterVariableInteger("MaxSOC", "Max SOC", "", 60);
|
$this->RegisterVariableInteger("MaxSOC", "Max SOC", "", 60);
|
||||||
$this->EnableAction("MaxSOC");
|
$this->EnableAction("MaxSOC");
|
||||||
|
|
||||||
// Remote-Control incoming (read-only)
|
// Remote control readonly values
|
||||||
$this->RegisterVariableFloat("RC_PowerSetpoint", "RC Power Setpoint", "", 70);
|
$this->RegisterVariableFloat("RC_PowerSetpoint", "RC Power Setpoint", "", 70);
|
||||||
$this->RegisterVariableString("RC_Strategy", "RC Strategy", "", 80);
|
$this->RegisterVariableString("RC_Strategy", "RC Strategy", "", 80);
|
||||||
|
|
||||||
// Parent MQTT Splitter
|
// Attach to MQTT Client Splitter
|
||||||
$this->ConnectParent('{F7A0DD2E-7684-95C0-64C2-D2A9DC47577B}');
|
$this->ConnectParent('{F7A0DD2E-7684-95C0-64C2-D2A9DC47577B}');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public function ApplyChanges()
|
public function ApplyChanges()
|
||||||
{
|
{
|
||||||
parent::ApplyChanges();
|
parent::ApplyChanges();
|
||||||
|
|
||||||
|
// Reconnect parent
|
||||||
$this->ConnectParent('{F7A0DD2E-7684-95C0-64C2-D2A9DC47577B}');
|
$this->ConnectParent('{F7A0DD2E-7684-95C0-64C2-D2A9DC47577B}');
|
||||||
|
|
||||||
$device = $this->ReadPropertyString("DeviceID");
|
$device = $this->ReadPropertyString("DeviceID");
|
||||||
|
|
||||||
// Subscribes
|
// Required incoming topics
|
||||||
$topics = [
|
$topics = [
|
||||||
"feedback-request/" . $device,
|
"feedback-request/" . $device,
|
||||||
"remote-control-request/" . $device
|
"remote-control-request/" . $device
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// Subscribe each topic using the CORRECT DataID
|
||||||
foreach ($topics as $t) {
|
foreach ($topics as $t) {
|
||||||
$this->SendDataToParent(json_encode([
|
$this->SendDataToParent(json_encode([
|
||||||
"DataID" => "{043E0F88-B2B0-4DF4-B1A6-64FB1C385D3C}",
|
"DataID" => "{043EA491-0325-4ADD-8FC2-A30C8EEB4D3F}", // <- correct for subscribe
|
||||||
"PacketType" => 8, // SUBSCRIBE
|
"Topic" => $t,
|
||||||
"Topic" => $t
|
"Retain" => false
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// ---------------------------------------------------------------------
|
|
||||||
// ACTION HANDLER
|
|
||||||
// ---------------------------------------------------------------------
|
|
||||||
public function RequestAction($Ident, $Value)
|
public function RequestAction($Ident, $Value)
|
||||||
{
|
{
|
||||||
SetValue($this->GetIDForIdent($Ident), $Value);
|
SetValue($this->GetIDForIdent($Ident), $Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------
|
|
||||||
// RECEIVE FROM MQTT
|
|
||||||
// ---------------------------------------------------------------------
|
|
||||||
public function ReceiveData($JSONString)
|
public function ReceiveData($JSONString)
|
||||||
{
|
{
|
||||||
$data = json_decode($JSONString);
|
$data = json_decode($JSONString);
|
||||||
|
|
||||||
|
// This format is correct for your MQTT client splitter:
|
||||||
|
// { "Topic": "...", "Payload": "..." }
|
||||||
|
|
||||||
if (!isset($data->Topic) || !isset($data->Payload)) {
|
if (!isset($data->Topic) || !isset($data->Payload)) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$topic = $data->Topic;
|
$topic = $data->Topic;
|
||||||
$payload = $data->Payload;
|
$payload = $data->Payload;
|
||||||
|
|
||||||
$deviceID = $this->ReadPropertyString("DeviceID");
|
$device = $this->ReadPropertyString("DeviceID");
|
||||||
|
|
||||||
// Topics
|
if ($topic === "feedback-request/" . $device) {
|
||||||
$feedbackReq = "feedback-request/" . $deviceID;
|
|
||||||
$remoteReq = "remote-control-request/" . $deviceID;
|
|
||||||
|
|
||||||
if ($topic === $feedbackReq) {
|
|
||||||
$this->HandleFeedbackRequest();
|
$this->HandleFeedbackRequest();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($topic === $remoteReq) {
|
if ($topic === "remote-control-request/" . $device) {
|
||||||
$this->HandleRemoteControlRequest($payload);
|
$this->HandleRemoteControlRequest($payload);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------
|
|
||||||
// HANDLE FEEDBACK REQUEST -> SEND STATE JSON
|
// ----------------------------------------------------------------------------
|
||||||
// ---------------------------------------------------------------------
|
// FEEDBACK REQUEST → SEND STATE JSON
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
private function HandleFeedbackRequest()
|
private function HandleFeedbackRequest()
|
||||||
{
|
{
|
||||||
$response = [
|
$response = [
|
||||||
@@ -117,11 +116,10 @@ class VGT_Sub extends IPSModule
|
|||||||
$this->SendToMQTT($topic, json_encode($response));
|
$this->SendToMQTT($topic, json_encode($response));
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------
|
|
||||||
// HANDLE REMOTE CONTROL REQUEST
|
// ----------------------------------------------------------------------------
|
||||||
// payload:
|
// REMOTE CONTROL REQUEST → WRITE VALUES + RESPOND
|
||||||
// { "power_setpoint": 150, "strategy": "activation" }
|
// ----------------------------------------------------------------------------
|
||||||
// ---------------------------------------------------------------------
|
|
||||||
private function HandleRemoteControlRequest(string $payload)
|
private function HandleRemoteControlRequest(string $payload)
|
||||||
{
|
{
|
||||||
$data = json_decode($payload, true);
|
$data = json_decode($payload, true);
|
||||||
@@ -129,7 +127,6 @@ class VGT_Sub extends IPSModule
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write values to variables
|
|
||||||
if (isset($data["power_setpoint"])) {
|
if (isset($data["power_setpoint"])) {
|
||||||
SetValue($this->GetIDForIdent("RC_PowerSetpoint"), $data["power_setpoint"]);
|
SetValue($this->GetIDForIdent("RC_PowerSetpoint"), $data["power_setpoint"]);
|
||||||
}
|
}
|
||||||
@@ -138,40 +135,38 @@ class VGT_Sub extends IPSModule
|
|||||||
SetValue($this->GetIDForIdent("RC_Strategy"), $data["strategy"]);
|
SetValue($this->GetIDForIdent("RC_Strategy"), $data["strategy"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Respond with same JSON
|
// Respond back
|
||||||
$topic = "remote-control-response/" . $this->ReadPropertyString("DeviceID");
|
$topic = "remote-control-response/" . $this->ReadPropertyString("DeviceID");
|
||||||
$this->SendToMQTT($topic, json_encode($data));
|
$this->SendToMQTT($topic, json_encode($data));
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------
|
|
||||||
// MQTT SEND HELPERS
|
// ----------------------------------------------------------------------------
|
||||||
// ---------------------------------------------------------------------
|
// MQTT PUBLISH (correct format for your splitter!)
|
||||||
|
// ----------------------------------------------------------------------------
|
||||||
private function SendToMQTT(string $topic, string $payload)
|
private function SendToMQTT(string $topic, string $payload)
|
||||||
{
|
{
|
||||||
$this->SendDataToParent(json_encode([
|
$this->SendDataToParent(json_encode([
|
||||||
"DataID" => "{043E0F88-B2B0-4DF4-B1A6-64FB1C385D3C}",
|
"DataID" => "{043EA491-0325-4ADD-8FC2-A30C8EEB4D3F}", // CORRECT!
|
||||||
"PacketType" => 3,
|
"Topic" => $topic,
|
||||||
"QualityOfService" => 0,
|
"Payload" => $payload,
|
||||||
"Retain" => false,
|
"Retain" => false
|
||||||
"Topic" => $topic,
|
|
||||||
"Payload" => $payload
|
|
||||||
]));
|
]));
|
||||||
}
|
}
|
||||||
|
|
||||||
// ---------------------------------------------------------------------
|
|
||||||
// CONFIG FORM
|
|
||||||
// ---------------------------------------------------------------------
|
|
||||||
public function GetConfigurationForm()
|
public function GetConfigurationForm()
|
||||||
{
|
{
|
||||||
return json_encode([
|
return json_encode([
|
||||||
"elements" => [
|
"elements" => [
|
||||||
[
|
[
|
||||||
"type" => "ValidationTextBox",
|
"type" => "ValidationTextBox",
|
||||||
"name" => "DeviceID",
|
"name" => "DeviceID",
|
||||||
"caption" => "Device ID"
|
"caption" => "Device ID"
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
Reference in New Issue
Block a user