diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-29 18:12:06 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-12-29 18:12:06 +0200 |
| commit | 18ebd0eade87b8ba0b561b49d2f8819a16ad13e7 (patch) | |
| tree | 197ebc11ca51529aa90c11e5a9d9b0204e807b1f /Software | |
| parent | 589f4d3ecc2674b8633b0a0f7d1acd16be6e1fc0 (diff) | |
| download | Tango-18ebd0eade87b8ba0b561b49d2f8819a16ad13e7.tar.gz Tango-18ebd0eade87b8ba0b561b49d2f8819a16ad13e7.zip | |
small fixes, mock btsr params
Diffstat (limited to 'Software')
11 files changed, 547 insertions, 11 deletions
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRApplicationType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRApplicationType.pb-c.c new file mode 100644 index 000000000..b6f417614 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRApplicationType.pb-c.c @@ -0,0 +1,67 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: BTSRApplicationType.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "BTSRApplicationType.pb-c.h" +static const ProtobufCEnumValue btsrapplication_type__enum_values_by_number[17] = +{ + { "", "", 0 }, + { "", "", 1 }, + { "", "", 2 }, + { "", "", 3 }, + { "", "", 4 }, + { "", "", 5 }, + { "", "", 6 }, + { "", "", 7 }, + { "", "", 8 }, + { "", "", 9 }, + { "", "", 10 }, + { "", "", 11 }, + { "", "", 12 }, + { "", "", 17 }, + { "", "", 18 }, + { "", "", 30 }, + { "", "", 31 }, +}; +static const ProtobufCIntRange btsrapplication_type__value_ranges[] = { +{0, 0},{17, 13},{30, 15},{0, 17} +}; +static const ProtobufCEnumValueIndex btsrapplication_type__enum_values_by_name[17] = +{ + { "", 10 }, + { "", 13 }, + { "", 14 }, + { "", 6 }, + { "", 3 }, + { "", 0 }, + { "", 4 }, + { "", 8 }, + { "", 7 }, + { "", 2 }, + { "", 16 }, + { "", 5 }, + { "", 9 }, + { "", 12 }, + { "", 11 }, + { "", 1 }, + { "", 15 }, +}; +const ProtobufCEnumDescriptor btsrapplication_type__descriptor = +{ + PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + 17, + btsrapplication_type__enum_values_by_number, + 17, + btsrapplication_type__enum_values_by_name, + 3, + btsrapplication_type__value_ranges, + NULL,NULL,NULL,NULL /* reserved[1234] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRApplicationType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRApplicationType.pb-c.h new file mode 100644 index 000000000..78ad720e1 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRApplicationType.pb-c.h @@ -0,0 +1,58 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: BTSRApplicationType.proto */ + +#ifndef PROTOBUF_C_BTSRApplicationType_2eproto__INCLUDED +#define PROTOBUF_C_BTSRApplicationType_2eproto__INCLUDED + +#include <protobuf-c/protobuf-c.h> + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + + + + +/* --- enums --- */ + +typedef enum _BTSRApplicationType { + BTSRAPPLICATION_TYPE__ApplicationType_None = 0, + BTSRAPPLICATION_TYPE__ApplicationType_Socks = 1, + BTSRAPPLICATION_TYPE__ApplicationType_Reverse_Socks = 2, + BTSRAPPLICATION_TYPE__ApplicationType_Medical_Socks = 3, + BTSRAPPLICATION_TYPE__ApplicationType_Pantyhose = 4, + BTSRAPPLICATION_TYPE__ApplicationType_Seamless = 5, + BTSRAPPLICATION_TYPE__ApplicationType_Knit = 6, + BTSRAPPLICATION_TYPE__ApplicationType_Reverse_Knit = 7, + BTSRAPPLICATION_TYPE__ApplicationType_Raschel = 8, + BTSRAPPLICATION_TYPE__ApplicationType_Sewing = 9, + BTSRAPPLICATION_TYPE__ApplicationType_Flat_Knit = 10, + BTSRAPPLICATION_TYPE__ApplicationType_Small_Loom = 11, + BTSRAPPLICATION_TYPE__ApplicationType_Shoes = 12, + BTSRAPPLICATION_TYPE__ApplicationType_Flat_Shoes = 17, + BTSRAPPLICATION_TYPE__ApplicationType_Inlay = 18, + BTSRAPPLICATION_TYPE__ApplicationType_Warp = 30, + BTSRAPPLICATION_TYPE__ApplicationType_Rewind = 31 + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(BTSRAPPLICATION_TYPE) +} BTSRApplicationType; + +/* --- messages --- */ + +/* --- per-message closures --- */ + + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCEnumDescriptor btsrapplication_type__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_BTSRApplicationType_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRParameters.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRParameters.pb-c.c new file mode 100644 index 000000000..250af3348 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRParameters.pb-c.c @@ -0,0 +1,170 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: BTSRParameters.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "BTSRParameters.pb-c.h" +void btsrparameters__init + (BTSRParameters *message) +{ + static const BTSRParameters init_value = BTSRPARAMETERS__INIT; + *message = init_value; +} +size_t btsrparameters__get_packed_size + (const BTSRParameters *message) +{ + assert(message->base.descriptor == &btsrparameters__descriptor); + return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message)); +} +size_t btsrparameters__pack + (const BTSRParameters *message, + uint8_t *out) +{ + assert(message->base.descriptor == &btsrparameters__descriptor); + return protobuf_c_message_pack ((const ProtobufCMessage*)message, out); +} +size_t btsrparameters__pack_to_buffer + (const BTSRParameters *message, + ProtobufCBuffer *buffer) +{ + assert(message->base.descriptor == &btsrparameters__descriptor); + return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer); +} +BTSRParameters * + btsrparameters__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data) +{ + return (BTSRParameters *) + protobuf_c_message_unpack (&btsrparameters__descriptor, + allocator, len, data); +} +void btsrparameters__free_unpacked + (BTSRParameters *message, + ProtobufCAllocator *allocator) +{ + if(!message) + return; + assert(message->base.descriptor == &btsrparameters__descriptor); + protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); +} +static const ProtobufCFieldDescriptor btsrparameters__field_descriptors[7] = +{ + { + "", + 1, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_ENUM, + offsetof(BTSRParameters, has_btsryarntype), + offsetof(BTSRParameters, btsryarntype), + &btsryarn_type__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 2, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_ENUM, + offsetof(BTSRParameters, has_btsrapplicationtype), + offsetof(BTSRParameters, btsrapplicationtype), + &btsrapplication_type__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 3, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(BTSRParameters, has_feedingtension), + offsetof(BTSRParameters, feedingtension), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 4, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(BTSRParameters, has_exittension), + offsetof(BTSRParameters, exittension), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 5, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(BTSRParameters, has_tensionerror), + offsetof(BTSRParameters, tensionerror), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 6, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(BTSRParameters, has_spooltension), + offsetof(BTSRParameters, spooltension), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "", + 7, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(BTSRParameters, has_threadlengthfactor), + offsetof(BTSRParameters, threadlengthfactor), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, +}; +static const unsigned btsrparameters__field_indices_by_name[] = { + 1, /* field[1] = BTSRApplicationType */ + 0, /* field[0] = BTSRYarnType */ + 3, /* field[3] = ExitTension */ + 2, /* field[2] = FeedingTension */ + 5, /* field[5] = SpoolTension */ + 4, /* field[4] = TensionError */ + 6, /* field[6] = ThreadLengthFactor */ +}; +static const ProtobufCIntRange btsrparameters__number_ranges[1 + 1] = +{ + { 1, 0 }, + { 0, 7 } +}; +const ProtobufCMessageDescriptor btsrparameters__descriptor = +{ + PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + sizeof(BTSRParameters), + 7, + btsrparameters__field_descriptors, + btsrparameters__field_indices_by_name, + 1, btsrparameters__number_ranges, + (ProtobufCMessageInit) btsrparameters__init, + NULL,NULL,NULL /* reserved[123] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRParameters.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRParameters.pb-c.h new file mode 100644 index 000000000..d5caff9ec --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRParameters.pb-c.h @@ -0,0 +1,86 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: BTSRParameters.proto */ + +#ifndef PROTOBUF_C_BTSRParameters_2eproto__INCLUDED +#define PROTOBUF_C_BTSRParameters_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 "BTSRYarnType.pb-c.h" +#include "BTSRApplicationType.pb-c.h" + +typedef struct _BTSRParameters BTSRParameters; + + +/* --- enums --- */ + + +/* --- messages --- */ + +struct _BTSRParameters +{ + ProtobufCMessage base; + protobuf_c_boolean has_btsryarntype; + BTSRYarnType btsryarntype; + protobuf_c_boolean has_btsrapplicationtype; + BTSRApplicationType btsrapplicationtype; + protobuf_c_boolean has_feedingtension; + double feedingtension; + protobuf_c_boolean has_exittension; + double exittension; + protobuf_c_boolean has_tensionerror; + double tensionerror; + protobuf_c_boolean has_spooltension; + double spooltension; + protobuf_c_boolean has_threadlengthfactor; + double threadlengthfactor; +}; +#define BTSRPARAMETERS__INIT \ + { PROTOBUF_C_MESSAGE_INIT (&btsrparameters__descriptor) \ + , 0, BTSRYARN_TYPE__YarnTypeNone, 0, BTSRAPPLICATION_TYPE__ApplicationType_None, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } + + +/* BTSRParameters methods */ +void btsrparameters__init + (BTSRParameters *message); +size_t btsrparameters__get_packed_size + (const BTSRParameters *message); +size_t btsrparameters__pack + (const BTSRParameters *message, + uint8_t *out); +size_t btsrparameters__pack_to_buffer + (const BTSRParameters *message, + ProtobufCBuffer *buffer); +BTSRParameters * + btsrparameters__unpack + (ProtobufCAllocator *allocator, + size_t len, + const uint8_t *data); +void btsrparameters__free_unpacked + (BTSRParameters *message, + ProtobufCAllocator *allocator); +/* --- per-message closures --- */ + +typedef void (*BTSRParameters_Closure) + (const BTSRParameters *message, + void *closure_data); + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCMessageDescriptor btsrparameters__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_BTSRParameters_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRYarnType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRYarnType.pb-c.c new file mode 100644 index 000000000..8afa03d66 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRYarnType.pb-c.c @@ -0,0 +1,47 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: BTSRYarnType.proto */ + +/* Do not generate deprecated warnings for self */ +#ifndef PROTOBUF_C__NO_DEPRECATED +#define PROTOBUF_C__NO_DEPRECATED +#endif + +#include "BTSRYarnType.pb-c.h" +static const ProtobufCEnumValue btsryarn_type__enum_values_by_number[7] = +{ + { "", "", 0 }, + { "", "", 1 }, + { "", "", 2 }, + { "", "", 3 }, + { "", "", 4 }, + { "", "", 5 }, + { "", "", 6 }, +}; +static const ProtobufCIntRange btsryarn_type__value_ranges[] = { +{0, 0},{0, 7} +}; +static const ProtobufCEnumValueIndex btsryarn_type__enum_values_by_name[7] = +{ + { "", 2 }, + { "", 3 }, + { "", 4 }, + { "", 1 }, + { "", 5 }, + { "", 6 }, + { "", 0 }, +}; +const ProtobufCEnumDescriptor btsryarn_type__descriptor = +{ + PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC, + "", + "", + "", + "", + 7, + btsryarn_type__enum_values_by_number, + 7, + btsryarn_type__enum_values_by_name, + 1, + btsryarn_type__value_ranges, + NULL,NULL,NULL,NULL /* reserved[1234] */ +}; diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRYarnType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRYarnType.pb-c.h new file mode 100644 index 000000000..ff615b0d7 --- /dev/null +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/BTSRYarnType.pb-c.h @@ -0,0 +1,48 @@ +/* Generated by the protocol buffer compiler. DO NOT EDIT! */ +/* Generated from: BTSRYarnType.proto */ + +#ifndef PROTOBUF_C_BTSRYarnType_2eproto__INCLUDED +#define PROTOBUF_C_BTSRYarnType_2eproto__INCLUDED + +#include <protobuf-c/protobuf-c.h> + +PROTOBUF_C__BEGIN_DECLS + +#if PROTOBUF_C_VERSION_NUMBER < 1003000 +# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers. +#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION +# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c. +#endif + + + + +/* --- enums --- */ + +typedef enum _BTSRYarnType { + BTSRYARN_TYPE__YarnTypeNone = 0, + BTSRYARN_TYPE__YarnTypeElastic_1 = 1, + BTSRYARN_TYPE__YarnTypeAllYarn1 = 2, + BTSRYARN_TYPE__YarnTypeAllYarn2 = 3, + BTSRYARN_TYPE__YarnTypeAllYarn3 = 4, + BTSRYARN_TYPE__YarnTypeElastic_2 = 5, + BTSRYARN_TYPE__YarnTypeElastic_3 = 6 + PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(BTSRYARN_TYPE) +} BTSRYarnType; + +/* --- messages --- */ + +/* --- per-message closures --- */ + + +/* --- services --- */ + + +/* --- descriptors --- */ + +extern const ProtobufCEnumDescriptor btsryarn_type__descriptor; + +PROTOBUF_C__END_DECLS + + +#endif /* PROTOBUF_C_BTSRYarnType_2eproto__INCLUDED */ diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c index 1d2bdbad8..90ca262ac 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c @@ -52,7 +52,7 @@ void job_ticket__free_unpacked assert(message->base.descriptor == &job_ticket__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor job_ticket__field_descriptors[16] = +static const ProtobufCFieldDescriptor job_ticket__field_descriptors[17] = { { "", @@ -246,8 +246,21 @@ static const ProtobufCFieldDescriptor job_ticket__field_descriptors[16] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "", + 17, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_MESSAGE, + 0, /* quantifier_offset */ + offsetof(JobTicket, btsrparameters), + &btsrparameters__descriptor, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned job_ticket__field_indices_by_name[] = { + 16, /* field[16] = BTSRParameters */ 2, /* field[2] = EnableInterSegment */ 11, /* field[11] = EnableLubrication */ 0, /* field[0] = Guid */ @@ -268,7 +281,7 @@ static const unsigned job_ticket__field_indices_by_name[] = { static const ProtobufCIntRange job_ticket__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 16 } + { 0, 17 } }; const ProtobufCMessageDescriptor job_ticket__descriptor = { @@ -278,7 +291,7 @@ const ProtobufCMessageDescriptor job_ticket__descriptor = "", "", sizeof(JobTicket), - 16, + 17, job_ticket__field_descriptors, job_ticket__field_indices_by_name, 1, job_ticket__number_ranges, diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h index d47a85867..1fd052a51 100644 --- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h +++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h @@ -21,6 +21,7 @@ PROTOBUF_C__BEGIN_DECLS #include "JobUploadStrategy.pb-c.h" #include "ThreadParameters.pb-c.h" #include "HeadCleaningParameters.pb-c.h" +#include "BTSRParameters.pb-c.h" typedef struct _JobTicket JobTicket; @@ -58,10 +59,11 @@ struct _JobTicket protobuf_c_boolean samplewinding; ThreadParameters *threadparameters; HeadCleaningParameters *headcleaningparameters; + BTSRParameters *btsrparameters; }; #define JOB_TICKET__INIT \ { PROTOBUF_C_MESSAGE_INIT (&job_ticket__descriptor) \ - , NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, 0, JOB_WINDING_METHOD__Embroidery, NULL, 0,NULL, 0, JOB_UPLOAD_STRATEGY__Default, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL } + , NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, 0, JOB_WINDING_METHOD__Embroidery, NULL, 0,NULL, 0, JOB_UPLOAD_STRATEGY__Default, NULL, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL } /* JobTicket methods */ diff --git a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c index 0eccc7601..28fc16ebb 100644 --- a/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c +++ b/Software/Embedded_SW/Embedded/Drivers/Flash_Memory/FATFS/fatfs_port_mx66l51235f.c @@ -24,6 +24,7 @@ #include "driverlib/gpio.h" #include "inc/hw_memmap.h" #include <time.h> +#include <utils/ustdlib.h> //#include <ti/mw/fatfs/ff.h> //#include <ti/mw/fatfs/ffcio.h> @@ -200,7 +201,8 @@ void disk_timerproc (void) DWORD get_fattime (void) { //return miliseconds / 1000; - DWORD t = (DWORD)time(NULL); + time_t tt = umktime(struct tm *timeptr); + DWORD t = (DWORD)tt; return t; } diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c index df8f964fe..17166a095 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/PowerIdle.c @@ -92,10 +92,10 @@ void PowerIdleSetIdle(void) ProcessParametersClear.dryerzone1temp = (ActiveProcessParameters.dryerzone1temp<80)? ActiveProcessParameters.dryerzone1temp:IdleDrierTemperature; ProcessParametersClear.dryerzone2temp = (ActiveProcessParameters.dryerzone2temp<80)? ActiveProcessParameters.dryerzone2temp:IdleDrierTemperature; ProcessParametersClear.dryerzone3temp = (ActiveProcessParameters.dryerzone3temp<80)? ActiveProcessParameters.dryerzone3temp:IdleDrierTemperature; - ProcessParametersClear.mixertemp = (ActiveProcessParameters.mixertemp <80)? ActiveProcessParameters.mixertemp :IdleMixerTemperature; - ProcessParametersClear.headzone1temp = (ActiveProcessParameters.headzone1temp <80)? ActiveProcessParameters.headzone1temp :IdleHeadTemperature; - ProcessParametersClear.headzone2temp = (ActiveProcessParameters.headzone2temp <80)? ActiveProcessParameters.headzone2temp :IdleHeadTemperature; - ProcessParametersClear.headzone3temp = (ActiveProcessParameters.headzone3temp <80)? ActiveProcessParameters.headzone3temp :IdleHeadTemperature; + ProcessParametersClear.mixertemp = (ActiveProcessParameters.mixertemp <60)? ActiveProcessParameters.mixertemp :IdleMixerTemperature; + ProcessParametersClear.headzone1temp = (ActiveProcessParameters.headzone1temp <60)? ActiveProcessParameters.headzone1temp :IdleHeadTemperature; + ProcessParametersClear.headzone2temp = (ActiveProcessParameters.headzone2temp <60)? ActiveProcessParameters.headzone2temp :IdleHeadTemperature; + ProcessParametersClear.headzone3temp = (ActiveProcessParameters.headzone3temp <60)? ActiveProcessParameters.headzone3temp :IdleHeadTemperature; ProcessParametersClear.headzone4temp = (ActiveProcessParameters.headzone4temp <80)? ActiveProcessParameters.headzone4temp :IdleHeadTemperature; ProcessParametersClear.headzone5temp = (ActiveProcessParameters.headzone5temp <80)? ActiveProcessParameters.headzone5temp :IdleHeadTemperature; ProcessParametersClear.headzone6temp = (ActiveProcessParameters.headzone6temp <80)? ActiveProcessParameters.headzone6temp :IdleHeadTemperature; @@ -109,8 +109,8 @@ void PowerIdleSetIdle(void) ProcessParametersClear.dryerbufferlength = (ActiveProcessParameters.dryerbufferlength <30)? ActiveProcessParameters.dryerbufferlength :30; ProcessParametersClear.rblowertemp = (ActiveProcessParameters.rblowertemp <80)? ActiveProcessParameters.rblowertemp :IdleHeadTemperature; ProcessParametersClear.lblowertemp = (ActiveProcessParameters.lblowertemp <80)? ActiveProcessParameters.lblowertemp :IdleHeadTemperature; - ProcessParametersClear.rblowerflow = (ActiveProcessParameters.rblowerflow <96)? ActiveProcessParameters.rblowerflow :96; - ProcessParametersClear.lblowerflow = (ActiveProcessParameters.lblowerflow <96)? ActiveProcessParameters.lblowerflow :96; + ProcessParametersClear.rblowerflow = (ActiveProcessParameters.rblowerflow <1.2)? ActiveProcessParameters.rblowerflow :1.2; + ProcessParametersClear.lblowerflow = (ActiveProcessParameters.lblowerflow <1.2)? ActiveProcessParameters.lblowerflow :1.2; ProcessParametersClear.headairflow = (ActiveProcessParameters.headairflow <3)? ActiveProcessParameters.headairflow :3; if (HandleProcessParameters(&ProcessParametersClear,false)!= OK) { diff --git a/Software/Stubs Collection/stubs/ProcedureExample.cs b/Software/Stubs Collection/stubs/ProcedureExample.cs new file mode 100644 index 000000000..18376a587 --- /dev/null +++ b/Software/Stubs Collection/stubs/ProcedureExample.cs @@ -0,0 +1,43 @@ +using System; +using System.Text; +using System.Linq; +using System.Drawing; +using System.Diagnostics; +using System.Windows.Forms; +using System.Threading; +using System.Threading.Tasks; +using System.Collections.Generic; +using Tango.PMR.Stubs; +using Tango.Stubs; + +public void OnExecute(StubManager stubManager) +{ + + +ProcedureRequest procedureRequest = new ProcedureRequest(); +procedureRequest.Type = 1; +procedureRequest.Timeout = 4000; +procedureRequest.TestName = "BTSR Init"; + +Single BTSRYarnType = new Single(); //Single is a float +BTSRYarnType = 1; +procedureRequest.Param.Add(BTSRYarnType); +Single BTSRApplicationType = new Single(); //Single is a float +BTSRApplicationType = 1; +procedureRequest.Param.Add(BTSRApplicationType); +Single feedingtension = new Single(); //Single is a float +feedingtension = 1; +procedureRequest.Param.Add(feedingtension); +Single exittension = new Single(); //Single is a float +exittension = 1; +procedureRequest.Param.Add(exittension); +Single tensionerror = new Single(); //Single is a float +tensionerror = 1; +procedureRequest.Param.Add(tensionerror); +Single threadlengthfactor = new Single(); //Single is a float +threadlengthfactor = 1; +procedureRequest.Param.Add(threadlengthfactor); + + var response = stubManager.Run<ProcedureResponse>(procedureRequest); + +}
\ No newline at end of file |
