merge conflict take remot

1 files changed, 48 insertions, 0 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/ThreadLoadingState.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/ThreadLoadingState.pb-c.h
new file mode 100644
index 000000000..4a08ce913
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/ThreadLoadingState.pb-c.h
@@ -0,0 +1,48 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ThreadLoadingState.proto */
+
+#ifndef PROTOBUF_C_ThreadLoadingState_2eproto__INCLUDED
+#define PROTOBUF_C_ThreadLoadingState_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
+
+
+
+
+/* --- enums --- */
+
+typedef enum _ThreadLoadingState {
+  THREAD_LOADING_STATE__None = 0,
+  THREAD_LOADING_STATE__Preparing = 1,
+  THREAD_LOADING_STATE__ReadyForLoading = 2,
+  THREAD_LOADING_STATE__PreparationError = 3,
+  THREAD_LOADING_STATE__Finalizing = 4,
+  THREAD_LOADING_STATE__FinalizationError = 5,
+  THREAD_LOADING_STATE__Completed = 6
+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(THREAD_LOADING_STATE)
+} ThreadLoadingState;
+
+/* --- messages --- */
+
+/* --- per-message closures --- */
+
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCEnumDescriptor    thread_loading_state__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_ThreadLoadingState_2eproto__INCLUDED */