aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-05-06 16:47:34 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-05-06 16:47:34 +0300
commit4fc0bbce40133c802d7c193dc701af1a522d93ab (patch)
treee78999aca89d2a9f947fa0f3c4f6860fa76fb696 /Software/Embedded_SW
parent25f0d6f19171ef64db50952099ee1c2e6af09873 (diff)
downloadTango-4fc0bbce40133c802d7c193dc701af1a522d93ab.tar.gz
Tango-4fc0bbce40133c802d7c193dc701af1a522d93ab.zip
Debug messages changed
Diffstat (limited to 'Software/Embedded_SW')
-rw-r--r--Software/Embedded_SW/Embedded/Common/report/report.h2
-rw-r--r--Software/Embedded_SW/Embedded/Common/report/reportInit.c36
-rw-r--r--Software/Embedded_SW/Embedded/Communication/Container.c9
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c66
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h12
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogRequest.pb-c.c72
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogRequest.pb-c.h70
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogRequest.pb-c.c72
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogRequest.pb-c.h70
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.c (renamed from Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogResponse.pb-c.c)86
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.h (renamed from Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogResponse.pb-c.h)48
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogRequest.pb-c.c72
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogRequest.pb-c.h70
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogResponse.pb-c.c72
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogResponse.pb-c.h70
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareDispenser.pb-c.c175
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareDispenser.pb-c.h28
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.c110
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.h18
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwarePidControlType.pb-c.c26
-rw-r--r--Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwarePidControlType.pb-c.h10
21 files changed, 749 insertions, 445 deletions
diff --git a/Software/Embedded_SW/Embedded/Common/report/report.h b/Software/Embedded_SW/Embedded/Common/report/report.h
index f48140d79..a3990bde3 100644
--- a/Software/Embedded_SW/Embedded/Common/report/report.h
+++ b/Software/Embedded_SW/Embedded/Common/report/report.h
@@ -121,6 +121,8 @@ typedef struct{
**************************************************************************/
extern STATUS ReportInit(ReportInitParams InitParams);
extern uint32_t ReportInitMessage(MessageContainer* requestContainer);
+extern uint32_t StopReportInitMessage(MessageContainer* requestContainer);
+
/***************************************************************************
*
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index 1c0a399ba..56800b755 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -33,8 +33,10 @@
#include "include.h"
#include "PMR/common/MessageContainer.pb-c.h"
-#include "PMR/debugging/DebugLogRequest.pb-c.h"
-#include "PMR/debugging/DebugLogResponse.pb-c.h"
+#include "PMR/debugging/StartDebugLogRequest.pb-c.h"
+#include "PMR/debugging/StopDebugLogRequest.pb-c.h"
+#include "PMR/debugging/StartDebugLogResponse.pb-c.h"
+#include "PMR/debugging/StopDebugLogResponse.pb-c.h"
//#include "graphics_adapter.h"
char protobufToken[36] = {0};
@@ -69,7 +71,7 @@ int ReportResponseFunc(char *message, /* The formatted message
if (protobufToken[0] == 0)
return OK;
- DebugLogResponse response = DEBUG_LOG_RESPONSE__INIT;
+ StartDebugLogResponse response = START_DEBUG_LOG_RESPONSE__INIT;
response.filename = FileName;
response.has_linenumber = true;
response.linenumber = LineNumber;
@@ -82,7 +84,7 @@ int ReportResponseFunc(char *message, /* The formatted message
response.category = (DebugLogCategory)parameter1;
response.filter = parameter2;
strcpy (response.message,message);
- //responseContainer = createContainer(MESSAGE_TYPE__DebugLogResponse, protobufToken, false, &response, &debug_log_response__pack, &debug_log_response__get_packed_size);
+ responseContainer = createContainer(MESSAGE_TYPE__StartDebugLogResponse, protobufToken, false, &response, &start_debug_log_response__pack, &start_debug_log_response__get_packed_size);
responseContainer.continuous = true;
uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
size_t container_size = message_container__pack(&responseContainer, container_buffer);
@@ -103,7 +105,7 @@ uint32_t ReportInitMessage(MessageContainer* requestContainer)
// ReportInitParams InitParams;
- DebugLogRequest* request = debug_log_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+ StartDebugLogRequest* request = start_debug_log_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
strcpy (protobufToken, requestContainer->token);
/* InitParams.DistributorQueueMaxMsgs = 20;
InitParams.DistributorTaskPriority = 6;
@@ -113,9 +115,31 @@ uint32_t ReportInitMessage(MessageContainer* requestContainer)
DistributorHandle ReportHandle = ReportAddDistributor("ProtoBuf");
if (ReportHandle == NULL) status |= 0x8;
status |= ReportFunc(ReportResponseFunc , REPORT_ADD, ReportHandle);
- debug_log_request__free_unpacked(request,NULL);
+ start_debug_log_request__free_unpacked(request,NULL);
return status;
}
+uint32_t StopReportInitMessage(MessageContainer* requestContainer)
+{
+
+ MessageContainer responseContainer;
+
+ StopDebugLogRequest* request = stop_debug_log_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+
+ StopDebugLogResponse response = STOP_DEBUG_LOG_RESPONSE__INIT;
+
+//TODO Handle the request!!!!
+ responseContainer = createContainer(MESSAGE_TYPE__StopDebugLogResponse, protobufToken, false, &response, &stop_debug_log_response__pack, &stop_debug_log_response__get_packed_size);
+ responseContainer.continuous = true;
+ uint8_t* container_buffer = malloc(message_container__get_packed_size(&responseContainer));
+ size_t container_size = message_container__pack(&responseContainer, container_buffer);
+ free(responseContainer.data.data);
+ //USBCDCD_sendData(container_buffer, container_size,10);
+ SendChars(container_buffer, container_size);
+ //free (container_buffer);
+
+return OK;
+}
+
#define REPORT_RESERVED_NUM_OF_FILTER_PACKAGES 30 /* This reserved for swinfra packages */
diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c
index b6c8ea3a8..e6b0a071d 100644
--- a/Software/Embedded_SW/Embedded/Communication/Container.c
+++ b/Software/Embedded_SW/Embedded/Communication/Container.c
@@ -164,9 +164,12 @@ void receive_callback(char* buffer, size_t length)
case MESSAGE_TYPE__StubHWVersionRequest:
Stub_HWVersionRequest(requestContainer);
break;
-// case MESSAGE_TYPE__DebugLogRequest:
-// ReportInitMessage(requestContainer);
-// break;
+ case MESSAGE_TYPE__StartDebugLogRequest:
+ ReportInitMessage(requestContainer);
+ break;
+ case MESSAGE_TYPE__StopDebugLogRequest:
+ StopReportInitMessage(requestContainer);
+ break;
case MESSAGE_TYPE__JobRequest:
JobRequestFunc(requestContainer);
break;
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c
index b03eb2964..212a1a388 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c
@@ -7,7 +7,7 @@
#endif
#include "MessageType.pb-c.h"
-static const ProtobufCEnumValue message_type__enum_values_by_number[132] =
+static const ProtobufCEnumValue message_type__enum_values_by_number[136] =
{
{ "None", "MESSAGE_TYPE__None", 0 },
{ "CalculateRequest", "MESSAGE_TYPE__CalculateRequest", 3 },
@@ -95,8 +95,8 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[132] =
{ "DirectSynchronizationResponse", "MESSAGE_TYPE__DirectSynchronizationResponse", 1004 },
{ "OverrideDataBaseRequest", "MESSAGE_TYPE__OverrideDataBaseRequest", 1005 },
{ "OverrideDataBaseResponse", "MESSAGE_TYPE__OverrideDataBaseResponse", 1006 },
- { "PushDiagnosticsRequest", "MESSAGE_TYPE__PushDiagnosticsRequest", 2000 },
- { "PushDiagnosticsResponse", "MESSAGE_TYPE__PushDiagnosticsResponse", 2001 },
+ { "StartDiagnosticsRequest", "MESSAGE_TYPE__StartDiagnosticsRequest", 2000 },
+ { "StartDiagnosticsResponse", "MESSAGE_TYPE__StartDiagnosticsResponse", 2001 },
{ "MotorAbortHomingRequest", "MESSAGE_TYPE__MotorAbortHomingRequest", 2002 },
{ "MotorAbortHomingResponse", "MESSAGE_TYPE__MotorAbortHomingResponse", 2003 },
{ "MotorHomingRequest", "MESSAGE_TYPE__MotorHomingRequest", 2004 },
@@ -123,14 +123,18 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[132] =
{ "SetComponentValueResponse", "MESSAGE_TYPE__SetComponentValueResponse", 2025 },
{ "ResolveEventRequest", "MESSAGE_TYPE__ResolveEventRequest", 2026 },
{ "ResolveEventResponse", "MESSAGE_TYPE__ResolveEventResponse", 2027 },
+ { "StopDiagnosticsRequest", "MESSAGE_TYPE__StopDiagnosticsRequest", 2028 },
+ { "StopDiagnosticsResponse", "MESSAGE_TYPE__StopDiagnosticsResponse", 2029 },
{ "JobRequest", "MESSAGE_TYPE__JobRequest", 3000 },
{ "JobResponse", "MESSAGE_TYPE__JobResponse", 3001 },
{ "AbortJobRequest", "MESSAGE_TYPE__AbortJobRequest", 3002 },
{ "AbortJobResponse", "MESSAGE_TYPE__AbortJobResponse", 3003 },
{ "UploadProcessParametersRequest", "MESSAGE_TYPE__UploadProcessParametersRequest", 3004 },
{ "UploadProcessParametersResponse", "MESSAGE_TYPE__UploadProcessParametersResponse", 3005 },
- { "DebugLogRequest", "MESSAGE_TYPE__DebugLogRequest", 4000 },
- { "DebugLogResponse", "MESSAGE_TYPE__DebugLogResponse", 4001 },
+ { "StartDebugLogRequest", "MESSAGE_TYPE__StartDebugLogRequest", 4000 },
+ { "StartDebugLogResponse", "MESSAGE_TYPE__StartDebugLogResponse", 4001 },
+ { "StopDebugLogRequest", "MESSAGE_TYPE__StopDebugLogRequest", 4002 },
+ { "StopDebugLogResponse", "MESSAGE_TYPE__StopDebugLogResponse", 4003 },
{ "UploadHardwareConfigurationRequest", "MESSAGE_TYPE__UploadHardwareConfigurationRequest", 5000 },
{ "UploadHardwareConfigurationResponse", "MESSAGE_TYPE__UploadHardwareConfigurationResponse", 5001 },
{ "SystemResetRequest", "MESSAGE_TYPE__SystemResetRequest", 5002 },
@@ -143,22 +147,20 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[132] =
{ "DisconnectResponse", "MESSAGE_TYPE__DisconnectResponse", 6005 },
};
static const ProtobufCIntRange message_type__value_ranges[] = {
-{0, 0},{3, 1},{1000, 79},{2000, 86},{3000, 114},{4000, 120},{5000, 122},{6000, 126},{0, 132}
+{0, 0},{3, 1},{1000, 79},{2000, 86},{3000, 116},{4000, 122},{5000, 126},{6000, 130},{0, 136}
};
-static const ProtobufCEnumValueIndex message_type__enum_values_by_name[132] =
+static const ProtobufCEnumValueIndex message_type__enum_values_by_name[136] =
{
- { "AbortJobRequest", 116 },
- { "AbortJobResponse", 117 },
+ { "AbortJobRequest", 118 },
+ { "AbortJobResponse", 119 },
{ "CalculateRequest", 1 },
{ "CalculateResponse", 2 },
- { "ConnectRequest", 128 },
- { "ConnectResponse", 129 },
- { "DebugLogRequest", 120 },
- { "DebugLogResponse", 121 },
+ { "ConnectRequest", 132 },
+ { "ConnectResponse", 133 },
{ "DirectSynchronizationRequest", 82 },
{ "DirectSynchronizationResponse", 83 },
- { "DisconnectRequest", 130 },
- { "DisconnectResponse", 131 },
+ { "DisconnectRequest", 134 },
+ { "DisconnectResponse", 135 },
{ "DispenserAbortHomingRequest", 96 },
{ "DispenserAbortHomingResponse", 97 },
{ "DispenserAbortJoggingRequest", 102 },
@@ -170,10 +172,10 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[132] =
{ "ExternalBridgeUdpDiscoveryPacket", 79 },
{ "ExternalClientLoginRequest", 80 },
{ "ExternalClientLoginResponse", 81 },
- { "JobRequest", 114 },
- { "JobResponse", 115 },
- { "KeepAliveRequest", 126 },
- { "KeepAliveResponse", 127 },
+ { "JobRequest", 116 },
+ { "JobResponse", 117 },
+ { "KeepAliveRequest", 130 },
+ { "KeepAliveResponse", 131 },
{ "MotorAbortHomingRequest", 88 },
{ "MotorAbortHomingResponse", 89 },
{ "MotorAbortJoggingRequest", 94 },
@@ -187,14 +189,20 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[132] =
{ "OverrideDataBaseResponse", 85 },
{ "ProgressRequest", 3 },
{ "ProgressResponse", 4 },
- { "PushDiagnosticsRequest", 86 },
- { "PushDiagnosticsResponse", 87 },
{ "ResolveEventRequest", 112 },
{ "ResolveEventResponse", 113 },
{ "SetComponentValueRequest", 110 },
{ "SetComponentValueResponse", 111 },
{ "SetDigitalOutRequest", 104 },
{ "SetDigitalOutResponse", 105 },
+ { "StartDebugLogRequest", 122 },
+ { "StartDebugLogResponse", 123 },
+ { "StartDiagnosticsRequest", 86 },
+ { "StartDiagnosticsResponse", 87 },
+ { "StopDebugLogRequest", 124 },
+ { "StopDebugLogResponse", 125 },
+ { "StopDiagnosticsRequest", 114 },
+ { "StopDiagnosticsResponse", 115 },
{ "StubCartridgeReadRequest", 5 },
{ "StubCartridgeReadResponse", 6 },
{ "StubCartridgeWriteRequest", 7 },
@@ -269,16 +277,16 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[132] =
{ "StubTivaWriteRegResponse", 78 },
{ "StubValveRequest", 29 },
{ "StubValveResponse", 30 },
- { "SystemResetRequest", 124 },
- { "SystemResetResponse", 125 },
+ { "SystemResetRequest", 128 },
+ { "SystemResetResponse", 129 },
{ "ThreadAbortJoggingRequest", 108 },
{ "ThreadAbortJoggingResponse", 109 },
{ "ThreadJoggingRequest", 106 },
{ "ThreadJoggingResponse", 107 },
- { "UploadHardwareConfigurationRequest", 122 },
- { "UploadHardwareConfigurationResponse", 123 },
- { "UploadProcessParametersRequest", 118 },
- { "UploadProcessParametersResponse", 119 },
+ { "UploadHardwareConfigurationRequest", 126 },
+ { "UploadHardwareConfigurationResponse", 127 },
+ { "UploadProcessParametersRequest", 120 },
+ { "UploadProcessParametersResponse", 121 },
};
const ProtobufCEnumDescriptor message_type__descriptor =
{
@@ -287,9 +295,9 @@ const ProtobufCEnumDescriptor message_type__descriptor =
"MessageType",
"MessageType",
"",
- 132,
+ 136,
message_type__enum_values_by_number,
- 132,
+ 136,
message_type__enum_values_by_name,
8,
message_type__value_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h
index 999f7e485..0e7e17540 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h
@@ -106,8 +106,8 @@ typedef enum _MessageType {
MESSAGE_TYPE__DirectSynchronizationResponse = 1004,
MESSAGE_TYPE__OverrideDataBaseRequest = 1005,
MESSAGE_TYPE__OverrideDataBaseResponse = 1006,
- MESSAGE_TYPE__PushDiagnosticsRequest = 2000,
- MESSAGE_TYPE__PushDiagnosticsResponse = 2001,
+ MESSAGE_TYPE__StartDiagnosticsRequest = 2000,
+ MESSAGE_TYPE__StartDiagnosticsResponse = 2001,
MESSAGE_TYPE__MotorAbortHomingRequest = 2002,
MESSAGE_TYPE__MotorAbortHomingResponse = 2003,
MESSAGE_TYPE__MotorHomingRequest = 2004,
@@ -134,14 +134,18 @@ typedef enum _MessageType {
MESSAGE_TYPE__SetComponentValueResponse = 2025,
MESSAGE_TYPE__ResolveEventRequest = 2026,
MESSAGE_TYPE__ResolveEventResponse = 2027,
+ MESSAGE_TYPE__StopDiagnosticsRequest = 2028,
+ MESSAGE_TYPE__StopDiagnosticsResponse = 2029,
MESSAGE_TYPE__JobRequest = 3000,
MESSAGE_TYPE__JobResponse = 3001,
MESSAGE_TYPE__AbortJobRequest = 3002,
MESSAGE_TYPE__AbortJobResponse = 3003,
MESSAGE_TYPE__UploadProcessParametersRequest = 3004,
MESSAGE_TYPE__UploadProcessParametersResponse = 3005,
- MESSAGE_TYPE__DebugLogRequest = 4000,
- MESSAGE_TYPE__DebugLogResponse = 4001,
+ MESSAGE_TYPE__StartDebugLogRequest = 4000,
+ MESSAGE_TYPE__StartDebugLogResponse = 4001,
+ MESSAGE_TYPE__StopDebugLogRequest = 4002,
+ MESSAGE_TYPE__StopDebugLogResponse = 4003,
MESSAGE_TYPE__UploadHardwareConfigurationRequest = 5000,
MESSAGE_TYPE__UploadHardwareConfigurationResponse = 5001,
MESSAGE_TYPE__SystemResetRequest = 5002,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogRequest.pb-c.c
deleted file mode 100644
index e8faeddcb..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogRequest.pb-c.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Generated by the protocol buffer compiler. DO NOT EDIT! */
-/* Generated from: DebugLogRequest.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "DebugLogRequest.pb-c.h"
-void debug_log_request__init
- (DebugLogRequest *message)
-{
- static const DebugLogRequest init_value = DEBUG_LOG_REQUEST__INIT;
- *message = init_value;
-}
-size_t debug_log_request__get_packed_size
- (const DebugLogRequest *message)
-{
- assert(message->base.descriptor == &debug_log_request__descriptor);
- return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t debug_log_request__pack
- (const DebugLogRequest *message,
- uint8_t *out)
-{
- assert(message->base.descriptor == &debug_log_request__descriptor);
- return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t debug_log_request__pack_to_buffer
- (const DebugLogRequest *message,
- ProtobufCBuffer *buffer)
-{
- assert(message->base.descriptor == &debug_log_request__descriptor);
- return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-DebugLogRequest *
- debug_log_request__unpack
- (ProtobufCAllocator *allocator,
- size_t len,
- const uint8_t *data)
-{
- return (DebugLogRequest *)
- protobuf_c_message_unpack (&debug_log_request__descriptor,
- allocator, len, data);
-}
-void debug_log_request__free_unpacked
- (DebugLogRequest *message,
- ProtobufCAllocator *allocator)
-{
- if(!message)
- return;
- assert(message->base.descriptor == &debug_log_request__descriptor);
- protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-#define debug_log_request__field_descriptors NULL
-#define debug_log_request__field_indices_by_name NULL
-#define debug_log_request__number_ranges NULL
-const ProtobufCMessageDescriptor debug_log_request__descriptor =
-{
- PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
- "DebugLogRequest",
- "DebugLogRequest",
- "DebugLogRequest",
- "",
- sizeof(DebugLogRequest),
- 0,
- debug_log_request__field_descriptors,
- debug_log_request__field_indices_by_name,
- 0, debug_log_request__number_ranges,
- (ProtobufCMessageInit) debug_log_request__init,
- NULL,NULL,NULL /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogRequest.pb-c.h
deleted file mode 100644
index 2507b3068..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogRequest.pb-c.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Generated by the protocol buffer compiler. DO NOT EDIT! */
-/* Generated from: DebugLogRequest.proto */
-
-#ifndef PROTOBUF_C_DebugLogRequest_2eproto__INCLUDED
-#define PROTOBUF_C_DebugLogRequest_2eproto__INCLUDED
-
-#include <protobuf-c/protobuf-c.h>
-
-PROTOBUF_C__BEGIN_DECLS
-
-#if PROTOBUF_C_VERSION_NUMBER < 1003000
-# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
-#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
-# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
-#endif
-
-
-typedef struct _DebugLogRequest DebugLogRequest;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct _DebugLogRequest
-{
- ProtobufCMessage base;
-};
-#define DEBUG_LOG_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&debug_log_request__descriptor) \
- }
-
-
-/* DebugLogRequest methods */
-void debug_log_request__init
- (DebugLogRequest *message);
-size_t debug_log_request__get_packed_size
- (const DebugLogRequest *message);
-size_t debug_log_request__pack
- (const DebugLogRequest *message,
- uint8_t *out);
-size_t debug_log_request__pack_to_buffer
- (const DebugLogRequest *message,
- ProtobufCBuffer *buffer);
-DebugLogRequest *
- debug_log_request__unpack
- (ProtobufCAllocator *allocator,
- size_t len,
- const uint8_t *data);
-void debug_log_request__free_unpacked
- (DebugLogRequest *message,
- ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*DebugLogRequest_Closure)
- (const DebugLogRequest *message,
- void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor debug_log_request__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif /* PROTOBUF_C_DebugLogRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogRequest.pb-c.c
new file mode 100644
index 000000000..4c9f854c8
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogRequest.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler. DO NOT EDIT! */
+/* Generated from: StartDebugLogRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "StartDebugLogRequest.pb-c.h"
+void start_debug_log_request__init
+ (StartDebugLogRequest *message)
+{
+ static const StartDebugLogRequest init_value = START_DEBUG_LOG_REQUEST__INIT;
+ *message = init_value;
+}
+size_t start_debug_log_request__get_packed_size
+ (const StartDebugLogRequest *message)
+{
+ assert(message->base.descriptor == &start_debug_log_request__descriptor);
+ return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t start_debug_log_request__pack
+ (const StartDebugLogRequest *message,
+ uint8_t *out)
+{
+ assert(message->base.descriptor == &start_debug_log_request__descriptor);
+ return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t start_debug_log_request__pack_to_buffer
+ (const StartDebugLogRequest *message,
+ ProtobufCBuffer *buffer)
+{
+ assert(message->base.descriptor == &start_debug_log_request__descriptor);
+ return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+StartDebugLogRequest *
+ start_debug_log_request__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data)
+{
+ return (StartDebugLogRequest *)
+ protobuf_c_message_unpack (&start_debug_log_request__descriptor,
+ allocator, len, data);
+}
+void start_debug_log_request__free_unpacked
+ (StartDebugLogRequest *message,
+ ProtobufCAllocator *allocator)
+{
+ if(!message)
+ return;
+ assert(message->base.descriptor == &start_debug_log_request__descriptor);
+ protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define start_debug_log_request__field_descriptors NULL
+#define start_debug_log_request__field_indices_by_name NULL
+#define start_debug_log_request__number_ranges NULL
+const ProtobufCMessageDescriptor start_debug_log_request__descriptor =
+{
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+ "StartDebugLogRequest",
+ "StartDebugLogRequest",
+ "StartDebugLogRequest",
+ "",
+ sizeof(StartDebugLogRequest),
+ 0,
+ start_debug_log_request__field_descriptors,
+ start_debug_log_request__field_indices_by_name,
+ 0, start_debug_log_request__number_ranges,
+ (ProtobufCMessageInit) start_debug_log_request__init,
+ NULL,NULL,NULL /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogRequest.pb-c.h
new file mode 100644
index 000000000..13de9c765
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogRequest.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler. DO NOT EDIT! */
+/* Generated from: StartDebugLogRequest.proto */
+
+#ifndef PROTOBUF_C_StartDebugLogRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StartDebugLogRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+typedef struct _StartDebugLogRequest StartDebugLogRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct _StartDebugLogRequest
+{
+ ProtobufCMessage base;
+};
+#define START_DEBUG_LOG_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&start_debug_log_request__descriptor) \
+ }
+
+
+/* StartDebugLogRequest methods */
+void start_debug_log_request__init
+ (StartDebugLogRequest *message);
+size_t start_debug_log_request__get_packed_size
+ (const StartDebugLogRequest *message);
+size_t start_debug_log_request__pack
+ (const StartDebugLogRequest *message,
+ uint8_t *out);
+size_t start_debug_log_request__pack_to_buffer
+ (const StartDebugLogRequest *message,
+ ProtobufCBuffer *buffer);
+StartDebugLogRequest *
+ start_debug_log_request__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data);
+void start_debug_log_request__free_unpacked
+ (StartDebugLogRequest *message,
+ ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*StartDebugLogRequest_Closure)
+ (const StartDebugLogRequest *message,
+ void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor start_debug_log_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif /* PROTOBUF_C_StartDebugLogRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.c
index 36e08e981..c9a1e6405 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogResponse.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.c
@@ -1,66 +1,66 @@
/* Generated by the protocol buffer compiler. DO NOT EDIT! */
-/* Generated from: DebugLogResponse.proto */
+/* Generated from: StartDebugLogResponse.proto */
/* Do not generate deprecated warnings for self */
#ifndef PROTOBUF_C__NO_DEPRECATED
#define PROTOBUF_C__NO_DEPRECATED
#endif
-#include "DebugLogResponse.pb-c.h"
-void debug_log_response__init
- (DebugLogResponse *message)
+#include "StartDebugLogResponse.pb-c.h"
+void start_debug_log_response__init
+ (StartDebugLogResponse *message)
{
- static const DebugLogResponse init_value = DEBUG_LOG_RESPONSE__INIT;
+ static const StartDebugLogResponse init_value = START_DEBUG_LOG_RESPONSE__INIT;
*message = init_value;
}
-size_t debug_log_response__get_packed_size
- (const DebugLogResponse *message)
+size_t start_debug_log_response__get_packed_size
+ (const StartDebugLogResponse *message)
{
- assert(message->base.descriptor == &debug_log_response__descriptor);
+ assert(message->base.descriptor == &start_debug_log_response__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
-size_t debug_log_response__pack
- (const DebugLogResponse *message,
+size_t start_debug_log_response__pack
+ (const StartDebugLogResponse *message,
uint8_t *out)
{
- assert(message->base.descriptor == &debug_log_response__descriptor);
+ assert(message->base.descriptor == &start_debug_log_response__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
-size_t debug_log_response__pack_to_buffer
- (const DebugLogResponse *message,
+size_t start_debug_log_response__pack_to_buffer
+ (const StartDebugLogResponse *message,
ProtobufCBuffer *buffer)
{
- assert(message->base.descriptor == &debug_log_response__descriptor);
+ assert(message->base.descriptor == &start_debug_log_response__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
-DebugLogResponse *
- debug_log_response__unpack
+StartDebugLogResponse *
+ start_debug_log_response__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data)
{
- return (DebugLogResponse *)
- protobuf_c_message_unpack (&debug_log_response__descriptor,
+ return (StartDebugLogResponse *)
+ protobuf_c_message_unpack (&start_debug_log_response__descriptor,
allocator, len, data);
}
-void debug_log_response__free_unpacked
- (DebugLogResponse *message,
+void start_debug_log_response__free_unpacked
+ (StartDebugLogResponse *message,
ProtobufCAllocator *allocator)
{
if(!message)
return;
- assert(message->base.descriptor == &debug_log_response__descriptor);
+ assert(message->base.descriptor == &start_debug_log_response__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
-static const ProtobufCFieldDescriptor debug_log_response__field_descriptors[6] =
+static const ProtobufCFieldDescriptor start_debug_log_response__field_descriptors[6] =
{
{
"Category",
1,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_ENUM,
- offsetof(DebugLogResponse, has_category),
- offsetof(DebugLogResponse, category),
+ offsetof(StartDebugLogResponse, has_category),
+ offsetof(StartDebugLogResponse, category),
&debug_log_category__descriptor,
NULL,
0, /* flags */
@@ -72,7 +72,7 @@ static const ProtobufCFieldDescriptor debug_log_response__field_descriptors[6] =
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- offsetof(DebugLogResponse, filename),
+ offsetof(StartDebugLogResponse, filename),
NULL,
NULL,
0, /* flags */
@@ -83,8 +83,8 @@ static const ProtobufCFieldDescriptor debug_log_response__field_descriptors[6] =
3,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_UINT32,
- offsetof(DebugLogResponse, has_linenumber),
- offsetof(DebugLogResponse, linenumber),
+ offsetof(StartDebugLogResponse, has_linenumber),
+ offsetof(StartDebugLogResponse, linenumber),
NULL,
NULL,
0, /* flags */
@@ -95,8 +95,8 @@ static const ProtobufCFieldDescriptor debug_log_response__field_descriptors[6] =
4,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_UINT32,
- offsetof(DebugLogResponse, has_filter),
- offsetof(DebugLogResponse, filter),
+ offsetof(StartDebugLogResponse, has_filter),
+ offsetof(StartDebugLogResponse, filter),
NULL,
NULL,
0, /* flags */
@@ -108,7 +108,7 @@ static const ProtobufCFieldDescriptor debug_log_response__field_descriptors[6] =
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- offsetof(DebugLogResponse, message),
+ offsetof(StartDebugLogResponse, message),
NULL,
NULL,
0, /* flags */
@@ -119,15 +119,15 @@ static const ProtobufCFieldDescriptor debug_log_response__field_descriptors[6] =
6,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_UINT32,
- offsetof(DebugLogResponse, has_moduleid),
- offsetof(DebugLogResponse, moduleid),
+ offsetof(StartDebugLogResponse, has_moduleid),
+ offsetof(StartDebugLogResponse, moduleid),
NULL,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
-static const unsigned debug_log_response__field_indices_by_name[] = {
+static const unsigned start_debug_log_response__field_indices_by_name[] = {
0, /* field[0] = Category */
1, /* field[1] = FileName */
3, /* field[3] = Filter */
@@ -135,23 +135,23 @@ static const unsigned debug_log_response__field_indices_by_name[] = {
4, /* field[4] = Message */
5, /* field[5] = ModuleId */
};
-static const ProtobufCIntRange debug_log_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange start_debug_log_response__number_ranges[1 + 1] =
{
{ 1, 0 },
{ 0, 6 }
};
-const ProtobufCMessageDescriptor debug_log_response__descriptor =
+const ProtobufCMessageDescriptor start_debug_log_response__descriptor =
{
PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
- "DebugLogResponse",
- "DebugLogResponse",
- "DebugLogResponse",
+ "StartDebugLogResponse",
+ "StartDebugLogResponse",
+ "StartDebugLogResponse",
"",
- sizeof(DebugLogResponse),
+ sizeof(StartDebugLogResponse),
6,
- debug_log_response__field_descriptors,
- debug_log_response__field_indices_by_name,
- 1, debug_log_response__number_ranges,
- (ProtobufCMessageInit) debug_log_response__init,
+ start_debug_log_response__field_descriptors,
+ start_debug_log_response__field_indices_by_name,
+ 1, start_debug_log_response__number_ranges,
+ (ProtobufCMessageInit) start_debug_log_response__init,
NULL,NULL,NULL /* reserved[123] */
};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.h
index 414c07188..4301223de 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogResponse.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StartDebugLogResponse.pb-c.h
@@ -1,8 +1,8 @@
/* Generated by the protocol buffer compiler. DO NOT EDIT! */
-/* Generated from: DebugLogResponse.proto */
+/* Generated from: StartDebugLogResponse.proto */
-#ifndef PROTOBUF_C_DebugLogResponse_2eproto__INCLUDED
-#define PROTOBUF_C_DebugLogResponse_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StartDebugLogResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StartDebugLogResponse_2eproto__INCLUDED
#include <protobuf-c/protobuf-c.h>
@@ -16,7 +16,7 @@ PROTOBUF_C__BEGIN_DECLS
#include "DebugLogCategory.pb-c.h"
-typedef struct _DebugLogResponse DebugLogResponse;
+typedef struct _StartDebugLogResponse StartDebugLogResponse;
/* --- enums --- */
@@ -24,7 +24,7 @@ typedef struct _DebugLogResponse DebugLogResponse;
/* --- messages --- */
-struct _DebugLogResponse
+struct _StartDebugLogResponse
{
ProtobufCMessage base;
protobuf_c_boolean has_category;
@@ -38,34 +38,34 @@ struct _DebugLogResponse
protobuf_c_boolean has_moduleid;
uint32_t moduleid;
};
-#define DEBUG_LOG_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&debug_log_response__descriptor) \
+#define START_DEBUG_LOG_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&start_debug_log_response__descriptor) \
, 0, DEBUG_LOG_CATEGORY__Info, NULL, 0, 0, 0, 0, NULL, 0, 0 }
-/* DebugLogResponse methods */
-void debug_log_response__init
- (DebugLogResponse *message);
-size_t debug_log_response__get_packed_size
- (const DebugLogResponse *message);
-size_t debug_log_response__pack
- (const DebugLogResponse *message,
+/* StartDebugLogResponse methods */
+void start_debug_log_response__init
+ (StartDebugLogResponse *message);
+size_t start_debug_log_response__get_packed_size
+ (const StartDebugLogResponse *message);
+size_t start_debug_log_response__pack
+ (const StartDebugLogResponse *message,
uint8_t *out);
-size_t debug_log_response__pack_to_buffer
- (const DebugLogResponse *message,
+size_t start_debug_log_response__pack_to_buffer
+ (const StartDebugLogResponse *message,
ProtobufCBuffer *buffer);
-DebugLogResponse *
- debug_log_response__unpack
+StartDebugLogResponse *
+ start_debug_log_response__unpack
(ProtobufCAllocator *allocator,
size_t len,
const uint8_t *data);
-void debug_log_response__free_unpacked
- (DebugLogResponse *message,
+void start_debug_log_response__free_unpacked
+ (StartDebugLogResponse *message,
ProtobufCAllocator *allocator);
/* --- per-message closures --- */
-typedef void (*DebugLogResponse_Closure)
- (const DebugLogResponse *message,
+typedef void (*StartDebugLogResponse_Closure)
+ (const StartDebugLogResponse *message,
void *closure_data);
/* --- services --- */
@@ -73,9 +73,9 @@ typedef void (*DebugLogResponse_Closure)
/* --- descriptors --- */
-extern const ProtobufCMessageDescriptor debug_log_response__descriptor;
+extern const ProtobufCMessageDescriptor start_debug_log_response__descriptor;
PROTOBUF_C__END_DECLS
-#endif /* PROTOBUF_C_DebugLogResponse_2eproto__INCLUDED */
+#endif /* PROTOBUF_C_StartDebugLogResponse_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogRequest.pb-c.c
new file mode 100644
index 000000000..74194f1d3
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogRequest.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler. DO NOT EDIT! */
+/* Generated from: StopDebugLogRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "StopDebugLogRequest.pb-c.h"
+void stop_debug_log_request__init
+ (StopDebugLogRequest *message)
+{
+ static const StopDebugLogRequest init_value = STOP_DEBUG_LOG_REQUEST__INIT;
+ *message = init_value;
+}
+size_t stop_debug_log_request__get_packed_size
+ (const StopDebugLogRequest *message)
+{
+ assert(message->base.descriptor == &stop_debug_log_request__descriptor);
+ return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t stop_debug_log_request__pack
+ (const StopDebugLogRequest *message,
+ uint8_t *out)
+{
+ assert(message->base.descriptor == &stop_debug_log_request__descriptor);
+ return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t stop_debug_log_request__pack_to_buffer
+ (const StopDebugLogRequest *message,
+ ProtobufCBuffer *buffer)
+{
+ assert(message->base.descriptor == &stop_debug_log_request__descriptor);
+ return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+StopDebugLogRequest *
+ stop_debug_log_request__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data)
+{
+ return (StopDebugLogRequest *)
+ protobuf_c_message_unpack (&stop_debug_log_request__descriptor,
+ allocator, len, data);
+}
+void stop_debug_log_request__free_unpacked
+ (StopDebugLogRequest *message,
+ ProtobufCAllocator *allocator)
+{
+ if(!message)
+ return;
+ assert(message->base.descriptor == &stop_debug_log_request__descriptor);
+ protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define stop_debug_log_request__field_descriptors NULL
+#define stop_debug_log_request__field_indices_by_name NULL
+#define stop_debug_log_request__number_ranges NULL
+const ProtobufCMessageDescriptor stop_debug_log_request__descriptor =
+{
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+ "StopDebugLogRequest",
+ "StopDebugLogRequest",
+ "StopDebugLogRequest",
+ "",
+ sizeof(StopDebugLogRequest),
+ 0,
+ stop_debug_log_request__field_descriptors,
+ stop_debug_log_request__field_indices_by_name,
+ 0, stop_debug_log_request__number_ranges,
+ (ProtobufCMessageInit) stop_debug_log_request__init,
+ NULL,NULL,NULL /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogRequest.pb-c.h
new file mode 100644
index 000000000..ffd8ea9f9
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogRequest.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler. DO NOT EDIT! */
+/* Generated from: StopDebugLogRequest.proto */
+
+#ifndef PROTOBUF_C_StopDebugLogRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StopDebugLogRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+typedef struct _StopDebugLogRequest StopDebugLogRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct _StopDebugLogRequest
+{
+ ProtobufCMessage base;
+};
+#define STOP_DEBUG_LOG_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stop_debug_log_request__descriptor) \
+ }
+
+
+/* StopDebugLogRequest methods */
+void stop_debug_log_request__init
+ (StopDebugLogRequest *message);
+size_t stop_debug_log_request__get_packed_size
+ (const StopDebugLogRequest *message);
+size_t stop_debug_log_request__pack
+ (const StopDebugLogRequest *message,
+ uint8_t *out);
+size_t stop_debug_log_request__pack_to_buffer
+ (const StopDebugLogRequest *message,
+ ProtobufCBuffer *buffer);
+StopDebugLogRequest *
+ stop_debug_log_request__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data);
+void stop_debug_log_request__free_unpacked
+ (StopDebugLogRequest *message,
+ ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*StopDebugLogRequest_Closure)
+ (const StopDebugLogRequest *message,
+ void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor stop_debug_log_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif /* PROTOBUF_C_StopDebugLogRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogResponse.pb-c.c
new file mode 100644
index 000000000..7a885594e
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogResponse.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler. DO NOT EDIT! */
+/* Generated from: StopDebugLogResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "StopDebugLogResponse.pb-c.h"
+void stop_debug_log_response__init
+ (StopDebugLogResponse *message)
+{
+ static const StopDebugLogResponse init_value = STOP_DEBUG_LOG_RESPONSE__INIT;
+ *message = init_value;
+}
+size_t stop_debug_log_response__get_packed_size
+ (const StopDebugLogResponse *message)
+{
+ assert(message->base.descriptor == &stop_debug_log_response__descriptor);
+ return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t stop_debug_log_response__pack
+ (const StopDebugLogResponse *message,
+ uint8_t *out)
+{
+ assert(message->base.descriptor == &stop_debug_log_response__descriptor);
+ return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t stop_debug_log_response__pack_to_buffer
+ (const StopDebugLogResponse *message,
+ ProtobufCBuffer *buffer)
+{
+ assert(message->base.descriptor == &stop_debug_log_response__descriptor);
+ return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+StopDebugLogResponse *
+ stop_debug_log_response__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data)
+{
+ return (StopDebugLogResponse *)
+ protobuf_c_message_unpack (&stop_debug_log_response__descriptor,
+ allocator, len, data);
+}
+void stop_debug_log_response__free_unpacked
+ (StopDebugLogResponse *message,
+ ProtobufCAllocator *allocator)
+{
+ if(!message)
+ return;
+ assert(message->base.descriptor == &stop_debug_log_response__descriptor);
+ protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define stop_debug_log_response__field_descriptors NULL
+#define stop_debug_log_response__field_indices_by_name NULL
+#define stop_debug_log_response__number_ranges NULL
+const ProtobufCMessageDescriptor stop_debug_log_response__descriptor =
+{
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+ "StopDebugLogResponse",
+ "StopDebugLogResponse",
+ "StopDebugLogResponse",
+ "",
+ sizeof(StopDebugLogResponse),
+ 0,
+ stop_debug_log_response__field_descriptors,
+ stop_debug_log_response__field_indices_by_name,
+ 0, stop_debug_log_response__number_ranges,
+ (ProtobufCMessageInit) stop_debug_log_response__init,
+ NULL,NULL,NULL /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogResponse.pb-c.h
new file mode 100644
index 000000000..2a4c21b85
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/StopDebugLogResponse.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler. DO NOT EDIT! */
+/* Generated from: StopDebugLogResponse.proto */
+
+#ifndef PROTOBUF_C_StopDebugLogResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StopDebugLogResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+typedef struct _StopDebugLogResponse StopDebugLogResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct _StopDebugLogResponse
+{
+ ProtobufCMessage base;
+};
+#define STOP_DEBUG_LOG_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stop_debug_log_response__descriptor) \
+ }
+
+
+/* StopDebugLogResponse methods */
+void stop_debug_log_response__init
+ (StopDebugLogResponse *message);
+size_t stop_debug_log_response__get_packed_size
+ (const StopDebugLogResponse *message);
+size_t stop_debug_log_response__pack
+ (const StopDebugLogResponse *message,
+ uint8_t *out);
+size_t stop_debug_log_response__pack_to_buffer
+ (const StopDebugLogResponse *message,
+ ProtobufCBuffer *buffer);
+StopDebugLogResponse *
+ stop_debug_log_response__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data);
+void stop_debug_log_response__free_unpacked
+ (StopDebugLogResponse *message,
+ ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*StopDebugLogResponse_Closure)
+ (const StopDebugLogResponse *message,
+ void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor stop_debug_log_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif /* PROTOBUF_C_StopDebugLogResponse_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareDispenser.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareDispenser.pb-c.c
index 1691150ab..fdfef474f 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareDispenser.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareDispenser.pb-c.c
@@ -52,7 +52,7 @@ void hardware_dispenser__free_unpacked
assert(message->base.descriptor == &hardware_dispenser__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
-static const ProtobufCFieldDescriptor hardware_dispenser__field_descriptors[15] =
+static const ProtobufCFieldDescriptor hardware_dispenser__field_descriptors[4] =
{
{
"HardwareDispenserType",
@@ -67,168 +67,36 @@ static const ProtobufCFieldDescriptor hardware_dispenser__field_descriptors[15]
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
- "NlPerPulse",
+ "Index",
2,
PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_DOUBLE,
- offsetof(HardwareDispenser, has_nlperpulse),
- offsetof(HardwareDispenser, nlperpulse),
+ PROTOBUF_C_TYPE_INT32,
+ offsetof(HardwareDispenser, has_index),
+ offsetof(HardwareDispenser, index),
NULL,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
- "Capacity",
+ "NlPerPulse",
3,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_DOUBLE,
- offsetof(HardwareDispenser, has_capacity),
- offsetof(HardwareDispenser, capacity),
+ offsetof(HardwareDispenser, has_nlperpulse),
+ offsetof(HardwareDispenser, nlperpulse),
NULL,
NULL,
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
- "MinFrequency",
+ "Capacity",
4,
PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_INT32,
- offsetof(HardwareDispenser, has_minfrequency),
- offsetof(HardwareDispenser, minfrequency),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "MaxFrequency",
- 5,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_INT32,
- offsetof(HardwareDispenser, has_maxfrequency),
- offsetof(HardwareDispenser, maxfrequency),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "MinMicroStep",
- 6,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_INT32,
- offsetof(HardwareDispenser, has_minmicrostep),
- offsetof(HardwareDispenser, minmicrostep),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "MaxMicroStep",
- 7,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_INT32,
- offsetof(HardwareDispenser, has_maxmicrostep),
- offsetof(HardwareDispenser, maxmicrostep),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "CorrectionGain",
- 8,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_DOUBLE,
- offsetof(HardwareDispenser, has_correctiongain),
- offsetof(HardwareDispenser, correctiongain),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "RatioToDryerSpeed",
- 9,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_DOUBLE,
- offsetof(HardwareDispenser, has_ratiotodryerspeed),
- offsetof(HardwareDispenser, ratiotodryerspeed),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "Kp",
- 10,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_DOUBLE,
- offsetof(HardwareDispenser, has_kp),
- offsetof(HardwareDispenser, kp),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "Ki",
- 11,
- PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_DOUBLE,
- offsetof(HardwareDispenser, has_ki),
- offsetof(HardwareDispenser, ki),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "Kd",
- 12,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_DOUBLE,
- offsetof(HardwareDispenser, has_kd),
- offsetof(HardwareDispenser, kd),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "ChangeSlope",
- 13,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_DOUBLE,
- offsetof(HardwareDispenser, has_changeslope),
- offsetof(HardwareDispenser, changeslope),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "HighLengthMicroSecond",
- 14,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_DOUBLE,
- offsetof(HardwareDispenser, has_highlengthmicrosecond),
- offsetof(HardwareDispenser, highlengthmicrosecond),
- NULL,
- NULL,
- 0, /* flags */
- 0,NULL,NULL /* reserved1,reserved2, etc */
- },
- {
- "ControlTiming",
- 15,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_TYPE_INT32,
- offsetof(HardwareDispenser, has_controltiming),
- offsetof(HardwareDispenser, controltiming),
+ offsetof(HardwareDispenser, has_capacity),
+ offsetof(HardwareDispenser, capacity),
NULL,
NULL,
0, /* flags */
@@ -236,26 +104,15 @@ static const ProtobufCFieldDescriptor hardware_dispenser__field_descriptors[15]
},
};
static const unsigned hardware_dispenser__field_indices_by_name[] = {
- 2, /* field[2] = Capacity */
- 12, /* field[12] = ChangeSlope */
- 14, /* field[14] = ControlTiming */
- 7, /* field[7] = CorrectionGain */
+ 3, /* field[3] = Capacity */
0, /* field[0] = HardwareDispenserType */
- 13, /* field[13] = HighLengthMicroSecond */
- 11, /* field[11] = Kd */
- 10, /* field[10] = Ki */
- 9, /* field[9] = Kp */
- 4, /* field[4] = MaxFrequency */
- 6, /* field[6] = MaxMicroStep */
- 3, /* field[3] = MinFrequency */
- 5, /* field[5] = MinMicroStep */
- 1, /* field[1] = NlPerPulse */
- 8, /* field[8] = RatioToDryerSpeed */
+ 1, /* field[1] = Index */
+ 2, /* field[2] = NlPerPulse */
};
static const ProtobufCIntRange hardware_dispenser__number_ranges[1 + 1] =
{
{ 1, 0 },
- { 0, 15 }
+ { 0, 4 }
};
const ProtobufCMessageDescriptor hardware_dispenser__descriptor =
{
@@ -265,7 +122,7 @@ const ProtobufCMessageDescriptor hardware_dispenser__descriptor =
"HardwareDispenser",
"",
sizeof(HardwareDispenser),
- 15,
+ 4,
hardware_dispenser__field_descriptors,
hardware_dispenser__field_indices_by_name,
1, hardware_dispenser__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareDispenser.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareDispenser.pb-c.h
index bde6bad40..cd910b833 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareDispenser.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareDispenser.pb-c.h
@@ -29,38 +29,16 @@ struct _HardwareDispenser
ProtobufCMessage base;
protobuf_c_boolean has_hardwaredispensertype;
HardwareDispenserType hardwaredispensertype;
+ protobuf_c_boolean has_index;
+ int32_t index;
protobuf_c_boolean has_nlperpulse;
double nlperpulse;
protobuf_c_boolean has_capacity;
double capacity;
- protobuf_c_boolean has_minfrequency;
- int32_t minfrequency;
- protobuf_c_boolean has_maxfrequency;
- int32_t maxfrequency;
- protobuf_c_boolean has_minmicrostep;
- int32_t minmicrostep;
- protobuf_c_boolean has_maxmicrostep;
- int32_t maxmicrostep;
- protobuf_c_boolean has_correctiongain;
- double correctiongain;
- protobuf_c_boolean has_ratiotodryerspeed;
- double ratiotodryerspeed;
- protobuf_c_boolean has_kp;
- double kp;
- protobuf_c_boolean has_ki;
- double ki;
- protobuf_c_boolean has_kd;
- double kd;
- protobuf_c_boolean has_changeslope;
- double changeslope;
- protobuf_c_boolean has_highlengthmicrosecond;
- double highlengthmicrosecond;
- protobuf_c_boolean has_controltiming;
- int32_t controltiming;
};
#define HARDWARE_DISPENSER__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&hardware_dispenser__descriptor) \
- , 0, HARDWARE_DISPENSER_TYPE__StandardDispenser, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+ , 0, HARDWARE_DISPENSER_TYPE__StandardDispenser, 0, 0, 0, 0, 0, 0 }
/* HardwareDispenser methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.c
index fd25947bd..a05be7ac2 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.c
@@ -52,7 +52,7 @@ void hardware_motor__free_unpacked
assert(message->base.descriptor == &hardware_motor__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
-static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[12] =
+static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[20] =
{
{
"HardwareMotorType",
@@ -198,25 +198,129 @@ static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[12] =
0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
+ {
+ "KvalHold",
+ 13,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_INT32,
+ offsetof(HardwareMotor, has_kvalhold),
+ offsetof(HardwareMotor, kvalhold),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "KvalRun",
+ 14,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_INT32,
+ offsetof(HardwareMotor, has_kvalrun),
+ offsetof(HardwareMotor, kvalrun),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "KvalAcc",
+ 15,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_INT32,
+ offsetof(HardwareMotor, has_kvalacc),
+ offsetof(HardwareMotor, kvalacc),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "KvalDec",
+ 16,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_INT32,
+ offsetof(HardwareMotor, has_kvaldec),
+ offsetof(HardwareMotor, kvaldec),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "OverCurrentThreshold",
+ 17,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_INT32,
+ offsetof(HardwareMotor, has_overcurrentthreshold),
+ offsetof(HardwareMotor, overcurrentthreshold),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "StallThreshold",
+ 18,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_INT32,
+ offsetof(HardwareMotor, has_stallthreshold),
+ offsetof(HardwareMotor, stallthreshold),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "ThermalCompensationFactor",
+ 19,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_INT32,
+ offsetof(HardwareMotor, has_thermalcompensationfactor),
+ offsetof(HardwareMotor, thermalcompensationfactor),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "LowSpeedOptimization",
+ 20,
+ PROTOBUF_C_LABEL_OPTIONAL,
+ PROTOBUF_C_TYPE_BOOL,
+ offsetof(HardwareMotor, has_lowspeedoptimization),
+ offsetof(HardwareMotor, lowspeedoptimization),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
};
static const unsigned hardware_motor__field_indices_by_name[] = {
10, /* field[10] = ConfigWord */
11, /* field[11] = DirectionThreadWize */
0, /* field[0] = HardwareMotorType */
6, /* field[6] = HighLengthMicroSecond */
+ 14, /* field[14] = KvalAcc */
+ 15, /* field[15] = KvalDec */
+ 12, /* field[12] = KvalHold */
+ 13, /* field[13] = KvalRun */
+ 19, /* field[19] = LowSpeedOptimization */
5, /* field[5] = MaxChangeSlope */
2, /* field[2] = MaxFrequency */
4, /* field[4] = MicroStep */
1, /* field[1] = MinFrequency */
+ 16, /* field[16] = OverCurrentThreshold */
9, /* field[9] = PulleyRadius */
8, /* field[8] = PulsePerRound */
3, /* field[3] = SetMicroStep */
7, /* field[7] = SpeedMaster */
+ 17, /* field[17] = StallThreshold */
+ 18, /* field[18] = ThermalCompensationFactor */
};
static const ProtobufCIntRange hardware_motor__number_ranges[1 + 1] =
{
{ 1, 0 },
- { 0, 12 }
+ { 0, 20 }
};
const ProtobufCMessageDescriptor hardware_motor__descriptor =
{
@@ -226,7 +330,7 @@ const ProtobufCMessageDescriptor hardware_motor__descriptor =
"HardwareMotor",
"",
sizeof(HardwareMotor),
- 12,
+ 20,
hardware_motor__field_descriptors,
hardware_motor__field_indices_by_name,
1, hardware_motor__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.h
index 02aaea0f1..8640092b2 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.h
@@ -51,10 +51,26 @@ struct _HardwareMotor
int32_t configword;
protobuf_c_boolean has_directionthreadwize;
protobuf_c_boolean directionthreadwize;
+ protobuf_c_boolean has_kvalhold;
+ int32_t kvalhold;
+ protobuf_c_boolean has_kvalrun;
+ int32_t kvalrun;
+ protobuf_c_boolean has_kvalacc;
+ int32_t kvalacc;
+ protobuf_c_boolean has_kvaldec;
+ int32_t kvaldec;
+ protobuf_c_boolean has_overcurrentthreshold;
+ int32_t overcurrentthreshold;
+ protobuf_c_boolean has_stallthreshold;
+ int32_t stallthreshold;
+ protobuf_c_boolean has_thermalcompensationfactor;
+ int32_t thermalcompensationfactor;
+ protobuf_c_boolean has_lowspeedoptimization;
+ protobuf_c_boolean lowspeedoptimization;
};
#define HARDWARE_MOTOR__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&hardware_motor__descriptor) \
- , 0, HARDWARE_MOTOR_TYPE__MOTO_DH_CLEANHEAD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+ , 0, HARDWARE_MOTOR_TYPE__MOTO_DH_CLEANHEAD, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
/* HardwareMotor methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwarePidControlType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwarePidControlType.pb-c.c
index 3ebf41adf..e40a39f14 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwarePidControlType.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwarePidControlType.pb-c.c
@@ -7,7 +7,7 @@
#endif
#include "HardwarePidControlType.pb-c.h"
-static const ProtobufCEnumValue hardware_pid_control_type__enum_values_by_number[13] =
+static const ProtobufCEnumValue hardware_pid_control_type__enum_values_by_number[21] =
{
{ "DryerHeater1000w", "HARDWARE_PID_CONTROL_TYPE__DryerHeater1000w", 0 },
{ "DryerHeater200w1", "HARDWARE_PID_CONTROL_TYPE__DryerHeater200w1", 1 },
@@ -22,12 +22,28 @@ static const ProtobufCEnumValue hardware_pid_control_type__enum_values_by_number
{ "MotorFeeder", "HARDWARE_PID_CONTROL_TYPE__MotorFeeder", 10 },
{ "MotorPooler", "HARDWARE_PID_CONTROL_TYPE__MotorPooler", 11 },
{ "MotorWinder", "HARDWARE_PID_CONTROL_TYPE__MotorWinder", 12 },
+ { "Dispenser1", "HARDWARE_PID_CONTROL_TYPE__Dispenser1", 13 },
+ { "Dispenser2", "HARDWARE_PID_CONTROL_TYPE__Dispenser2", 14 },
+ { "Dispenser3", "HARDWARE_PID_CONTROL_TYPE__Dispenser3", 15 },
+ { "Dispenser4", "HARDWARE_PID_CONTROL_TYPE__Dispenser4", 16 },
+ { "Dispenser5", "HARDWARE_PID_CONTROL_TYPE__Dispenser5", 17 },
+ { "Dispenser6", "HARDWARE_PID_CONTROL_TYPE__Dispenser6", 18 },
+ { "Dispenser7", "HARDWARE_PID_CONTROL_TYPE__Dispenser7", 19 },
+ { "Dispenser8", "HARDWARE_PID_CONTROL_TYPE__Dispenser8", 20 },
};
static const ProtobufCIntRange hardware_pid_control_type__value_ranges[] = {
-{0, 0},{0, 13}
+{0, 0},{0, 21}
};
-static const ProtobufCEnumValueIndex hardware_pid_control_type__enum_values_by_name[13] =
+static const ProtobufCEnumValueIndex hardware_pid_control_type__enum_values_by_name[21] =
{
+ { "Dispenser1", 13 },
+ { "Dispenser2", 14 },
+ { "Dispenser3", 15 },
+ { "Dispenser4", 16 },
+ { "Dispenser5", 17 },
+ { "Dispenser6", 18 },
+ { "Dispenser7", 19 },
+ { "Dispenser8", 20 },
{ "DryerHeater1000w", 0 },
{ "DryerHeater200w1", 1 },
{ "DryerHeater200w2", 2 },
@@ -49,9 +65,9 @@ const ProtobufCEnumDescriptor hardware_pid_control_type__descriptor =
"HardwarePidControlType",
"HardwarePidControlType",
"",
- 13,
+ 21,
hardware_pid_control_type__enum_values_by_number,
- 13,
+ 21,
hardware_pid_control_type__enum_values_by_name,
1,
hardware_pid_control_type__value_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwarePidControlType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwarePidControlType.pb-c.h
index e9d20acd3..c11d83823 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwarePidControlType.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwarePidControlType.pb-c.h
@@ -32,7 +32,15 @@ typedef enum _HardwarePidControlType {
HARDWARE_PID_CONTROL_TYPE__MotorDryer = 9,
HARDWARE_PID_CONTROL_TYPE__MotorFeeder = 10,
HARDWARE_PID_CONTROL_TYPE__MotorPooler = 11,
- HARDWARE_PID_CONTROL_TYPE__MotorWinder = 12
+ HARDWARE_PID_CONTROL_TYPE__MotorWinder = 12,
+ HARDWARE_PID_CONTROL_TYPE__Dispenser1 = 13,
+ HARDWARE_PID_CONTROL_TYPE__Dispenser2 = 14,
+ HARDWARE_PID_CONTROL_TYPE__Dispenser3 = 15,
+ HARDWARE_PID_CONTROL_TYPE__Dispenser4 = 16,
+ HARDWARE_PID_CONTROL_TYPE__Dispenser5 = 17,
+ HARDWARE_PID_CONTROL_TYPE__Dispenser6 = 18,
+ HARDWARE_PID_CONTROL_TYPE__Dispenser7 = 19,
+ HARDWARE_PID_CONTROL_TYPE__Dispenser8 = 20
PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(HARDWARE_PID_CONTROL_TYPE)
} HardwarePidControlType;