From 3d8c362cd5409246c7026ea956ce10d51ed9ebc3 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Thu, 21 Aug 2025 16:49:02 +0300 Subject: Telemetry Wires. Implemented Firmware User Notifications. Added Missing UI Settings Units Display. Add Machine Name to General Information Dialog. --- Software/PMR/Messages/Common/MessageType.proto | 2 ++ .../Messages/Diagnostics/StartTelemetryWireResponse.proto | 5 +++-- Software/PMR/Messages/Diagnostics/TelemetryWire.proto | 10 ++++++++++ Software/PMR/Messages/MachineStatus/NotificationType.proto | 13 +++++++++++++ .../Messages/MachineStatus/StartNotificationRequest.proto | 9 +++++++++ .../Messages/MachineStatus/StartNotificationResponse.proto | 14 ++++++++++++++ 6 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 Software/PMR/Messages/Diagnostics/TelemetryWire.proto create mode 100644 Software/PMR/Messages/MachineStatus/NotificationType.proto create mode 100644 Software/PMR/Messages/MachineStatus/StartNotificationRequest.proto create mode 100644 Software/PMR/Messages/MachineStatus/StartNotificationResponse.proto (limited to 'Software/PMR/Messages') diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto index 620ebb0ca..2d26f71a1 100644 --- a/Software/PMR/Messages/Common/MessageType.proto +++ b/Software/PMR/Messages/Common/MessageType.proto @@ -303,6 +303,8 @@ enum MessageType SetBuzzerSettingsResponse = 9011; SetWhiteThreadSkipRequest = 9012; SetWhiteThreadSkipResponse = 9013; + StartNotificationRequest = 9014; + StartNotificationResponse = 9015; //Power StartPowerDownRequest = 10000; diff --git a/Software/PMR/Messages/Diagnostics/StartTelemetryWireResponse.proto b/Software/PMR/Messages/Diagnostics/StartTelemetryWireResponse.proto index 05f1d44ee..710cdb3a9 100644 --- a/Software/PMR/Messages/Diagnostics/StartTelemetryWireResponse.proto +++ b/Software/PMR/Messages/Diagnostics/StartTelemetryWireResponse.proto @@ -1,10 +1,11 @@ syntax = "proto3"; +import "TelemetryWire.proto"; + package Tango.PMR.Diagnostics; option java_package = "com.twine.tango.pmr.diagnostics"; message StartTelemetryWireResponse { - string Name = 1; - float Value = 2; + repeated TelemetryWire Wires = 1; } \ No newline at end of file diff --git a/Software/PMR/Messages/Diagnostics/TelemetryWire.proto b/Software/PMR/Messages/Diagnostics/TelemetryWire.proto new file mode 100644 index 000000000..8ccdebe31 --- /dev/null +++ b/Software/PMR/Messages/Diagnostics/TelemetryWire.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +package Tango.PMR.Diagnostics; +option java_package = "com.twine.tango.pmr.diagnostics"; + +message TelemetryWire +{ + string Name = 1; + float Value = 2; +} \ No newline at end of file diff --git a/Software/PMR/Messages/MachineStatus/NotificationType.proto b/Software/PMR/Messages/MachineStatus/NotificationType.proto new file mode 100644 index 000000000..ad4f5a781 --- /dev/null +++ b/Software/PMR/Messages/MachineStatus/NotificationType.proto @@ -0,0 +1,13 @@ +syntax = "proto3"; + +package Tango.PMR.MachineStatus; +option java_package = "com.twine.tango.pmr.machinestatus"; + +enum NotificationType +{ + NotifyInfo = 0; + NotifyWarning = 1; + NotifyError = 2; + NotifyCritical = 3; + NotifySuccess = 4; +} diff --git a/Software/PMR/Messages/MachineStatus/StartNotificationRequest.proto b/Software/PMR/Messages/MachineStatus/StartNotificationRequest.proto new file mode 100644 index 000000000..cc55923cb --- /dev/null +++ b/Software/PMR/Messages/MachineStatus/StartNotificationRequest.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package Tango.PMR.MachineStatus; +option java_package = "com.twine.tango.pmr.machinestatus"; + +message StartNotificationRequest +{ + +} \ No newline at end of file diff --git a/Software/PMR/Messages/MachineStatus/StartNotificationResponse.proto b/Software/PMR/Messages/MachineStatus/StartNotificationResponse.proto new file mode 100644 index 000000000..973d486a4 --- /dev/null +++ b/Software/PMR/Messages/MachineStatus/StartNotificationResponse.proto @@ -0,0 +1,14 @@ +syntax = "proto3"; + +import "NotificationType.proto"; + +package Tango.PMR.MachineStatus; +option java_package = "com.twine.tango.pmr.machinestatus"; + +message StartNotificationResponse +{ + NotificationType Type = 1; + bool IsBlocking = 2; + string Title = 3; + string Message = 4; +} \ No newline at end of file -- cgit v1.3.1