diff options
Diffstat (limited to 'Software/Embedded_SW/Embedded/Communication')
13 files changed, 567 insertions, 232 deletions
diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c index 5bed0bcdc..b386ae20f 100644 --- a/Software/Embedded_SW/Embedded/Communication/Container.c +++ b/Software/Embedded_SW/Embedded/Communication/Container.c @@ -491,6 +491,9 @@ void receive_callback(char* buffer, size_t length) case MESSAGE_TYPE__StopThreadLoadingRequest: StopThreadLoadingFunc(requestContainer); break; + case MESSAGE_TYPE__AttemptThreadJoggingRequest: + AttemptThreadJoggingFunc(requestContainer); + break; case MESSAGE_TYPE__StubDispenserEEpromRequest: StubDispenserEEpromRequestFunc(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 d7fe911c1..4b8277d75 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[269] = +static const ProtobufCEnumValue message_type__enum_values_by_number[271] = { { "", "", 0 }, { "", "", 1 }, @@ -272,6 +272,8 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[269] = { "", "", 11005 }, { "", "", 11006 }, { "", "", 11007 }, + { "", "", 11008 }, + { "", "", 11009 }, { "", "", 12000 }, { "", "", 12001 }, { "", "", 13000 }, @@ -280,9 +282,9 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[269] = { "", "", 13003 }, }; static const ProtobufCIntRange message_type__value_ranges[] = { -{0, 0},{3, 2},{1000, 114},{2000, 135},{2044, 175},{3000, 177},{4000, 191},{5000, 199},{6000, 203},{7000, 209},{8000, 233},{9000, 241},{10000, 245},{11000, 255},{12000, 263},{13000, 265},{0, 269} +{0, 0},{3, 2},{1000, 114},{2000, 135},{2044, 175},{3000, 177},{4000, 191},{5000, 199},{6000, 203},{7000, 209},{8000, 233},{9000, 241},{10000, 245},{11000, 255},{12000, 265},{13000, 267},{0, 271} }; -static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] = +static const ProtobufCEnumValueIndex message_type__enum_values_by_name[271] = { { "", 189 }, { "", 190 }, @@ -294,6 +296,8 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] = { "", 252 }, { "", 231 }, { "", 232 }, + { "", 263 }, + { "", 264 }, { "", 2 }, { "", 3 }, { "", 175 }, @@ -344,8 +348,8 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] = { "", 210 }, { "", 131 }, { "", 132 }, - { "", 267 }, - { "", 268 }, + { "", 269 }, + { "", 270 }, { "", 223 }, { "", 224 }, { "", 221 }, @@ -375,8 +379,8 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] = { "", 122 }, { "", 4 }, { "", 5 }, - { "", 265 }, - { "", 266 }, + { "", 267 }, + { "", 268 }, { "", 161 }, { "", 162 }, { "", 185 }, @@ -407,8 +411,8 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] = { "", 166 }, { "", 187 }, { "", 188 }, - { "", 263 }, - { "", 264 }, + { "", 265 }, + { "", 266 }, { "", 241 }, { "", 242 }, { "", 245 }, @@ -561,9 +565,9 @@ const ProtobufCEnumDescriptor message_type__descriptor = "", "", "", - 269, + 271, message_type__enum_values_by_number, - 269, + 271, message_type__enum_values_by_name, 16, 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 cacc241b3..133d64f2d 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 @@ -283,6 +283,8 @@ typedef enum _MessageType { MESSAGE_TYPE__StopThreadLoadingResponse = 11005, MESSAGE_TYPE__TryThreadLoadingRequest = 11006, MESSAGE_TYPE__TryThreadLoadingResponse = 11007, + MESSAGE_TYPE__AttemptThreadJoggingRequest = 11008, + MESSAGE_TYPE__AttemptThreadJoggingResponse = 11009, MESSAGE_TYPE__StartInkFillingStatusRequest = 12000, MESSAGE_TYPE__StartInkFillingStatusResponse = 12001, MESSAGE_TYPE__PutDataStoreItemRequest = 13000, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c index 7f667ae6d..7aa6f71d4 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c @@ -7,7 +7,7 @@ #endif #include "EventType.pb-c.h" -static const ProtobufCEnumValue event_type__enum_values_by_number[365] = +static const ProtobufCEnumValue event_type__enum_values_by_number[379] = { { "", "", 0 }, { "", "", 1000 }, @@ -46,6 +46,9 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[365] = { "", "", 2019 }, { "", "", 2020 }, { "", "", 2021 }, + { "", "", 2022 }, + { "", "", 2023 }, + { "", "", 2024 }, { "", "", 3000 }, { "", "", 3001 }, { "", "", 3002 }, @@ -374,65 +377,43 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[365] = { "", "", 10003 }, { "", "", 10004 }, { "", "", 10005 }, + { "", "", 10006 }, + { "", "", 10007 }, + { "", "", 10008 }, + { "", "", 10009 }, + { "", "", 10010 }, + { "", "", 10011 }, + { "", "", 10012 }, + { "", "", 10013 }, + { "", "", 10014 }, + { "", "", 10015 }, + { "", "", 10016 }, }; static const ProtobufCIntRange event_type__value_ranges[] = { -{0, 0},{1000, 1},{2000, 15},{3000, 37},{4000, 89},{5000, 111},{6000, 210},{7000, 216},{8000, 304},{9000, 336},{10000, 359},{0, 365} +{0, 0},{1000, 1},{2000, 15},{3000, 40},{4000, 92},{5000, 114},{6000, 213},{7000, 219},{8000, 307},{9000, 339},{10000, 362},{0, 379} }; -static const ProtobufCEnumValueIndex event_type__enum_values_by_name[365] = +static const ProtobufCEnumValueIndex event_type__enum_values_by_name[379] = { - { "", 337 }, - { "", 336 }, - { "", 362 }, + { "", 340 }, + { "", 339 }, + { "", 365 }, { "", 4 }, { "", 5 }, { "", 6 }, { "", 7 }, { "", 22 }, { "", 21 }, - { "", 342 }, - { "", 353 }, - { "", 347 }, - { "", 354 }, - { "", 348 }, - { "", 355 }, - { "", 349 }, + { "", 345 }, { "", 356 }, { "", 350 }, { "", 357 }, + { "", 351 }, { "", 358 }, - { "", 232 }, - { "", 296 }, - { "", 288 }, - { "", 248 }, - { "", 256 }, - { "", 264 }, - { "", 272 }, - { "", 216 }, - { "", 240 }, - { "", 224 }, - { "", 280 }, - { "", 233 }, - { "", 297 }, - { "", 289 }, - { "", 249 }, - { "", 257 }, - { "", 265 }, - { "", 273 }, - { "", 217 }, - { "", 241 }, - { "", 225 }, - { "", 281 }, - { "", 234 }, - { "", 298 }, - { "", 290 }, - { "", 250 }, - { "", 258 }, - { "", 266 }, - { "", 274 }, - { "", 218 }, - { "", 242 }, - { "", 226 }, - { "", 282 }, + { "", 352 }, + { "", 359 }, + { "", 353 }, + { "", 360 }, + { "", 361 }, { "", 235 }, { "", 299 }, { "", 291 }, @@ -488,67 +469,145 @@ static const ProtobufCEnumValueIndex event_type__enum_values_by_name[365] = { "", 247 }, { "", 231 }, { "", 287 }, - { "", 93 }, - { "", 104 }, + { "", 240 }, + { "", 304 }, + { "", 296 }, + { "", 256 }, + { "", 264 }, + { "", 272 }, + { "", 280 }, + { "", 224 }, + { "", 248 }, + { "", 232 }, + { "", 288 }, + { "", 241 }, + { "", 305 }, + { "", 297 }, + { "", 257 }, + { "", 265 }, + { "", 273 }, + { "", 281 }, + { "", 225 }, + { "", 249 }, + { "", 233 }, + { "", 289 }, + { "", 242 }, + { "", 306 }, + { "", 298 }, + { "", 258 }, + { "", 266 }, + { "", 274 }, + { "", 282 }, + { "", 226 }, + { "", 250 }, + { "", 234 }, + { "", 290 }, + { "", 96 }, + { "", 107 }, + { "", 108 }, { "", 105 }, - { "", 102 }, - { "", 100 }, { "", 103 }, - { "", 101 }, { "", 106 }, - { "", 107 }, - { "", 108 }, + { "", 104 }, { "", 109 }, - { "", 89 }, - { "", 90 }, - { "", 91 }, + { "", 110 }, + { "", 111 }, + { "", 112 }, { "", 92 }, - { "", 99 }, + { "", 93 }, { "", 94 }, - { "", 96 }, - { "", 97 }, { "", 95 }, - { "", 110 }, + { "", 102 }, + { "", 97 }, + { "", 99 }, + { "", 100 }, { "", 98 }, - { "", 208 }, - { "", 194 }, - { "", 192 }, - { "", 198 }, - { "", 196 }, - { "", 204 }, - { "", 206 }, - { "", 186 }, - { "", 188 }, - { "", 190 }, + { "", 113 }, + { "", 101 }, + { "", 211 }, + { "", 197 }, { "", 195 }, - { "", 193 }, + { "", 201 }, { "", 199 }, - { "", 197 }, - { "", 205 }, { "", 207 }, - { "", 187 }, + { "", 209 }, { "", 189 }, { "", 191 }, + { "", 193 }, + { "", 198 }, + { "", 196 }, + { "", 202 }, + { "", 200 }, + { "", 208 }, + { "", 210 }, + { "", 190 }, + { "", 192 }, + { "", 194 }, + { "", 153 }, + { "", 154 }, + { "", 155 }, + { "", 156 }, + { "", 149 }, { "", 150 }, { "", 151 }, { "", 152 }, - { "", 153 }, + { "", 144 }, + { "", 145 }, { "", 146 }, { "", 147 }, { "", 148 }, - { "", 149 }, - { "", 141 }, - { "", 142 }, { "", 143 }, - { "", 144 }, - { "", 145 }, - { "", 140 }, + { "", 206 }, + { "", 204 }, + { "", 205 }, { "", 203 }, - { "", 201 }, - { "", 202 }, - { "", 200 }, + { "", 142 }, + { "", 212 }, + { "", 186 }, + { "", 179 }, + { "", 160 }, + { "", 166 }, + { "", 172 }, + { "", 187 }, + { "", 180 }, + { "", 161 }, + { "", 167 }, + { "", 173 }, + { "", 188 }, + { "", 181 }, + { "", 162 }, + { "", 168 }, + { "", 174 }, + { "", 137 }, + { "", 132 }, + { "", 114 }, + { "", 120 }, + { "", 126 }, + { "", 138 }, + { "", 133 }, + { "", 115 }, + { "", 121 }, + { "", 127 }, { "", 139 }, - { "", 209 }, + { "", 134 }, + { "", 116 }, + { "", 122 }, + { "", 128 }, + { "", 140 }, + { "", 135 }, + { "", 117 }, + { "", 123 }, + { "", 129 }, + { "", 141 }, + { "", 136 }, + { "", 118 }, + { "", 124 }, + { "", 130 }, + { "", 182 }, + { "", 175 }, + { "", 119 }, + { "", 125 }, + { "", 131 }, { "", 183 }, { "", 176 }, { "", 157 }, @@ -564,86 +623,47 @@ static const ProtobufCEnumValueIndex event_type__enum_values_by_name[365] = { "", 159 }, { "", 165 }, { "", 171 }, - { "", 134 }, - { "", 129 }, - { "", 111 }, - { "", 117 }, - { "", 123 }, - { "", 135 }, - { "", 130 }, - { "", 112 }, - { "", 118 }, - { "", 124 }, - { "", 136 }, - { "", 131 }, - { "", 113 }, - { "", 119 }, - { "", 125 }, - { "", 137 }, - { "", 132 }, - { "", 114 }, - { "", 120 }, - { "", 126 }, - { "", 138 }, - { "", 133 }, - { "", 115 }, - { "", 121 }, - { "", 127 }, - { "", 179 }, - { "", 172 }, - { "", 116 }, - { "", 122 }, - { "", 128 }, - { "", 180 }, - { "", 173 }, - { "", 154 }, - { "", 160 }, - { "", 166 }, - { "", 181 }, - { "", 174 }, - { "", 155 }, - { "", 161 }, - { "", 167 }, - { "", 182 }, - { "", 175 }, - { "", 156 }, - { "", 162 }, - { "", 168 }, { "", 26 }, { "", 27 }, { "", 33 }, { "", 16 }, - { "", 75 }, { "", 78 }, { "", 81 }, { "", 84 }, - { "", 40 }, - { "", 47 }, - { "", 54 }, - { "", 61 }, + { "", 87 }, + { "", 43 }, + { "", 50 }, + { "", 57 }, + { "", 64 }, { "", 34 }, { "", 17 }, { "", 18 }, { "", 19 }, { "", 20 }, - { "", 359 }, - { "", 360 }, - { "", 343 }, + { "", 372 }, + { "", 374 }, + { "", 362 }, + { "", 368 }, + { "", 376 }, + { "", 370 }, + { "", 363 }, + { "", 378 }, + { "", 346 }, { "", 12 }, { "", 14 }, { "", 13 }, { "", 11 }, { "", 10 }, - { "", 43 }, - { "", 50 }, - { "", 57 }, - { "", 64 }, { "", 46 }, { "", 53 }, { "", 60 }, { "", 67 }, - { "", 69 }, - { "", 68 }, + { "", 49 }, + { "", 56 }, + { "", 63 }, + { "", 70 }, + { "", 72 }, + { "", 71 }, { "", 24 }, { "", 25 }, { "", 23 }, @@ -651,19 +671,7 @@ static const ProtobufCEnumValueIndex event_type__enum_values_by_name[365] = { "", 29 }, { "", 30 }, { "", 28 }, - { "", 87 }, - { "", 312 }, - { "", 328 }, - { "", 304 }, - { "", 320 }, - { "", 313 }, - { "", 329 }, - { "", 305 }, - { "", 321 }, - { "", 314 }, - { "", 330 }, - { "", 306 }, - { "", 322 }, + { "", 90 }, { "", 315 }, { "", 331 }, { "", 307 }, @@ -684,67 +692,87 @@ static const ProtobufCEnumValueIndex event_type__enum_values_by_name[365] = { "", 335 }, { "", 311 }, { "", 327 }, - { "", 215 }, - { "", 214 }, - { "", 210 }, + { "", 320 }, + { "", 336 }, + { "", 312 }, + { "", 328 }, + { "", 321 }, + { "", 337 }, + { "", 313 }, + { "", 329 }, + { "", 322 }, + { "", 338 }, + { "", 314 }, + { "", 330 }, + { "", 218 }, + { "", 217 }, { "", 213 }, - { "", 211 }, - { "", 212 }, - { "", 339 }, - { "", 361 }, + { "", 216 }, + { "", 214 }, + { "", 215 }, + { "", 342 }, + { "", 364 }, { "", 0 }, { "", 15 }, - { "", 351 }, - { "", 345 }, - { "", 352 }, - { "", 346 }, - { "", 74 }, + { "", 354 }, + { "", 348 }, + { "", 355 }, + { "", 349 }, { "", 77 }, { "", 80 }, { "", 83 }, - { "", 42 }, - { "", 49 }, - { "", 56 }, - { "", 63 }, + { "", 86 }, + { "", 45 }, + { "", 52 }, + { "", 59 }, + { "", 66 }, { "", 8 }, { "", 9 }, { "", 3 }, { "", 1 }, { "", 2 }, - { "", 41 }, + { "", 37 }, + { "", 38 }, + { "", 39 }, + { "", 44 }, + { "", 51 }, + { "", 58 }, + { "", 65 }, + { "", 74 }, + { "", 73 }, + { "", 75 }, { "", 48 }, { "", 55 }, { "", 62 }, - { "", 71 }, - { "", 70 }, - { "", 72 }, - { "", 45 }, - { "", 52 }, - { "", 59 }, - { "", 66 }, + { "", 69 }, { "", 36 }, - { "", 37 }, + { "", 40 }, + { "", 91 }, + { "", 41 }, { "", 88 }, - { "", 38 }, - { "", 85 }, - { "", 86 }, + { "", 89 }, { "", 35 }, { "", 31 }, + { "", 347 }, { "", 344 }, + { "", 373 }, + { "", 375 }, + { "", 366 }, + { "", 369 }, + { "", 377 }, + { "", 371 }, + { "", 367 }, { "", 341 }, - { "", 363 }, - { "", 364 }, - { "", 338 }, - { "", 340 }, - { "", 39 }, - { "", 73 }, + { "", 343 }, + { "", 42 }, { "", 76 }, { "", 79 }, { "", 82 }, - { "", 44 }, - { "", 51 }, - { "", 58 }, - { "", 65 }, + { "", 85 }, + { "", 47 }, + { "", 54 }, + { "", 61 }, + { "", 68 }, }; const ProtobufCEnumDescriptor event_type__descriptor = { @@ -753,9 +781,9 @@ const ProtobufCEnumDescriptor event_type__descriptor = "", "", "", - 365, + 379, event_type__enum_values_by_number, - 365, + 379, event_type__enum_values_by_name, 11, event_type__value_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h index cfb700260..9b2147774 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h @@ -57,6 +57,9 @@ typedef enum _EventType { EVENT_TYPE__FPGA_WATCHDOG_ACTIVATED = 2019, EVENT_TYPE__UNINTENDED_RESET = 2020, EVENT_TYPE__TEMPERATURE_MEASUREMENT_ERROR = 2021, + EVENT_TYPE__RFID_READER_MALFUNCTION_INK_SLOT = 2022, + EVENT_TYPE__RFID_READER_MALFUNCTION_WASTE_SLOT_1 = 2023, + EVENT_TYPE__RFID_READER_MALFUNCTION_WASTE_SLOT_2 = 2024, EVENT_TYPE__THREAD_BREAK = 3000, EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER = 3001, EVENT_TYPE__WINDER_CONE_DOES_NOT_EXIST = 3002, @@ -384,7 +387,18 @@ typedef enum _EventType { EVENT_TYPE__NO_WASTE_CARTRIDGE_AVAILABLE = 10002, EVENT_TYPE__ALL_WASTE_CARTRIDGES_FULL = 10003, EVENT_TYPE__WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 10004, - EVENT_TYPE__WASTE_CARTRIDGE_RFID_TIMEOUT = 10005 + EVENT_TYPE__WASTE_CARTRIDGE_RFID_TIMEOUT = 10005, + EVENT_TYPE__INK_CARTRIDGE_RFID_TAG_CANNOT_BE_READ = 10006, + EVENT_TYPE__WASTE_CARTRIDGE_RFID_TAG_CANNOT_BE_READ = 10007, + EVENT_TYPE__INK_CARTRIDGE_RFID_TAG_IS_NOT_VALID = 10008, + EVENT_TYPE__WASTE_CARTRIDGE_RFID_TAG_IS_NOT_VALID = 10009, + EVENT_TYPE__INK_CARTRIDGE_AUTHENTICATION_FAILED = 10010, + EVENT_TYPE__WASTE_CARTRIDGE_AUTHENTICATION_FAILED = 10011, + EVENT_TYPE__INK_CARTRIDGE_IS_BLOCKED = 10012, + EVENT_TYPE__WASTE_CARTRIDGE_IS_BLOCKED = 10013, + EVENT_TYPE__INK_CARTRIDGE_RFID_TAG_CANNOT_BE_UPDATED = 10014, + EVENT_TYPE__WASTE_CARTRIDGE_RFID_TAG_CANNOT_BE_UPDATED = 10015, + EVENT_TYPE__INK_IN_CARTRIDGE_IS_EXPIRED = 10016 PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(EVENT_TYPE) } EventType; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/HeadCleaningParameters.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/HeadCleaningParameters.pb-c.c index 699470ded..a5fba86d3 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/HeadCleaningParameters.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/HeadCleaningParameters.pb-c.c @@ -52,7 +52,7 @@ void head_cleaning_parameters__free_unpacked assert(message->base.descriptor == &head_cleaning_parameters__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor head_cleaning_parameters__field_descriptors[1] = +static const ProtobufCFieldDescriptor head_cleaning_parameters__field_descriptors[2] = { { "", @@ -66,14 +66,27 @@ static const ProtobufCFieldDescriptor head_cleaning_parameters__field_descriptor 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "", + 2, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(HeadCleaningParameters, has_archeadcleaningmotorspeed), + offsetof(HeadCleaningParameters, archeadcleaningmotorspeed), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned head_cleaning_parameters__field_indices_by_name[] = { + 1, /* field[1] = ArcHeadCleaningMotorSpeed */ 0, /* field[0] = CleanerFlow */ }; static const ProtobufCIntRange head_cleaning_parameters__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 1 } + { 0, 2 } }; const ProtobufCMessageDescriptor head_cleaning_parameters__descriptor = { @@ -83,7 +96,7 @@ const ProtobufCMessageDescriptor head_cleaning_parameters__descriptor = "", "", sizeof(HeadCleaningParameters), - 1, + 2, head_cleaning_parameters__field_descriptors, head_cleaning_parameters__field_indices_by_name, 1, head_cleaning_parameters__number_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/HeadCleaningParameters.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/HeadCleaningParameters.pb-c.h index 9213143bb..08c7b7248 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/HeadCleaningParameters.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/HeadCleaningParameters.pb-c.h @@ -28,10 +28,12 @@ struct _HeadCleaningParameters ProtobufCMessage base; protobuf_c_boolean has_cleanerflow; double cleanerflow; + protobuf_c_boolean has_archeadcleaningmotorspeed; + double archeadcleaningmotorspeed; }; #define HEAD_CLEANING_PARAMETERS__INIT \ { PROTOBUF_C_MESSAGE_INIT (&head_cleaning_parameters__descriptor) \ - , 0, 0 } + , 0, 0, 0, 0 } /* HeadCleaningParameters methods */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c index 44acaa3ad..a27a2202e 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.c @@ -52,7 +52,7 @@ void process_parameters__free_unpacked assert(message->base.descriptor == &process_parameters__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor process_parameters__field_descriptors[32] = +static const ProtobufCFieldDescriptor process_parameters__field_descriptors[31] = { { "", @@ -426,21 +426,8 @@ static const ProtobufCFieldDescriptor process_parameters__field_descriptors[32] 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, - { - "", - 32, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(ProcessParameters, has_archeadcleaningmotorspeed), - offsetof(ProcessParameters, archeadcleaningmotorspeed), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, }; static const unsigned process_parameters__field_indices_by_name[] = { - 31, /* field[31] = ArcHeadCleaningMotorSpeed */ 13, /* field[13] = DryerAirFlow */ 17, /* field[17] = DryerBufferLength */ 14, /* field[14] = DryerZone1Temp */ @@ -476,7 +463,7 @@ static const unsigned process_parameters__field_indices_by_name[] = { static const ProtobufCIntRange process_parameters__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 32 } + { 0, 31 } }; const ProtobufCMessageDescriptor process_parameters__descriptor = { @@ -486,7 +473,7 @@ const ProtobufCMessageDescriptor process_parameters__descriptor = "", "", sizeof(ProcessParameters), - 32, + 31, process_parameters__field_descriptors, process_parameters__field_indices_by_name, 1, process_parameters__number_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h index aa762a3d6..9a6453221 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/ProcessParameters.pb-c.h @@ -88,12 +88,10 @@ struct _ProcessParameters double lblowertemp; protobuf_c_boolean has_pressurebuildup; double pressurebuildup; - protobuf_c_boolean has_archeadcleaningmotorspeed; - double archeadcleaningmotorspeed; }; #define PROCESS_PARAMETERS__INIT \ { PROTOBUF_C_MESSAGE_INIT (&process_parameters__descriptor) \ - , 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, 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, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* ProcessParameters methods */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingRequest.pb-c.c new file mode 100644 index 000000000..78659ae90 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingRequest.pb-c.c @@ -0,0 +1,72 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: AttemptThreadJoggingRequest.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "AttemptThreadJoggingRequest.pb-c.h" +void attempt_thread_jogging_request__init + (AttemptThreadJoggingRequest *message) +{ + static const AttemptThreadJoggingRequest init_value = ATTEMPT_THREAD_JOGGING_REQUEST__INIT; + *message = init_value; +} +size_t attempt_thread_jogging_request__get_packed_size + (const AttemptThreadJoggingRequest *message) +{ + assert(message->base.descriptor == &attempt_thread_jogging_request__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t attempt_thread_jogging_request__pack + (const AttemptThreadJoggingRequest *message, + uint8_t *out) +{ + assert(message->base.descriptor == &attempt_thread_jogging_request__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t attempt_thread_jogging_request__pack_to_buffer + (const AttemptThreadJoggingRequest *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &attempt_thread_jogging_request__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +AttemptThreadJoggingRequest * + attempt_thread_jogging_request__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (AttemptThreadJoggingRequest *) + protobuf_c_message_unpack (&attempt_thread_jogging_request__descriptor, + allocator, len, data); +} +void attempt_thread_jogging_request__free_unpacked + (AttemptThreadJoggingRequest *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &attempt_thread_jogging_request__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +#define attempt_thread_jogging_request__field_descriptors NULL +#define attempt_thread_jogging_request__field_indices_by_name NULL +#define attempt_thread_jogging_request__number_ranges NULL +const ProtobufCMessageDescriptor attempt_thread_jogging_request__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(AttemptThreadJoggingRequest), + 0, + attempt_thread_jogging_request__field_descriptors, + attempt_thread_jogging_request__field_indices_by_name, + 0, attempt_thread_jogging_request__number_ranges, + (ProtobufCMessageInit) attempt_thread_jogging_request__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingRequest.pb-c.h new file mode 100644 index 000000000..366498be8 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingRequest.pb-c.h @@ -0,0 +1,70 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: AttemptThreadJoggingRequest.proto */ + +#ifndef PROTOBUF_C_AttemptThreadJoggingRequest_2eproto__INCLUDED +#define PROTOBUF_C_AttemptThreadJoggingRequest_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 _AttemptThreadJoggingRequest AttemptThreadJoggingRequest; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _AttemptThreadJoggingRequest +{ + ProtobufCMessage base; +}; +#define ATTEMPT_THREAD_JOGGING_REQUEST__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&attempt_thread_jogging_request__descriptor) \ + } + + +/* AttemptThreadJoggingRequest methods */ +void attempt_thread_jogging_request__init + (AttemptThreadJoggingRequest *message); +size_t attempt_thread_jogging_request__get_packed_size + (const AttemptThreadJoggingRequest *message); +size_t attempt_thread_jogging_request__pack + (const AttemptThreadJoggingRequest *message, + uint8_t *out); +size_t attempt_thread_jogging_request__pack_to_buffer + (const AttemptThreadJoggingRequest *message, + ProtobufCBuffer *buffer); +AttemptThreadJoggingRequest * + attempt_thread_jogging_request__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void attempt_thread_jogging_request__free_unpacked + (AttemptThreadJoggingRequest *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*AttemptThreadJoggingRequest_Closure) + (const AttemptThreadJoggingRequest *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor attempt_thread_jogging_request__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_AttemptThreadJoggingRequest_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingResponse.pb-c.c new file mode 100644 index 000000000..d75845c99 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingResponse.pb-c.c @@ -0,0 +1,72 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: AttemptThreadJoggingResponse.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "AttemptThreadJoggingResponse.pb-c.h" +void attempt_thread_jogging_response__init + (AttemptThreadJoggingResponse *message) +{ + static const AttemptThreadJoggingResponse init_value = ATTEMPT_THREAD_JOGGING_RESPONSE__INIT; + *message = init_value; +} +size_t attempt_thread_jogging_response__get_packed_size + (const AttemptThreadJoggingResponse *message) +{ + assert(message->base.descriptor == &attempt_thread_jogging_response__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t attempt_thread_jogging_response__pack + (const AttemptThreadJoggingResponse *message, + uint8_t *out) +{ + assert(message->base.descriptor == &attempt_thread_jogging_response__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t attempt_thread_jogging_response__pack_to_buffer + (const AttemptThreadJoggingResponse *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &attempt_thread_jogging_response__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +AttemptThreadJoggingResponse * + attempt_thread_jogging_response__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (AttemptThreadJoggingResponse *) + protobuf_c_message_unpack (&attempt_thread_jogging_response__descriptor, + allocator, len, data); +} +void attempt_thread_jogging_response__free_unpacked + (AttemptThreadJoggingResponse *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &attempt_thread_jogging_response__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +#define attempt_thread_jogging_response__field_descriptors NULL +#define attempt_thread_jogging_response__field_indices_by_name NULL +#define attempt_thread_jogging_response__number_ranges NULL +const ProtobufCMessageDescriptor attempt_thread_jogging_response__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(AttemptThreadJoggingResponse), + 0, + attempt_thread_jogging_response__field_descriptors, + attempt_thread_jogging_response__field_indices_by_name, + 0, attempt_thread_jogging_response__number_ranges, + (ProtobufCMessageInit) attempt_thread_jogging_response__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingResponse.pb-c.h new file mode 100644 index 000000000..e7324b29b --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/ThreadLoading/AttemptThreadJoggingResponse.pb-c.h @@ -0,0 +1,70 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: AttemptThreadJoggingResponse.proto */ + +#ifndef PROTOBUF_C_AttemptThreadJoggingResponse_2eproto__INCLUDED +#define PROTOBUF_C_AttemptThreadJoggingResponse_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 _AttemptThreadJoggingResponse AttemptThreadJoggingResponse; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _AttemptThreadJoggingResponse +{ + ProtobufCMessage base; +}; +#define ATTEMPT_THREAD_JOGGING_RESPONSE__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&attempt_thread_jogging_response__descriptor) \ + } + + +/* AttemptThreadJoggingResponse methods */ +void attempt_thread_jogging_response__init + (AttemptThreadJoggingResponse *message); +size_t attempt_thread_jogging_response__get_packed_size + (const AttemptThreadJoggingResponse *message); +size_t attempt_thread_jogging_response__pack + (const AttemptThreadJoggingResponse *message, + uint8_t *out); +size_t attempt_thread_jogging_response__pack_to_buffer + (const AttemptThreadJoggingResponse *message, + ProtobufCBuffer *buffer); +AttemptThreadJoggingResponse * + attempt_thread_jogging_response__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void attempt_thread_jogging_response__free_unpacked + (AttemptThreadJoggingResponse *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*AttemptThreadJoggingResponse_Closure) + (const AttemptThreadJoggingResponse *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor attempt_thread_jogging_response__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_AttemptThreadJoggingResponse_2eproto__INCLUDED */ |