diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-05-12 20:26:28 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-05-12 20:26:28 +0300 |
| commit | b14d820ae06d1e7a31b2939ec08cdc9b47657624 (patch) | |
| tree | 0d1be9c13f5f1237f28c5650674f50a0bd6e5002 | |
| parent | 6cbdc8fc0b64068e07801ed2066fa5afd5c15378 (diff) | |
| download | Tango-b14d820ae06d1e7a31b2939ec08cdc9b47657624.tar.gz Tango-b14d820ae06d1e7a31b2939ec08cdc9b47657624.zip | |
apply new proto interface
18 files changed, 234 insertions, 2238 deletions
diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c index 648e0a628..dec940191 100644 --- a/Software/Embedded_SW/Embedded/Communication/Container.c +++ b/Software/Embedded_SW/Embedded/Communication/Container.c @@ -33,6 +33,7 @@ #include "Modules/General/GeneralHardware.h" #include "Modules/General/MachineStatus.h" #include "Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.h" +#include "Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h" #include "Modules/heaters/heaters_ex.h" #include "Modules/AlarmHandling/AlarmHandling.h" @@ -491,9 +492,6 @@ void receive_callback(char* buffer, size_t length) case MESSAGE_TYPE__StopThreadLoadingRequest: StopThreadLoadingFunc(requestContainer); break; - case MESSAGE_TYPE__DispenserEEpromRequest: - DispenserEEpromRequestFunc(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 407e1e022..000774ad7 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[255] = +static const ProtobufCEnumValue message_type__enum_values_by_number[253] = { { "", "", 0 }, { "", "", 1 }, @@ -182,8 +182,6 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[255] = { "", "", 2043 }, { "", "", 2044 }, { "", "", 2045 }, - { "", "", 2046 }, - { "", "", 2047 }, { "", "", 3000 }, { "", "", 3001 }, { "", "", 3002 }, @@ -266,84 +264,82 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[255] = { "", "", 11005 }, }; static const ProtobufCIntRange message_type__value_ranges[] = { -{0, 0},{3, 2},{1000, 108},{2000, 127},{3000, 175},{4000, 189},{5000, 197},{6000, 201},{7000, 207},{8000, 231},{9000, 237},{10000, 241},{11000, 249},{0, 255} +{0, 0},{3, 2},{1000, 108},{2000, 127},{3000, 173},{4000, 187},{5000, 195},{6000, 199},{7000, 205},{8000, 229},{9000, 235},{10000, 239},{11000, 247},{0, 253} }; -static const ProtobufCEnumValueIndex message_type__enum_values_by_name[255] = +static const ProtobufCEnumValueIndex message_type__enum_values_by_name[253] = { - { "", 187 }, - { "", 188 }, - { "", 177 }, - { "", 178 }, - { "", 243 }, - { "", 244 }, - { "", 247 }, - { "", 248 }, - { "", 229 }, - { "", 230 }, + { "", 185 }, + { "", 186 }, + { "", 175 }, + { "", 176 }, + { "", 241 }, + { "", 242 }, + { "", 245 }, + { "", 246 }, + { "", 227 }, + { "", 228 }, { "", 2 }, { "", 3 }, { "", 171 }, { "", 172 }, { "", 121 }, { "", 122 }, - { "", 203 }, - { "", 204 }, - { "", 251 }, - { "", 252 }, + { "", 201 }, + { "", 202 }, + { "", 249 }, + { "", 250 }, + { "", 213 }, + { "", 214 }, + { "", 179 }, + { "", 180 }, { "", 215 }, { "", 216 }, - { "", 181 }, - { "", 182 }, - { "", 217 }, - { "", 218 }, { "", 113 }, { "", 114 }, - { "", 205 }, - { "", 206 }, + { "", 203 }, + { "", 204 }, { "", 137 }, { "", 138 }, { "", 143 }, { "", 144 }, - { "", 231 }, - { "", 232 }, - { "", 173 }, - { "", 174 }, + { "", 229 }, + { "", 230 }, { "", 139 }, { "", 140 }, { "", 141 }, { "", 142 }, { "", 1 }, - { "", 211 }, - { "", 212 }, + { "", 209 }, + { "", 210 }, { "", 109 }, { "", 110 }, { "", 111 }, { "", 112 }, { "", 108 }, - { "", 225 }, - { "", 226 }, - { "", 209 }, - { "", 210 }, { "", 223 }, { "", 224 }, { "", 207 }, { "", 208 }, - { "", 125 }, - { "", 126 }, { "", 221 }, { "", 222 }, + { "", 205 }, + { "", 206 }, + { "", 125 }, + { "", 126 }, { "", 219 }, { "", 220 }, - { "", 175 }, - { "", 176 }, - { "", 201 }, - { "", 202 }, - { "", 213 }, - { "", 214 }, - { "", 235 }, - { "", 236 }, + { "", 217 }, + { "", 218 }, + { "", 173 }, + { "", 174 }, + { "", 199 }, + { "", 200 }, + { "", 211 }, + { "", 212 }, { "", 233 }, { "", 234 }, + { "", 231 }, + { "", 232 }, { "", 129 }, { "", 130 }, { "", 135 }, @@ -359,56 +355,56 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[255] = { "", 5 }, { "", 153 }, { "", 154 }, - { "", 183 }, - { "", 184 }, + { "", 181 }, + { "", 182 }, { "", 163 }, { "", 164 }, { "", 151 }, { "", 152 }, - { "", 193 }, - { "", 194 }, + { "", 191 }, + { "", 192 }, { "", 145 }, { "", 146 }, { "", 161 }, { "", 162 }, { "", 165 }, { "", 166 }, - { "", 195 }, - { "", 196 }, + { "", 193 }, + { "", 194 }, { "", 117 }, { "", 118 }, { "", 167 }, { "", 168 }, - { "", 189 }, - { "", 190 }, + { "", 187 }, + { "", 188 }, { "", 127 }, { "", 128 }, { "", 157 }, { "", 158 }, - { "", 185 }, - { "", 186 }, - { "", 237 }, - { "", 238 }, - { "", 241 }, - { "", 242 }, - { "", 245 }, - { "", 246 }, - { "", 249 }, - { "", 250 }, + { "", 183 }, + { "", 184 }, + { "", 235 }, + { "", 236 }, + { "", 239 }, + { "", 240 }, + { "", 243 }, + { "", 244 }, + { "", 247 }, + { "", 248 }, { "", 119 }, { "", 120 }, { "", 169 }, { "", 170 }, - { "", 191 }, - { "", 192 }, + { "", 189 }, + { "", 190 }, { "", 155 }, { "", 156 }, { "", 159 }, { "", 160 }, - { "", 239 }, - { "", 240 }, - { "", 253 }, - { "", 254 }, + { "", 237 }, + { "", 238 }, + { "", 251 }, + { "", 252 }, { "", 100 }, { "", 101 }, { "", 6 }, @@ -511,20 +507,20 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[255] = { "", 31 }, { "", 106 }, { "", 107 }, - { "", 199 }, - { "", 200 }, + { "", 197 }, + { "", 198 }, { "", 149 }, { "", 150 }, { "", 147 }, { "", 148 }, { "", 123 }, { "", 124 }, - { "", 197 }, - { "", 198 }, - { "", 179 }, - { "", 180 }, - { "", 227 }, - { "", 228 }, + { "", 195 }, + { "", 196 }, + { "", 177 }, + { "", 178 }, + { "", 225 }, + { "", 226 }, }; const ProtobufCEnumDescriptor message_type__descriptor = { @@ -533,9 +529,9 @@ const ProtobufCEnumDescriptor message_type__descriptor = "", "", "", - 255, + 253, message_type__enum_values_by_number, - 255, + 253, message_type__enum_values_by_name, 13, 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 a8d8d9af0..14b49cd6c 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 @@ -193,8 +193,6 @@ typedef enum _MessageType { MESSAGE_TYPE__StopCartridgesUpdateResponse = 2043, MESSAGE_TYPE__CartridgeValidationRequest = 2044, MESSAGE_TYPE__CartridgeValidationResponse = 2045, - MESSAGE_TYPE__DispenserEEpromRequest = 2046, - MESSAGE_TYPE__DispenserEEpromResponse = 2047, MESSAGE_TYPE__JobRequest = 3000, MESSAGE_TYPE__JobResponse = 3001, MESSAGE_TYPE__AbortJobRequest = 3002, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEPROM.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEPROM.pb-c.c deleted file mode 100644 index 490336ab8..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEPROM.pb-c.c +++ /dev/null @@ -1,495 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: DispenserEEPROM.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "DispenserEEPROM.pb-c.h" -void dispenser_eeprom_info__init - (DispenserEEpromInfo *message) -{ - static const DispenserEEpromInfo init_value = DISPENSER_EEPROM_INFO__INIT; - *message = init_value; -} -size_t dispenser_eeprom_info__get_packed_size - (const DispenserEEpromInfo *message) -{ - assert(message->base.descriptor == &dispenser_eeprom_info__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t dispenser_eeprom_info__pack - (const DispenserEEpromInfo *message, - uint8_t *out) -{ - assert(message->base.descriptor == &dispenser_eeprom_info__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t dispenser_eeprom_info__pack_to_buffer - (const DispenserEEpromInfo *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &dispenser_eeprom_info__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -DispenserEEpromInfo * - dispenser_eeprom_info__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (DispenserEEpromInfo *) - protobuf_c_message_unpack (&dispenser_eeprom_info__descriptor, - allocator, len, data); -} -void dispenser_eeprom_info__free_unpacked - (DispenserEEpromInfo *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &dispenser_eeprom_info__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[32] = -{ - { - "", - 1, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_header), - offsetof(DispenserEEpromInfo, header), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 2, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_tablelength), - offsetof(DispenserEEpromInfo, tablelength), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 3, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_tableversion), - offsetof(DispenserEEpromInfo, tableversion), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 4, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromInfo, dispenserp_n), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 5, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromInfo, pcbs_n), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 6, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromInfo, pcbpartnumber), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 7, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromInfo, dispensers_n), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 8, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_minimalpressure), - offsetof(DispenserEEpromInfo, minimalpressure), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 9, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_maximalpressure), - offsetof(DispenserEEpromInfo, maximalpressure), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 10, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_minimalmv), - offsetof(DispenserEEpromInfo, minimalmv), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 11, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_maximalmv), - offsetof(DispenserEEpromInfo, maximalmv), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 12, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_totalcycles), - offsetof(DispenserEEpromInfo, totalcycles), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 13, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_bubblesize), - offsetof(DispenserEEpromInfo, bubblesize), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 14, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_avg_nl_stepvalue_1_4), - offsetof(DispenserEEpromInfo, avg_nl_stepvalue_1_4), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 15, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_avg_nl_stepvalue_2_4), - offsetof(DispenserEEpromInfo, avg_nl_stepvalue_2_4), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 16, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_avg_nl_stepvalue_3_4), - offsetof(DispenserEEpromInfo, avg_nl_stepvalue_3_4), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 17, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_avg_nl_stepvalue_4_4), - offsetof(DispenserEEpromInfo, avg_nl_stepvalue_4_4), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 18, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_sw_reserve), - offsetof(DispenserEEpromInfo, sw_reserve), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 19, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_INT32, - offsetof(DispenserEEpromInfo, has_spare1_pressure), - offsetof(DispenserEEpromInfo, spare1_pressure), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 20, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_INT32, - offsetof(DispenserEEpromInfo, has_spare2_pressure), - offsetof(DispenserEEpromInfo, spare2_pressure), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 21, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_motorpulsespercycle), - offsetof(DispenserEEpromInfo, motorpulsespercycle), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 22, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_color), - offsetof(DispenserEEpromInfo, color), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 23, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_pressureslope), - offsetof(DispenserEEpromInfo, pressureslope), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 24, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromInfo, productiondate), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 25, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_atslocation), - offsetof(DispenserEEpromInfo, atslocation), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 26, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_spare1), - offsetof(DispenserEEpromInfo, spare1), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 27, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_spare2), - offsetof(DispenserEEpromInfo, spare2), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 28, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_atschannel), - offsetof(DispenserEEpromInfo, atschannel), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 29, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_BOOL, - offsetof(DispenserEEpromInfo, has_unitempty), - offsetof(DispenserEEpromInfo, unitempty), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 30, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_BOOL, - offsetof(DispenserEEpromInfo, has_dryrunpass_fail), - offsetof(DispenserEEpromInfo, dryrunpass_fail), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 31, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_BOOL, - offsetof(DispenserEEpromInfo, has_flowpass_fail), - offsetof(DispenserEEpromInfo, flowpass_fail), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 32, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromInfo, has_checksum), - offsetof(DispenserEEpromInfo, checksum), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, -}; -static const unsigned dispenser_eeprom_info__field_indices_by_name[] = { - 27, /* field[27] = ATSChannel */ - 24, /* field[24] = ATSlocation */ - 13, /* field[13] = AVG_Nl_stepValue_1_4 */ - 14, /* field[14] = AVG_Nl_stepValue_2_4 */ - 15, /* field[15] = AVG_Nl_stepValue_3_4 */ - 16, /* field[16] = AVG_Nl_stepValue_4_4 */ - 12, /* field[12] = BubbleSize */ - 31, /* field[31] = CheckSum */ - 21, /* field[21] = Color */ - 3, /* field[3] = DispenserP_N */ - 6, /* field[6] = DispenserS_N */ - 29, /* field[29] = DryRunPass_Fail */ - 30, /* field[30] = FlowPass_Fail */ - 0, /* field[0] = Header */ - 10, /* field[10] = MaximalMV */ - 8, /* field[8] = MaximalPressure */ - 9, /* field[9] = MinimalMV */ - 7, /* field[7] = MinimalPressure */ - 20, /* field[20] = MotorPulsesPerCycle */ - 5, /* field[5] = PCBPartNumber */ - 4, /* field[4] = PCBS_N */ - 22, /* field[22] = PressureSlope */ - 23, /* field[23] = ProductionDate */ - 17, /* field[17] = SW_Reserve */ - 25, /* field[25] = Spare1 */ - 18, /* field[18] = Spare1_pressure */ - 26, /* field[26] = Spare2 */ - 19, /* field[19] = Spare2_pressure */ - 1, /* field[1] = TableLength */ - 2, /* field[2] = Tableversion */ - 11, /* field[11] = TotalCycles */ - 28, /* field[28] = UnitEmpty */ -}; -static const ProtobufCIntRange dispenser_eeprom_info__number_ranges[1 + 1] = -{ - { 1, 0 }, - { 0, 32 } -}; -const ProtobufCMessageDescriptor dispenser_eeprom_info__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(DispenserEEpromInfo), - 32, - dispenser_eeprom_info__field_descriptors, - dispenser_eeprom_info__field_indices_by_name, - 1, dispenser_eeprom_info__number_ranges, - (ProtobufCMessageInit) dispenser_eeprom_info__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEPROM.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEPROM.pb-c.h deleted file mode 100644 index 4791f24f8..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEPROM.pb-c.h +++ /dev/null @@ -1,129 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: DispenserEEPROM.proto */ - -#ifndef PROTOBUF_C_DispenserEEPROM_2eproto__INCLUDED -#define PROTOBUF_C_DispenserEEPROM_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 _DispenserEEpromInfo DispenserEEpromInfo; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _DispenserEEpromInfo -{ - ProtobufCMessage base; - protobuf_c_boolean has_header; - uint32_t header; - protobuf_c_boolean has_tablelength; - uint32_t tablelength; - protobuf_c_boolean has_tableversion; - uint32_t tableversion; - char *dispenserp_n; - char *pcbs_n; - char *pcbpartnumber; - char *dispensers_n; - protobuf_c_boolean has_minimalpressure; - uint32_t minimalpressure; - protobuf_c_boolean has_maximalpressure; - uint32_t maximalpressure; - protobuf_c_boolean has_minimalmv; - uint32_t minimalmv; - protobuf_c_boolean has_maximalmv; - uint32_t maximalmv; - protobuf_c_boolean has_totalcycles; - uint32_t totalcycles; - protobuf_c_boolean has_bubblesize; - uint32_t bubblesize; - protobuf_c_boolean has_avg_nl_stepvalue_1_4; - uint32_t avg_nl_stepvalue_1_4; - protobuf_c_boolean has_avg_nl_stepvalue_2_4; - uint32_t avg_nl_stepvalue_2_4; - protobuf_c_boolean has_avg_nl_stepvalue_3_4; - uint32_t avg_nl_stepvalue_3_4; - protobuf_c_boolean has_avg_nl_stepvalue_4_4; - uint32_t avg_nl_stepvalue_4_4; - protobuf_c_boolean has_sw_reserve; - uint32_t sw_reserve; - protobuf_c_boolean has_spare1_pressure; - int32_t spare1_pressure; - protobuf_c_boolean has_spare2_pressure; - int32_t spare2_pressure; - protobuf_c_boolean has_motorpulsespercycle; - uint32_t motorpulsespercycle; - protobuf_c_boolean has_color; - uint32_t color; - protobuf_c_boolean has_pressureslope; - uint32_t pressureslope; - char *productiondate; - protobuf_c_boolean has_atslocation; - uint32_t atslocation; - protobuf_c_boolean has_spare1; - uint32_t spare1; - protobuf_c_boolean has_spare2; - uint32_t spare2; - protobuf_c_boolean has_atschannel; - uint32_t atschannel; - protobuf_c_boolean has_unitempty; - protobuf_c_boolean unitempty; - protobuf_c_boolean has_dryrunpass_fail; - protobuf_c_boolean dryrunpass_fail; - protobuf_c_boolean has_flowpass_fail; - protobuf_c_boolean flowpass_fail; - protobuf_c_boolean has_checksum; - uint32_t checksum; -}; -#define DISPENSER_EEPROM_INFO__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&dispenser_eeprom_info__descriptor) \ - , 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 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, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } - - -/* DispenserEEpromInfo methods */ -void dispenser_eeprom_info__init - (DispenserEEpromInfo *message); -size_t dispenser_eeprom_info__get_packed_size - (const DispenserEEpromInfo *message); -size_t dispenser_eeprom_info__pack - (const DispenserEEpromInfo *message, - uint8_t *out); -size_t dispenser_eeprom_info__pack_to_buffer - (const DispenserEEpromInfo *message, - ProtobufCBuffer *buffer); -DispenserEEpromInfo * - dispenser_eeprom_info__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void dispenser_eeprom_info__free_unpacked - (DispenserEEpromInfo *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*DispenserEEpromInfo_Closure) - (const DispenserEEpromInfo *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor dispenser_eeprom_info__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_DispenserEEPROM_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.c deleted file mode 100644 index 8e98891a0..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.c +++ /dev/null @@ -1,118 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: DispenserEEpromRequest.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "DispenserEEpromRequest.pb-c.h" -void dispenser_eeprom_request__init - (DispenserEEpromRequest *message) -{ - static const DispenserEEpromRequest init_value = DISPENSER_EEPROM_REQUEST__INIT; - *message = init_value; -} -size_t dispenser_eeprom_request__get_packed_size - (const DispenserEEpromRequest *message) -{ - assert(message->base.descriptor == &dispenser_eeprom_request__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t dispenser_eeprom_request__pack - (const DispenserEEpromRequest *message, - uint8_t *out) -{ - assert(message->base.descriptor == &dispenser_eeprom_request__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t dispenser_eeprom_request__pack_to_buffer - (const DispenserEEpromRequest *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &dispenser_eeprom_request__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -DispenserEEpromRequest * - dispenser_eeprom_request__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (DispenserEEpromRequest *) - protobuf_c_message_unpack (&dispenser_eeprom_request__descriptor, - allocator, len, data); -} -void dispenser_eeprom_request__free_unpacked - (DispenserEEpromRequest *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &dispenser_eeprom_request__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -static const ProtobufCFieldDescriptor dispenser_eeprom_request__field_descriptors[3] = -{ - { - "", - 1, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromRequest, has_dispenserid), - offsetof(DispenserEEpromRequest, dispenserid), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 2, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_BOOL, - offsetof(DispenserEEpromRequest, has_burnrequest), - offsetof(DispenserEEpromRequest, burnrequest), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 3, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_MESSAGE, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromRequest, dispensereeprom), - &dispenser_eeprom_info__descriptor, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, -}; -static const unsigned dispenser_eeprom_request__field_indices_by_name[] = { - 1, /* field[1] = BurnRequest */ - 2, /* field[2] = DispenserEEprom */ - 0, /* field[0] = DispenserId */ -}; -static const ProtobufCIntRange dispenser_eeprom_request__number_ranges[1 + 1] = -{ - { 1, 0 }, - { 0, 3 } -}; -const ProtobufCMessageDescriptor dispenser_eeprom_request__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(DispenserEEpromRequest), - 3, - dispenser_eeprom_request__field_descriptors, - dispenser_eeprom_request__field_indices_by_name, - 1, dispenser_eeprom_request__number_ranges, - (ProtobufCMessageInit) dispenser_eeprom_request__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.h deleted file mode 100644 index d0d2dda4f..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.h +++ /dev/null @@ -1,76 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: DispenserEEpromRequest.proto */ - -#ifndef PROTOBUF_C_DispenserEEpromRequest_2eproto__INCLUDED -#define PROTOBUF_C_DispenserEEpromRequest_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 - -#include "DispenserEEPROM.pb-c.h" - -typedef struct _DispenserEEpromRequest DispenserEEpromRequest; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _DispenserEEpromRequest -{ - ProtobufCMessage base; - protobuf_c_boolean has_dispenserid; - uint32_t dispenserid; - protobuf_c_boolean has_burnrequest; - protobuf_c_boolean burnrequest; - DispenserEEpromInfo *dispensereeprom; -}; -#define DISPENSER_EEPROM_REQUEST__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&dispenser_eeprom_request__descriptor) \ - , 0, 0, 0, 0, NULL } - - -/* DispenserEEpromRequest methods */ -void dispenser_eeprom_request__init - (DispenserEEpromRequest *message); -size_t dispenser_eeprom_request__get_packed_size - (const DispenserEEpromRequest *message); -size_t dispenser_eeprom_request__pack - (const DispenserEEpromRequest *message, - uint8_t *out); -size_t dispenser_eeprom_request__pack_to_buffer - (const DispenserEEpromRequest *message, - ProtobufCBuffer *buffer); -DispenserEEpromRequest * - dispenser_eeprom_request__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void dispenser_eeprom_request__free_unpacked - (DispenserEEpromRequest *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*DispenserEEpromRequest_Closure) - (const DispenserEEpromRequest *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor dispenser_eeprom_request__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_DispenserEEpromRequest_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.c deleted file mode 100644 index c86c01ad6..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.c +++ /dev/null @@ -1,105 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: DispenserEEpromResponse.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "DispenserEEpromResponse.pb-c.h" -void dispenser_eeprom_response__init - (DispenserEEpromResponse *message) -{ - static const DispenserEEpromResponse init_value = DISPENSER_EEPROM_RESPONSE__INIT; - *message = init_value; -} -size_t dispenser_eeprom_response__get_packed_size - (const DispenserEEpromResponse *message) -{ - assert(message->base.descriptor == &dispenser_eeprom_response__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t dispenser_eeprom_response__pack - (const DispenserEEpromResponse *message, - uint8_t *out) -{ - assert(message->base.descriptor == &dispenser_eeprom_response__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t dispenser_eeprom_response__pack_to_buffer - (const DispenserEEpromResponse *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &dispenser_eeprom_response__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -DispenserEEpromResponse * - dispenser_eeprom_response__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (DispenserEEpromResponse *) - protobuf_c_message_unpack (&dispenser_eeprom_response__descriptor, - allocator, len, data); -} -void dispenser_eeprom_response__free_unpacked - (DispenserEEpromResponse *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &dispenser_eeprom_response__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -static const ProtobufCFieldDescriptor dispenser_eeprom_response__field_descriptors[2] = -{ - { - "", - 1, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromResponse, has_dispenserid), - offsetof(DispenserEEpromResponse, dispenserid), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 2, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_MESSAGE, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromResponse, dispensereeprom), - &dispenser_eeprom_info__descriptor, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, -}; -static const unsigned dispenser_eeprom_response__field_indices_by_name[] = { - 1, /* field[1] = DispenserEEprom */ - 0, /* field[0] = DispenserId */ -}; -static const ProtobufCIntRange dispenser_eeprom_response__number_ranges[1 + 1] = -{ - { 1, 0 }, - { 0, 2 } -}; -const ProtobufCMessageDescriptor dispenser_eeprom_response__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(DispenserEEpromResponse), - 2, - dispenser_eeprom_response__field_descriptors, - dispenser_eeprom_response__field_indices_by_name, - 1, dispenser_eeprom_response__number_ranges, - (ProtobufCMessageInit) dispenser_eeprom_response__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.h deleted file mode 100644 index a9186f5ef..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.h +++ /dev/null @@ -1,74 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: DispenserEEpromResponse.proto */ - -#ifndef PROTOBUF_C_DispenserEEpromResponse_2eproto__INCLUDED -#define PROTOBUF_C_DispenserEEpromResponse_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 - -#include "DispenserEEprom.pb-c.h" - -typedef struct _DispenserEEpromResponse DispenserEEpromResponse; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _DispenserEEpromResponse -{ - ProtobufCMessage base; - protobuf_c_boolean has_dispenserid; - uint32_t dispenserid; - DispenserEEpromInfo *dispensereeprom; -}; -#define DISPENSER_EEPROM_RESPONSE__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&dispenser_eeprom_response__descriptor) \ - , 0, 0, NULL } - - -/* DispenserEEpromResponse methods */ -void dispenser_eeprom_response__init - (DispenserEEpromResponse *message); -size_t dispenser_eeprom_response__get_packed_size - (const DispenserEEpromResponse *message); -size_t dispenser_eeprom_response__pack - (const DispenserEEpromResponse *message, - uint8_t *out); -size_t dispenser_eeprom_response__pack_to_buffer - (const DispenserEEpromResponse *message, - ProtobufCBuffer *buffer); -DispenserEEpromResponse * - dispenser_eeprom_response__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void dispenser_eeprom_response__free_unpacked - (DispenserEEpromResponse *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*DispenserEEpromResponse_Closure) - (const DispenserEEpromResponse *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor dispenser_eeprom_response__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_DispenserEEpromResponse_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.c deleted file mode 100644 index 88ef38caf..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.c +++ /dev/null @@ -1,495 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StubDispenserEEPROM.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "StubDispenserEEPROM.pb-c.h" -void dispenser_eeprom_data__init - (DispenserEEpromData *message) -{ - static const DispenserEEpromData init_value = DISPENSER_EEPROM_DATA__INIT; - *message = init_value; -} -size_t dispenser_eeprom_data__get_packed_size - (const DispenserEEpromData *message) -{ - assert(message->base.descriptor == &dispenser_eeprom_data__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t dispenser_eeprom_data__pack - (const DispenserEEpromData *message, - uint8_t *out) -{ - assert(message->base.descriptor == &dispenser_eeprom_data__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t dispenser_eeprom_data__pack_to_buffer - (const DispenserEEpromData *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &dispenser_eeprom_data__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -DispenserEEpromData * - dispenser_eeprom_data__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (DispenserEEpromData *) - protobuf_c_message_unpack (&dispenser_eeprom_data__descriptor, - allocator, len, data); -} -void dispenser_eeprom_data__free_unpacked - (DispenserEEpromData *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &dispenser_eeprom_data__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -static const ProtobufCFieldDescriptor dispenser_eeprom_data__field_descriptors[32] = -{ - { - "", - 1, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_header), - offsetof(DispenserEEpromData, header), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 2, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_tablelength), - offsetof(DispenserEEpromData, tablelength), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 3, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_tableversion), - offsetof(DispenserEEpromData, tableversion), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 4, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromData, dispenserp_n), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 5, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromData, pcbs_n), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 6, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromData, pcbpartnumber), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 7, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromData, dispensers_n), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 8, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_minimalpressure), - offsetof(DispenserEEpromData, minimalpressure), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 9, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_maximalpressure), - offsetof(DispenserEEpromData, maximalpressure), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 10, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_minimalmv), - offsetof(DispenserEEpromData, minimalmv), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 11, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_maximalmv), - offsetof(DispenserEEpromData, maximalmv), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 12, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_totalcycles), - offsetof(DispenserEEpromData, totalcycles), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 13, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_bubblesize), - offsetof(DispenserEEpromData, bubblesize), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 14, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_avg_nl_stepvalue_1_4), - offsetof(DispenserEEpromData, avg_nl_stepvalue_1_4), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 15, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_avg_nl_stepvalue_2_4), - offsetof(DispenserEEpromData, avg_nl_stepvalue_2_4), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 16, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_avg_nl_stepvalue_3_4), - offsetof(DispenserEEpromData, avg_nl_stepvalue_3_4), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 17, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_avg_nl_stepvalue_4_4), - offsetof(DispenserEEpromData, avg_nl_stepvalue_4_4), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 18, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_sw_reserve), - offsetof(DispenserEEpromData, sw_reserve), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 19, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_INT32, - offsetof(DispenserEEpromData, has_spare1_pressure), - offsetof(DispenserEEpromData, spare1_pressure), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 20, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_INT32, - offsetof(DispenserEEpromData, has_spare2_pressure), - offsetof(DispenserEEpromData, spare2_pressure), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 21, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_motorpulsespercycle), - offsetof(DispenserEEpromData, motorpulsespercycle), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 22, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_color), - offsetof(DispenserEEpromData, color), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 23, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_pressureslope), - offsetof(DispenserEEpromData, pressureslope), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 24, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(DispenserEEpromData, productiondate), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 25, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_atslocation), - offsetof(DispenserEEpromData, atslocation), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 26, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_spare1), - offsetof(DispenserEEpromData, spare1), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 27, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_spare2), - offsetof(DispenserEEpromData, spare2), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 28, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_atschannel), - offsetof(DispenserEEpromData, atschannel), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 29, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_BOOL, - offsetof(DispenserEEpromData, has_unitempty), - offsetof(DispenserEEpromData, unitempty), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 30, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_BOOL, - offsetof(DispenserEEpromData, has_dryrunpass_fail), - offsetof(DispenserEEpromData, dryrunpass_fail), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 31, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_BOOL, - offsetof(DispenserEEpromData, has_flowpass_fail), - offsetof(DispenserEEpromData, flowpass_fail), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 32, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(DispenserEEpromData, has_checksum), - offsetof(DispenserEEpromData, checksum), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, -}; -static const unsigned dispenser_eeprom_data__field_indices_by_name[] = { - 27, /* field[27] = ATSChannel */ - 24, /* field[24] = ATSlocation */ - 13, /* field[13] = AVG_Nl_stepValue_1_4 */ - 14, /* field[14] = AVG_Nl_stepValue_2_4 */ - 15, /* field[15] = AVG_Nl_stepValue_3_4 */ - 16, /* field[16] = AVG_Nl_stepValue_4_4 */ - 12, /* field[12] = BubbleSize */ - 31, /* field[31] = CheckSum */ - 21, /* field[21] = Color */ - 3, /* field[3] = DispenserP_N */ - 6, /* field[6] = DispenserS_N */ - 29, /* field[29] = DryRunPass_Fail */ - 30, /* field[30] = FlowPass_Fail */ - 0, /* field[0] = Header */ - 10, /* field[10] = MaximalMV */ - 8, /* field[8] = MaximalPressure */ - 9, /* field[9] = MinimalMV */ - 7, /* field[7] = MinimalPressure */ - 20, /* field[20] = MotorPulsesPerCycle */ - 5, /* field[5] = PCBPartNumber */ - 4, /* field[4] = PCBS_N */ - 22, /* field[22] = PressureSlope */ - 23, /* field[23] = ProductionDate */ - 17, /* field[17] = SW_Reserve */ - 25, /* field[25] = Spare1 */ - 18, /* field[18] = Spare1_pressure */ - 26, /* field[26] = Spare2 */ - 19, /* field[19] = Spare2_pressure */ - 1, /* field[1] = TableLength */ - 2, /* field[2] = Tableversion */ - 11, /* field[11] = TotalCycles */ - 28, /* field[28] = UnitEmpty */ -}; -static const ProtobufCIntRange dispenser_eeprom_data__number_ranges[1 + 1] = -{ - { 1, 0 }, - { 0, 32 } -}; -const ProtobufCMessageDescriptor dispenser_eeprom_data__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(DispenserEEpromData), - 32, - dispenser_eeprom_data__field_descriptors, - dispenser_eeprom_data__field_indices_by_name, - 1, dispenser_eeprom_data__number_ranges, - (ProtobufCMessageInit) dispenser_eeprom_data__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.h deleted file mode 100644 index d07cd3006..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.h +++ /dev/null @@ -1,129 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StubDispenserEEPROM.proto */ - -#ifndef PROTOBUF_C_StubDispenserEEPROM_2eproto__INCLUDED -#define PROTOBUF_C_StubDispenserEEPROM_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 _DispenserEEpromData DispenserEEpromData; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _DispenserEEpromData -{ - ProtobufCMessage base; - protobuf_c_boolean has_header; - uint32_t header; - protobuf_c_boolean has_tablelength; - uint32_t tablelength; - protobuf_c_boolean has_tableversion; - uint32_t tableversion; - char *dispenserp_n; - char *pcbs_n; - char *pcbpartnumber; - char *dispensers_n; - protobuf_c_boolean has_minimalpressure; - uint32_t minimalpressure; - protobuf_c_boolean has_maximalpressure; - uint32_t maximalpressure; - protobuf_c_boolean has_minimalmv; - uint32_t minimalmv; - protobuf_c_boolean has_maximalmv; - uint32_t maximalmv; - protobuf_c_boolean has_totalcycles; - uint32_t totalcycles; - protobuf_c_boolean has_bubblesize; - uint32_t bubblesize; - protobuf_c_boolean has_avg_nl_stepvalue_1_4; - uint32_t avg_nl_stepvalue_1_4; - protobuf_c_boolean has_avg_nl_stepvalue_2_4; - uint32_t avg_nl_stepvalue_2_4; - protobuf_c_boolean has_avg_nl_stepvalue_3_4; - uint32_t avg_nl_stepvalue_3_4; - protobuf_c_boolean has_avg_nl_stepvalue_4_4; - uint32_t avg_nl_stepvalue_4_4; - protobuf_c_boolean has_sw_reserve; - uint32_t sw_reserve; - protobuf_c_boolean has_spare1_pressure; - int32_t spare1_pressure; - protobuf_c_boolean has_spare2_pressure; - int32_t spare2_pressure; - protobuf_c_boolean has_motorpulsespercycle; - uint32_t motorpulsespercycle; - protobuf_c_boolean has_color; - uint32_t color; - protobuf_c_boolean has_pressureslope; - uint32_t pressureslope; - char *productiondate; - protobuf_c_boolean has_atslocation; - uint32_t atslocation; - protobuf_c_boolean has_spare1; - uint32_t spare1; - protobuf_c_boolean has_spare2; - uint32_t spare2; - protobuf_c_boolean has_atschannel; - uint32_t atschannel; - protobuf_c_boolean has_unitempty; - protobuf_c_boolean unitempty; - protobuf_c_boolean has_dryrunpass_fail; - protobuf_c_boolean dryrunpass_fail; - protobuf_c_boolean has_flowpass_fail; - protobuf_c_boolean flowpass_fail; - protobuf_c_boolean has_checksum; - uint32_t checksum; -}; -#define DISPENSER_EEPROM_DATA__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&dispenser_eeprom_data__descriptor) \ - , 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 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, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } - - -/* DispenserEEpromData methods */ -void dispenser_eeprom_data__init - (DispenserEEpromData *message); -size_t dispenser_eeprom_data__get_packed_size - (const DispenserEEpromData *message); -size_t dispenser_eeprom_data__pack - (const DispenserEEpromData *message, - uint8_t *out); -size_t dispenser_eeprom_data__pack_to_buffer - (const DispenserEEpromData *message, - ProtobufCBuffer *buffer); -DispenserEEpromData * - dispenser_eeprom_data__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void dispenser_eeprom_data__free_unpacked - (DispenserEEpromData *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*DispenserEEpromData_Closure) - (const DispenserEEpromData *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor dispenser_eeprom_data__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_StubDispenserEEPROM_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEPROM.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEPROM.pb-c.c deleted file mode 100644 index 919b17543..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEPROM.pb-c.c +++ /dev/null @@ -1,326 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StubWhsEEPROM.proto */ - -/* Do not generate deprecated warnings for self */ -#ifndef PROTOBUF_C__NO_DEPRECATED -#define PROTOBUF_C__NO_DEPRECATED -#endif - -#include "StubWhsEEPROM.pb-c.h" -void whs_eeprom_data__init - (WhsEEpromData *message) -{ - static const WhsEEpromData init_value = WHS_EEPROM_DATA__INIT; - *message = init_value; -} -size_t whs_eeprom_data__get_packed_size - (const WhsEEpromData *message) -{ - assert(message->base.descriptor == &whs_eeprom_data__descriptor); - return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); -} -size_t whs_eeprom_data__pack - (const WhsEEpromData *message, - uint8_t *out) -{ - assert(message->base.descriptor == &whs_eeprom_data__descriptor); - return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); -} -size_t whs_eeprom_data__pack_to_buffer - (const WhsEEpromData *message, - ProtobufCBuffer *buffer) -{ - assert(message->base.descriptor == &whs_eeprom_data__descriptor); - return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); -} -WhsEEpromData * - whs_eeprom_data__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data) -{ - return (WhsEEpromData *) - protobuf_c_message_unpack (&whs_eeprom_data__descriptor, - allocator, len, data); -} -void whs_eeprom_data__free_unpacked - (WhsEEpromData *message, - ProtobufCAllocator *allocator) -{ - if(!message) - return; - assert(message->base.descriptor == &whs_eeprom_data__descriptor); - protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); -} -static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] = -{ - { - "", - 1, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(WhsEEpromData, has_header), - offsetof(WhsEEpromData, header), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 2, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(WhsEEpromData, has_tablelength), - offsetof(WhsEEpromData, tablelength), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 3, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(WhsEEpromData, has_tableversion), - offsetof(WhsEEpromData, tableversion), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 4, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(WhsEEpromData, whsp_n), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 5, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(WhsEEpromData, pcbs_n), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 6, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(WhsEEpromData, pcbpartnumber), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 7, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(WhsEEpromData, whss_n), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 8, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(WhsEEpromData, has_orifice1flow), - offsetof(WhsEEpromData, orifice1flow), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 9, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(WhsEEpromData, has_orifice1slope), - offsetof(WhsEEpromData, orifice1slope), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 10, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(WhsEEpromData, has_orifice2flow), - offsetof(WhsEEpromData, orifice2flow), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 11, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(WhsEEpromData, has_orifice2slope), - offsetof(WhsEEpromData, orifice2slope), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 12, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(WhsEEpromData, has_orifice3flow), - offsetof(WhsEEpromData, orifice3flow), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 13, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(WhsEEpromData, has_orifice3slope), - offsetof(WhsEEpromData, orifice3slope), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 14, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(WhsEEpromData, has_orificevalveflow), - offsetof(WhsEEpromData, orificevalveflow), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 15, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_DOUBLE, - offsetof(WhsEEpromData, has_orificevalveslope), - offsetof(WhsEEpromData, orificevalveslope), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 16, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(WhsEEpromData, vocinstallationdate), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 17, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(WhsEEpromData, filterinstallationdate), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 18, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_STRING, - 0, /* quantifier_offset */ - offsetof(WhsEEpromData, productiondate), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, - { - "", - 19, - PROTOBUF_C_LABEL_OPTIONAL, - PROTOBUF_C_TYPE_UINT32, - offsetof(WhsEEpromData, has_checksum), - offsetof(WhsEEpromData, checksum), - NULL, - NULL, - 0, /* flags */ - 0,NULL,NULL /* reserved1,reserved2, etc */ - }, -}; -static const unsigned whs_eeprom_data__field_indices_by_name[] = { - 18, /* field[18] = CheckSum */ - 16, /* field[16] = FilterInstallationDate */ - 0, /* field[0] = Header */ - 7, /* field[7] = Orifice1Flow */ - 8, /* field[8] = Orifice1Slope */ - 9, /* field[9] = Orifice2Flow */ - 10, /* field[10] = Orifice2Slope */ - 11, /* field[11] = Orifice3Flow */ - 12, /* field[12] = Orifice3Slope */ - 13, /* field[13] = OrificeValveFlow */ - 14, /* field[14] = OrificeValveSlope */ - 5, /* field[5] = PCBPartNumber */ - 4, /* field[4] = PCBS_N */ - 17, /* field[17] = ProductionDate */ - 1, /* field[1] = TableLength */ - 2, /* field[2] = Tableversion */ - 15, /* field[15] = VOCInstallationDate */ - 3, /* field[3] = WhsP_N */ - 6, /* field[6] = WhsS_N */ -}; -static const ProtobufCIntRange whs_eeprom_data__number_ranges[1 + 1] = -{ - { 1, 0 }, - { 0, 19 } -}; -const ProtobufCMessageDescriptor whs_eeprom_data__descriptor = -{ - PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, - "", - "", - "", - "", - sizeof(WhsEEpromData), - 19, - whs_eeprom_data__field_descriptors, - whs_eeprom_data__field_indices_by_name, - 1, whs_eeprom_data__number_ranges, - (ProtobufCMessageInit) whs_eeprom_data__init, - NULL,NULL,NULL /* reserved[123] */ -}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEPROM.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEPROM.pb-c.h deleted file mode 100644 index a140ecf81..000000000 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEPROM.pb-c.h +++ /dev/null @@ -1,101 +0,0 @@ -/* Generated by the protocol buffer compiler. DO NOT EDIT! */ -/* Generated from: StubWhsEEPROM.proto */ - -#ifndef PROTOBUF_C_StubWhsEEPROM_2eproto__INCLUDED -#define PROTOBUF_C_StubWhsEEPROM_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 _WhsEEpromData WhsEEpromData; - - -/* --- enums --- */ - - -/* --- messages --- */ - -struct _WhsEEpromData -{ - ProtobufCMessage base; - protobuf_c_boolean has_header; - uint32_t header; - protobuf_c_boolean has_tablelength; - uint32_t tablelength; - protobuf_c_boolean has_tableversion; - uint32_t tableversion; - char *whsp_n; - char *pcbs_n; - char *pcbpartnumber; - char *whss_n; - protobuf_c_boolean has_orifice1flow; - double orifice1flow; - protobuf_c_boolean has_orifice1slope; - double orifice1slope; - protobuf_c_boolean has_orifice2flow; - double orifice2flow; - protobuf_c_boolean has_orifice2slope; - double orifice2slope; - protobuf_c_boolean has_orifice3flow; - double orifice3flow; - protobuf_c_boolean has_orifice3slope; - double orifice3slope; - protobuf_c_boolean has_orificevalveflow; - double orificevalveflow; - protobuf_c_boolean has_orificevalveslope; - double orificevalveslope; - char *vocinstallationdate; - char *filterinstallationdate; - char *productiondate; - protobuf_c_boolean has_checksum; - uint32_t checksum; -}; -#define WHS_EEPROM_DATA__INIT \ - { PROTOBUF_C_MESSAGE_INIT (&whs_eeprom_data__descriptor) \ - , 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0 } - - -/* WhsEEpromData methods */ -void whs_eeprom_data__init - (WhsEEpromData *message); -size_t whs_eeprom_data__get_packed_size - (const WhsEEpromData *message); -size_t whs_eeprom_data__pack - (const WhsEEpromData *message, - uint8_t *out); -size_t whs_eeprom_data__pack_to_buffer - (const WhsEEpromData *message, - ProtobufCBuffer *buffer); -WhsEEpromData * - whs_eeprom_data__unpack - (ProtobufCAllocator *allocator, - size_t len, - const uint8_t *data); -void whs_eeprom_data__free_unpacked - (WhsEEpromData *message, - ProtobufCAllocator *allocator); -/* --- per-message closures --- */ - -typedef void (*WhsEEpromData_Closure) - (const WhsEEpromData *message, - void *closure_data); - -/* --- services --- */ - - -/* --- descriptors --- */ - -extern const ProtobufCMessageDescriptor whs_eeprom_data__descriptor; - -PROTOBUF_C__END_DECLS - - -#endif /* PROTOBUF_C_StubWhsEEPROM_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c index 97e4311b6..ae277ebd5 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c @@ -21,12 +21,9 @@ #include <drivers/FPGA/FPGA_Comm.h> #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" -#include "PMR/stubs/StubDispenserEEprom.pb-c.h" +#include "PMR/stubs/StubDispenserEEpromData.pb-c.h" #include "PMR/stubs/StubDispenserEEpromRequest.pb-c.h" #include "PMR/stubs/StubDispenserEEpromResponse.pb-c.h" -#include "PMR/Diagnostics/DispenserEEprom.pb-c.h" -#include "PMR/Diagnostics/DispenserEEpromRequest.pb-c.h" -#include "PMR/Diagnostics/DispenserEEpromResponse.pb-c.h" @@ -242,7 +239,7 @@ uint8_t Check_Dispenser_Type(uint8_t Dispenser_ID) return Dispenser_struct[Dispenser_ID].Status; } -uint32_t Get_EEPROM_DATA_From_Dispenser(int Dispenser_ID,DispenserEEpromData *dispensereeprom) +uint32_t Get_EEPROM_DATA_From_Dispenser(int Dispenser_ID,StubDispenserEEpromData *dispensereeprom) { uint32_t status = OK; status |= I2C_EEprom_Set_for_Read_Ch(Dispenser_ID, 0xA0); @@ -323,7 +320,7 @@ uint32_t Get_EEPROM_DATA_From_Dispenser(int Dispenser_ID,DispenserEEpromData *di } return status; } -uint32_t Prepare_EEPROM_DATA_For_Burning(int Dispenser_ID,DispenserEEpromData *dispensereeprom) +uint32_t Prepare_EEPROM_DATA_For_Burning(int Dispenser_ID,StubDispenserEEpromData *dispensereeprom) { uint32_t status = OK; Dispenser_struct[Dispenser_ID].Write_Disp_EEPROM.bytes.Header = dispensereeprom->header; @@ -367,7 +364,7 @@ uint32_t Prepare_EEPROM_DATA_For_Burning(int Dispenser_ID,DispenserEEpromData *d SysCtlDelay(5000000);//Must delay for at least 5 milli. !!! (See data sheet ) return status; } -uint32_t DispenserEEpromRequestFunc(MessageContainer* requestContainer) +/*uint32_t DispenserEEpromRequestFunc(MessageContainer* requestContainer) { DispenserEEpromRequest *request = dispenser_eeprom_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); DispenserEEpromResponse Cresponse = DISPENSER_EEPROM_RESPONSE__INIT; @@ -416,15 +413,15 @@ uint32_t DispenserEEpromRequestFunc(MessageContainer* requestContainer) SendChars((char*)container_buffer, container_size); return OK; -} +}*/ uint32_t StubDispenserEEpromRequestFunc(MessageContainer* requestContainer) { - DispenserEEpromRequest *request = dispenser_eeprom_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); - DispenserEEpromResponse Cresponse = DISPENSER_EEPROM_RESPONSE__INIT; + StubDispenserEEpromRequest *request = stub_dispenser_eeprom_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data); + StubDispenserEEpromResponse Cresponse = STUB_DISPENSER_EEPROM_RESPONSE__INIT; MessageContainer responseContainer; uint32_t status = OK; - DispenserEEpromData *DispenserEEpromInstance; + StubDispenserEEpromData *DispenserEEpromInstance; Report("StubDispenserEEpromRequestFunc",__FILE__,__LINE__,request->dispenserid,RpWarning,(int)request->burnrequest,0); if (request->burnrequest == true) @@ -433,10 +430,10 @@ uint32_t StubDispenserEEpromRequestFunc(MessageContainer* requestContainer) } else { - DispenserEEpromInstance = my_malloc(sizeof(DispenserEEpromData)); + DispenserEEpromInstance = my_malloc(sizeof(StubDispenserEEpromData)); if (DispenserEEpromInstance) { - dispenser_eeprom_data__init(DispenserEEpromInstance); + stub_dispenser_eeprom_data__init(DispenserEEpromInstance); status = Get_EEPROM_DATA_From_Dispenser(request->dispenserid,DispenserEEpromInstance); } else @@ -451,7 +448,7 @@ uint32_t StubDispenserEEpromRequestFunc(MessageContainer* requestContainer) } Cresponse.has_dispenserid = true; Cresponse.dispenserid = request->dispenserid; - responseContainer = createContainer(MESSAGE_TYPE__StubDispenserEEpromResponse, requestContainer->token, true, &Cresponse, &dispenser_eeprom_response__pack, &dispenser_eeprom_response__get_packed_size); + responseContainer = createContainer(MESSAGE_TYPE__StubDispenserEEpromResponse, requestContainer->token, true, &Cresponse, &stub_dispenser_eeprom_response__pack, &stub_dispenser_eeprom_response__get_packed_size); responseContainer.continuous = false; if (status != OK) { diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c index 378794b5e..478b8cef7 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c @@ -304,6 +304,32 @@ uint32_t HeadCard_HeadMagnet_Disable() return status; } + +uint32_t HeadCard_ActivateHeadPressureArcBlowers() +{ + uint32_t status = OK; + //MAG_EN<=’1’, MAG_DIR<=’0’ - Board is powered by 24V. + if(Head_Type == HEAD_TYPE_STAPLE_SPUN) + { + Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_EN = ENABLE; + Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_DIR = 0x00; + status |= Head_Write_IO_Reg(0x42,LOW_AND_HIGH); + } + return status; +} + +uint32_t HeadCard_DeActivateHeadPressureArcBlowers() +{ + uint32_t status = OK; + //MAG_EN<=’0’, MAG_DIR<=’0’ -- no 24V on the board + if(Head_Type == HEAD_TYPE_STAPLE_SPUN) + { + Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_EN = DISABLE; + Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_DIR = 0x00; + status |= Head_Write_IO_Reg(0x42,LOW_AND_HIGH); + } + return status; +} //-------------------------------------------------- uint32_t HeadCard_Valve_Control(bool Direction) diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c index 2e35ce558..fbf118024 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c @@ -12,7 +12,7 @@ #include "Drivers/I2C_Communication/WHS_Card/WHS_data.h" #include "driverlib/i2c.h" -#include "PMR/stubs/StubWhsEEprom.pb-c.h" +#include "PMR/stubs/StubWhsEEpromData.pb-c.h" #include "PMR/stubs/StubWhsEEpromRequest.pb-c.h" #include "PMR/stubs/StubWhsEEpromResponse.pb-c.h" @@ -123,7 +123,7 @@ uint32_t WHS_I2C_EEprom_Write_Ch() for(i=0;i<Max_WHS_buf_size;i++) { - WHS_Write_Buf[i+2] = WHS_struct.Write_WHS_EEPROM.Buf[i]; + WHS_Write_Buf[i+2] = WHS_Eeprom.Buf[i]; } status |= I2C_Write(I2C_ID_WHS_CARD, I2CEEPROM_ADDRESS, WHS_Write_Buf, Max_WHS_buf_size+2); @@ -161,19 +161,19 @@ uint32_t Test_WHS_EEPROM() uint32_t status= OK; uint32_t i; - WHS_struct.Write_WHS_EEPROM.bytes.SN = 0x12345678; + WHS_Eeprom.bytes.SN = 0x12345678; - WHS_struct.Write_WHS_EEPROM.bytes.Uint32_Spare[0] = 0xA123456A; - WHS_struct.Write_WHS_EEPROM.bytes.Uint32_Spare[1] = 0xB123456B; - WHS_struct.Write_WHS_EEPROM.bytes.Uint32_Spare[2] = 0xC123456C; - WHS_struct.Write_WHS_EEPROM.bytes.Uint32_Spare[3] = 0xD123456D; - WHS_struct.Write_WHS_EEPROM.bytes.Uint32_Spare[4] = 0xE123456E; + WHS_Eeprom.bytes.Uint32_Spare[0] = 0xA123456A; + WHS_Eeprom.bytes.Uint32_Spare[1] = 0xB123456B; + WHS_Eeprom.bytes.Uint32_Spare[2] = 0xC123456C; + WHS_Eeprom.bytes.Uint32_Spare[3] = 0xD123456D; + WHS_Eeprom.bytes.Uint32_Spare[4] = 0xE123456E; - WHS_struct.Write_WHS_EEPROM.bytes.Double_Spare[0] = 0xA789012A; - WHS_struct.Write_WHS_EEPROM.bytes.Double_Spare[1] = 0xB789012B; - WHS_struct.Write_WHS_EEPROM.bytes.Double_Spare[2] = 0xC789012C; - WHS_struct.Write_WHS_EEPROM.bytes.Double_Spare[3] = 0xD789012D; - WHS_struct.Write_WHS_EEPROM.bytes.Double_Spare[4] = 0xE789012E; + WHS_Eeprom.bytes.Double_Spare[0] = 0xA789012A; + WHS_Eeprom.bytes.Double_Spare[1] = 0xB789012B; + WHS_Eeprom.bytes.Double_Spare[2] = 0xC789012C; + WHS_Eeprom.bytes.Double_Spare[3] = 0xD789012D; + WHS_Eeprom.bytes.Double_Spare[4] = 0xE789012E; status |= WHS_I2C_EEprom_Write_Ch(); SysCtlDelay(5000000);//Must delay for at least 5 milli. !!! (See data sheet ) @@ -184,7 +184,7 @@ uint32_t Test_WHS_EEPROM() { for(i=0;i<Max_WHS_buf_size;i++) { - if(WHS_struct.Read_WHS_EEPROM.Buf[i]!=WHS_struct.Write_WHS_EEPROM.Buf[i]) + if(WHS_struct.Read_WHS_EEPROM.Buf[i]!=WHS_Eeprom.Buf[i]) status |= ERROR; } } @@ -192,8 +192,38 @@ uint32_t Test_WHS_EEPROM() return status; } */ +/** + * /* ProtobufCMessage base; uint8_t PCB_SN[20]; + uint32_t header; uint8_t Module_SN[20]; + uint32_t tablelength; double Orifice_Pressure_V0[3]; // (meas + uint32_t tableversion; double Orifice_Waste_Level_V0; // (meas + char *whsp_n; double flow_calc_coefficient_C; // C (f + char *pcbs_n; uint32_t Header; + char *pcbpartnumber; uint32_t Table_Length; + char *whss_n; uint32_t Table_version; + double orifice1flow; uint8_t WHS_Part_Number[20];//String + double orifice1slope; // uint8_t PCB_SN[20];//String + double orifice2flow; uint8_t PCB_Part_Number[20];//String + double orifice2slope; uint8_t WHS_SN[20];//String + double orifice3flow; double Orifice1Flow; + double orifice3slope; double Orifice1Slope; + double orificevalveflow; double Orifice2Flow; + double orificevalveslope; double Orifice2Slope; + char *vocinstallationdate; double Orifice3Flow; + char *filterinstallationdate; double Orifice3Slope; + char *productiondate; double OrificeValveFlow; + uint32_t checksum; double OrificeValveSlope; + * uint8_t VOCInstallationDate[8]; + * uint8_t FilterInstallationDate[8]; + uint8_t ProductionDate[8]; + uint32_t CheckSum; +ured orifice sensor voltage with out flow) value for each orifice sensor +ured orifice sensor voltage without flow) value for each orifice sensor +low calculation coefficient) value (=0.239) + * -uint32_t Get_EEPROM_DATA_From_WHS(WhsEEpromData *Whseeprom) + * */ +uint32_t Get_EEPROM_DATA_From_WHS(StubWhsEEpromData *Whseeprom) { uint32_t status = OK; /* status |= I2C_EEprom_Set_for_Read_Ch(Whs_ID, 0xA0); @@ -202,123 +232,122 @@ uint32_t Get_EEPROM_DATA_From_WHS(WhsEEpromData *Whseeprom) if (status == OK) { Whseeprom->has_header = true; - Whseeprom->header = Whs_struct.Read_Disp_EEPROM.bytes.Header; + Whseeprom->header = WHS_Eeprom.bytes.Header; Whseeprom->has_tablelength = true; - Whseeprom->tablelength = Whs_struct.Read_Disp_EEPROM.bytes.Table_Length; + Whseeprom->tablelength = WHS_Eeprom.bytes.Table_Length; Whseeprom->has_tableversion = true; - Whseeprom->tableversion = Whs_struct.Read_Disp_EEPROM.bytes.Table_version; - Whseeprom->Whsp_n = my_malloc(sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Whs_Part_Number)); + Whseeprom->tableversion = WHS_Eeprom.bytes.Table_version; + Whseeprom->Whsp_n = my_malloc(sizeof(WHS_Eeprom.bytes.Whs_Part_Number)); if (Whseeprom->Whsp_n) - memcpy(Whseeprom->Whsp_n,Whs_struct.Read_Disp_EEPROM.bytes.Whs_Part_Number,sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Whs_Part_Number)); - Whseeprom->pcbs_n = my_malloc(sizeof(Whs_struct.Read_Disp_EEPROM.bytes.PCB_SN)); + memcpy(Whseeprom->Whsp_n,WHS_Eeprom.bytes.Whs_Part_Number,sizeof(WHS_Eeprom.bytes.Whs_Part_Number)); + Whseeprom->pcbs_n = my_malloc(sizeof(WHS_Eeprom.bytes.PCB_SN)); if (Whseeprom->pcbs_n) - memcpy(Whseeprom->pcbs_n,Whs_struct.Read_Disp_EEPROM.bytes.PCB_SN,sizeof(Whs_struct.Read_Disp_EEPROM.bytes.PCB_SN)); - Whseeprom->pcbpartnumber = my_malloc(sizeof(Whs_struct.Read_Disp_EEPROM.bytes.PCB_Part_Number)); + memcpy(Whseeprom->pcbs_n,WHS_Eeprom.bytes.PCB_SN,sizeof(WHS_Eeprom.bytes.PCB_SN)); + Whseeprom->pcbpartnumber = my_malloc(sizeof(WHS_Eeprom.bytes.PCB_Part_Number)); if (Whseeprom->pcbpartnumber) - memcpy(Whseeprom->pcbpartnumber,Whs_struct.Read_Disp_EEPROM.bytes.PCB_Part_Number,sizeof(Whs_struct.Read_Disp_EEPROM.bytes.PCB_Part_Number)); - Whseeprom->Whss_n = my_malloc(sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Whs_SN)); + memcpy(Whseeprom->pcbpartnumber,WHS_Eeprom.bytes.PCB_Part_Number,sizeof(WHS_Eeprom.bytes.PCB_Part_Number)); + Whseeprom->Whss_n = my_malloc(sizeof(WHS_Eeprom.bytes.Whs_SN)); if (Whseeprom->Whss_n) - memcpy(Whseeprom->Whss_n,Whs_struct.Read_Disp_EEPROM.bytes.Whs_SN,sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Whs_SN)); + memcpy(Whseeprom->Whss_n,WHS_Eeprom.bytes.Whs_SN,sizeof(WHS_Eeprom.bytes.Whs_SN)); Whseeprom->has_minimalpressure = true; - Whseeprom->minimalpressure = Whs_struct.Read_Disp_EEPROM.bytes.Maximal_Pressure; + Whseeprom->minimalpressure = WHS_Eeprom.bytes.Maximal_Pressure; Whseeprom->has_maximalpressure = true; - Whseeprom->maximalpressure = Whs_struct.Read_Disp_EEPROM.bytes.Maximal_Pressure; + Whseeprom->maximalpressure = WHS_Eeprom.bytes.Maximal_Pressure; Whseeprom->has_minimalmv = true; - Whseeprom->minimalmv = Whs_struct.Read_Disp_EEPROM.bytes.Minimal_MV; + Whseeprom->minimalmv = WHS_Eeprom.bytes.Minimal_MV; Whseeprom->has_maximalmv = true; - Whseeprom->maximalmv = Whs_struct.Read_Disp_EEPROM.bytes.Maximal_MV; + Whseeprom->maximalmv = WHS_Eeprom.bytes.Maximal_MV; Whseeprom->has_totalcycles = true; - Whseeprom->totalcycles = Whs_struct.Read_Disp_EEPROM.bytes.Total_Cycles; + Whseeprom->totalcycles = WHS_Eeprom.bytes.Total_Cycles; Whseeprom->has_bubblesize = true; - Whseeprom->bubblesize = Whs_struct.Read_Disp_EEPROM.bytes.Bubble_Size; + Whseeprom->bubblesize = WHS_Eeprom.bytes.Bubble_Size; Whseeprom->has_avg_nl_stepvalue_1_4 = true; - Whseeprom->avg_nl_stepvalue_1_4 = Whs_struct.Read_Disp_EEPROM.bytes.AVG_Nl_Step_Value_1_4; + Whseeprom->avg_nl_stepvalue_1_4 = WHS_Eeprom.bytes.AVG_Nl_Step_Value_1_4; Whseeprom->has_avg_nl_stepvalue_2_4 = true; - Whseeprom->avg_nl_stepvalue_2_4 = Whs_struct.Read_Disp_EEPROM.bytes.AVG_Nl_Step_Value_2_4; + Whseeprom->avg_nl_stepvalue_2_4 = WHS_Eeprom.bytes.AVG_Nl_Step_Value_2_4; Whseeprom->has_avg_nl_stepvalue_3_4 = true; - Whseeprom->avg_nl_stepvalue_3_4 = Whs_struct.Read_Disp_EEPROM.bytes.AVG_Nl_Step_Value_3_4; + Whseeprom->avg_nl_stepvalue_3_4 = WHS_Eeprom.bytes.AVG_Nl_Step_Value_3_4; Whseeprom->has_avg_nl_stepvalue_4_4 = true; - Whseeprom->avg_nl_stepvalue_4_4 = Whs_struct.Read_Disp_EEPROM.bytes.AVG_Nl_Step_Value_4_4; + Whseeprom->avg_nl_stepvalue_4_4 = WHS_Eeprom.bytes.AVG_Nl_Step_Value_4_4; Whseeprom->has_sw_reserve = true; - Whseeprom->sw_reserve = Whs_struct.Read_Disp_EEPROM.bytes.SW_Reserve; + Whseeprom->sw_reserve = WHS_Eeprom.bytes.SW_Reserve; Whseeprom->has_spare1_pressure = true; - Whseeprom->spare1_pressure = Whs_struct.Read_Disp_EEPROM.bytes.Spare1_pressure; + Whseeprom->spare1_pressure = WHS_Eeprom.bytes.Spare1_pressure; Whseeprom->has_spare2_pressure = true; - Whseeprom->spare2_pressure = Whs_struct.Read_Disp_EEPROM.bytes.Spare2_pressure; + Whseeprom->spare2_pressure = WHS_Eeprom.bytes.Spare2_pressure; Whseeprom->has_motorpulsespercycle = true; - Whseeprom->motorpulsespercycle = Whs_struct.Read_Disp_EEPROM.bytes.Motor_PPC; + Whseeprom->motorpulsespercycle = WHS_Eeprom.bytes.Motor_PPC; Whseeprom->has_color = true; - Whseeprom->color = Whs_struct.Read_Disp_EEPROM.bytes.color; + Whseeprom->color = WHS_Eeprom.bytes.color; Whseeprom->has_pressureslope = true; - Whseeprom->pressureslope = Whs_struct.Read_Disp_EEPROM.bytes.Pressure_Slope; - Whseeprom->productiondate = my_malloc(sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Production_Test_Date)+1); + Whseeprom->pressureslope = WHS_Eeprom.bytes.Pressure_Slope; + Whseeprom->productiondate = my_malloc(sizeof(WHS_Eeprom.bytes.Production_Test_Date)+1); if (Whseeprom->productiondate) - memcpy(Whseeprom->productiondate,Whs_struct.Read_Disp_EEPROM.bytes.Production_Test_Date,sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Production_Test_Date)); + memcpy(Whseeprom->productiondate,WHS_Eeprom.bytes.Production_Test_Date,sizeof(WHS_Eeprom.bytes.Production_Test_Date)); Whseeprom->has_atslocation = true; - Whseeprom->atslocation = Whs_struct.Read_Disp_EEPROM.bytes.ATS_Location; + Whseeprom->atslocation = WHS_Eeprom.bytes.ATS_Location; Whseeprom->has_spare1 = true; - Whseeprom->spare1 = Whs_struct.Read_Disp_EEPROM.bytes.Spare1; + Whseeprom->spare1 = WHS_Eeprom.bytes.Spare1; Whseeprom->has_spare2 = true; - Whseeprom->spare2 = Whs_struct.Read_Disp_EEPROM.bytes.Spare2; + Whseeprom->spare2 = WHS_Eeprom.bytes.Spare2; Whseeprom->has_atschannel = true; - Whseeprom->atschannel = Whs_struct.Read_Disp_EEPROM.bytes.ATS_Channel; + Whseeprom->atschannel = WHS_Eeprom.bytes.ATS_Channel; Whseeprom->has_unitempty = true; - Whseeprom->unitempty = Whs_struct.Read_Disp_EEPROM.bytes.Unit_Empty; + Whseeprom->unitempty = WHS_Eeprom.bytes.Unit_Empty; Whseeprom->has_dryrunpass_fail = true; - Whseeprom->dryrunpass_fail = Whs_struct.Read_Disp_EEPROM.bytes.Dry_Run_Status; + Whseeprom->dryrunpass_fail = WHS_Eeprom.bytes.Dry_Run_Status; Whseeprom->has_flowpass_fail = true; - Whseeprom->flowpass_fail = Whs_struct.Read_Disp_EEPROM.bytes.Flow_Status; + Whseeprom->flowpass_fail = WHS_Eeprom.bytes.Flow_Status; Whseeprom->has_checksum = true; - Whseeprom->checksum = Whs_struct.Read_Disp_EEPROM.bytes.CheckSum; + Whseeprom->checksum = WHS_Eeprom.bytes.CheckSum; } */ return status; } -uint32_t Prepare_WHS_DATA_For_Burning(WhsEEpromData *Whseeprom) +uint32_t Prepare_WHS_DATA_For_Burning(StubWhsEEpromData *Whseeprom) { uint32_t status = OK; - /* - Whs_struct.Write_Disp_EEPROM.bytes.Header = Whseeprom->header; - Whs_struct.Write_Disp_EEPROM.bytes.Table_Length = Whseeprom->tablelength; - Whs_struct.Write_Disp_EEPROM.bytes.Table_version = Whseeprom->tableversion; - Whs_struct.Write_Disp_EEPROM.bytes.Maximal_Pressure = Whseeprom->minimalpressure; - Whs_struct.Write_Disp_EEPROM.bytes.Maximal_Pressure = Whseeprom->maximalpressure; - Whs_struct.Write_Disp_EEPROM.bytes.Minimal_MV = Whseeprom->minimalmv; - Whs_struct.Write_Disp_EEPROM.bytes.Maximal_MV = Whseeprom->maximalmv; - Whs_struct.Write_Disp_EEPROM.bytes.Total_Cycles = Whseeprom->totalcycles; - Whs_struct.Write_Disp_EEPROM.bytes.Bubble_Size = Whseeprom->bubblesize; - Whs_struct.Write_Disp_EEPROM.bytes.AVG_Nl_Step_Value_1_4 = Whseeprom->avg_nl_stepvalue_1_4; - Whs_struct.Write_Disp_EEPROM.bytes.AVG_Nl_Step_Value_2_4 = Whseeprom->avg_nl_stepvalue_2_4; - Whs_struct.Write_Disp_EEPROM.bytes.AVG_Nl_Step_Value_3_4 = Whseeprom->avg_nl_stepvalue_3_4; - Whs_struct.Write_Disp_EEPROM.bytes.AVG_Nl_Step_Value_4_4 = Whseeprom->avg_nl_stepvalue_4_4; - Whs_struct.Write_Disp_EEPROM.bytes.SW_Reserve = Whseeprom->sw_reserve; - Whs_struct.Write_Disp_EEPROM.bytes.Spare1_pressure = Whseeprom->spare1_pressure; - Whs_struct.Write_Disp_EEPROM.bytes.Spare2_pressure = Whseeprom->spare2_pressure; - Whs_struct.Write_Disp_EEPROM.bytes.Motor_PPC = Whseeprom->motorpulsespercycle; - Whs_struct.Write_Disp_EEPROM.bytes.color = Whseeprom->color; - Whs_struct.Write_Disp_EEPROM.bytes.Pressure_Slope = Whseeprom->pressureslope; - Whs_struct.Write_Disp_EEPROM.bytes.ATS_Location = Whseeprom->atslocation; - Whs_struct.Write_Disp_EEPROM.bytes.Spare1 = Whseeprom->spare1; - Whs_struct.Write_Disp_EEPROM.bytes.Spare2 = Whseeprom->spare2; - Whs_struct.Write_Disp_EEPROM.bytes.ATS_Channel = Whseeprom->atschannel; - Whs_struct.Write_Disp_EEPROM.bytes.Unit_Empty = Whseeprom->unitempty; - Whs_struct.Write_Disp_EEPROM.bytes.Dry_Run_Status = Whseeprom->dryrunpass_fail; - Whs_struct.Write_Disp_EEPROM.bytes.Flow_Status = Whseeprom->flowpass_fail; - Whs_struct.Write_Disp_EEPROM.bytes.CheckSum = Whseeprom->checksum; +/* WHS_Eeprom.bytes.Header = Whseeprom->header; + WHS_Eeprom.bytes.Table_Length = Whseeprom->tablelength; + WHS_Eeprom.bytes.Table_version = Whseeprom->tableversion; + WHS_Eeprom.bytes.Maximal_Pressure = Whseeprom->minimalpressure; + WHS_Eeprom.bytes.Maximal_Pressure = Whseeprom->maximalpressure; + WHS_Eeprom.bytes.Minimal_MV = Whseeprom->minimalmv; + WHS_Eeprom.bytes.Maximal_MV = Whseeprom->maximalmv; + WHS_Eeprom.bytes.Total_Cycles = Whseeprom->totalcycles; + WHS_Eeprom.bytes.Bubble_Size = Whseeprom->bubblesize; + WHS_Eeprom.bytes.AVG_Nl_Step_Value_1_4 = Whseeprom->avg_nl_stepvalue_1_4; + WHS_Eeprom.bytes.AVG_Nl_Step_Value_2_4 = Whseeprom->avg_nl_stepvalue_2_4; + WHS_Eeprom.bytes.AVG_Nl_Step_Value_3_4 = Whseeprom->avg_nl_stepvalue_3_4; + WHS_Eeprom.bytes.AVG_Nl_Step_Value_4_4 = Whseeprom->avg_nl_stepvalue_4_4; + WHS_Eeprom.bytes.SW_Reserve = Whseeprom->sw_reserve; + WHS_Eeprom.bytes.Spare1_pressure = Whseeprom->spare1_pressure; + WHS_Eeprom.bytes.Spare2_pressure = Whseeprom->spare2_pressure; + WHS_Eeprom.bytes.Motor_PPC = Whseeprom->motorpulsespercycle; + WHS_Eeprom.bytes.color = Whseeprom->color; + WHS_Eeprom.bytes.Pressure_Slope = Whseeprom->pressureslope; + WHS_Eeprom.bytes.ATS_Location = Whseeprom->atslocation; + WHS_Eeprom.bytes.Spare1 = Whseeprom->spare1; + WHS_Eeprom.bytes.Spare2 = Whseeprom->spare2; + WHS_Eeprom.bytes.ATS_Channel = Whseeprom->atschannel; + WHS_Eeprom.bytes.Unit_Empty = Whseeprom->unitempty; + WHS_Eeprom.bytes.Dry_Run_Status = Whseeprom->dryrunpass_fail; + WHS_Eeprom.bytes.Flow_Status = Whseeprom->flowpass_fail; + WHS_Eeprom.bytes.CheckSum = Whseeprom->checksum; if (Whseeprom->Whsp_n) - strncpy(Whs_struct.Write_Disp_EEPROM.bytes.Whs_Part_Number,Whseeprom->Whsp_n,sizeof(Whs_struct.Write_Disp_EEPROM.bytes.Whs_Part_Number)); + strncpy(WHS_Eeprom.bytes.Whs_Part_Number,Whseeprom->Whsp_n,sizeof(WHS_Eeprom.bytes.Whs_Part_Number)); if (Whseeprom->pcbs_n) - strncpy(Whs_struct.Write_Disp_EEPROM.bytes.PCB_SN,Whseeprom->pcbs_n,sizeof(Whs_struct.Write_Disp_EEPROM.bytes.PCB_SN)); + strncpy(WHS_Eeprom.bytes.PCB_SN,Whseeprom->pcbs_n,sizeof(WHS_Eeprom.bytes.PCB_SN)); if (Whseeprom->pcbpartnumber) - strncpy(Whs_struct.Write_Disp_EEPROM.bytes.PCB_Part_Number,Whseeprom->pcbpartnumber,sizeof(Whs_struct.Write_Disp_EEPROM.bytes.PCB_Part_Number)); + strncpy(WHS_Eeprom.bytes.PCB_Part_Number,Whseeprom->pcbpartnumber,sizeof(WHS_Eeprom.bytes.PCB_Part_Number)); if (Whseeprom->Whss_n) - strncpy(Whs_struct.Write_Disp_EEPROM.bytes.Whs_SN,Whseeprom->Whss_n,sizeof(Whs_struct.Write_Disp_EEPROM.bytes.Whs_SN)); + strncpy(WHS_Eeprom.bytes.Whs_SN,Whseeprom->Whss_n,sizeof(WHS_Eeprom.bytes.Whs_SN)); if (Whseeprom->productiondate) - strncpy(Whs_struct.Write_Disp_EEPROM.bytes.Production_Test_Date,Whseeprom->productiondate,sizeof(Whs_struct.Write_Disp_EEPROM.bytes.Production_Test_Date)); + strncpy(WHS_Eeprom.bytes.Production_Test_Date,Whseeprom->productiondate,sizeof(WHS_Eeprom.bytes.Production_Test_Date)); status = I2C_EEprom_Write_Ch(Whs_ID, 0xA0); SysCtlDelay(5000000);//Must delay for at least 5 milli. !!! (See data sheet ) - */ +*/ return status; } uint32_t WhsEEpromRequestFunc(MessageContainer* requestContainer) @@ -328,7 +357,7 @@ uint32_t WhsEEpromRequestFunc(MessageContainer* requestContainer) MessageContainer responseContainer; uint32_t status = OK; - WhsEEpromData *WhsEEpromInstance; + StubWhsEEpromData *WhsEEpromInstance; Report("StubWhsEEpromRequestFunc",__FILE__,__LINE__,1,RpWarning,(int)request->burnrequest,0); if (request->burnrequest == true) @@ -337,10 +366,10 @@ uint32_t WhsEEpromRequestFunc(MessageContainer* requestContainer) } else { - WhsEEpromInstance = my_malloc(sizeof(WhsEEpromData)); + WhsEEpromInstance = my_malloc(sizeof(StubWhsEEpromData)); if (WhsEEpromInstance) { - whs_eeprom_data__init(WhsEEpromInstance); + stub_whs_eeprom_data__init(WhsEEpromInstance); status = Get_EEPROM_DATA_From_WHS(WhsEEpromInstance); } else diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h index 74ab0762b..55f4c5576 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h @@ -80,6 +80,6 @@ uint32_t Check_WHS_Type_Via_EEPROM(); bool WHS_I2C_EEprom_Write_Byte(uint32_t address, uint8_t data); bool WHS_I2C_EEprom_Read_Byte (uint32_t address, uint8_t* p_data); -uint32_t DispenserEEpromRequestFunc(MessageContainer* requestContainer); +uint32_t WhsEEpromRequestFunc(MessageContainer* requestContainer); #endif /* DRIVERS_I2C_COMMUNICATION_WHS_CARD_EEPROM_WHS_EEPROM_H_ */ diff --git a/Software/Stubs Collection/stubs/DispenserEEpromRead.cs b/Software/Stubs Collection/stubs/DispenserEEpromRead.cs index 43b1ebc9c..538223d81 100644 --- a/Software/Stubs Collection/stubs/DispenserEEpromRead.cs +++ b/Software/Stubs Collection/stubs/DispenserEEpromRead.cs @@ -7,7 +7,7 @@ using System.Windows.Forms; using System.Threading; using System.Threading.Tasks; using System.Collections.Generic; -using Tango.PMR.Diagnostics; +using Tango.PMR.Stubs; using Tango.Stubs; public void OnExecute(StubManager stubManager) |