Skip to content

Commit fcb939a

Browse files
kdomackkdomack
authored
Merge pull request EmbeddedRPC#132 from VERO-Biotech/pre-release/v0.1.3
Pre release/v0.1.3 -> develop
2 parents dd50743 + 1e75fad commit fcb939a

10 files changed

+10
-454
lines changed

‎Bench/eRPC/Common/erpcVeroFirmwareApi.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ SysInfoDateStatus* ApiService::erpcSystemGetInfo()
88
if (!info) return nullptr;
99

1010
const char* erpc = ERPC_VERSION;
11-
const char* version = "VeroFirmware 0.1.2";
11+
const char* version = "VeroFirmware 0.1.3";
1212
const char* manufacture = "2025-08-15";
1313
const char* expiration = "2029-04-14";
1414

‎Lib/erpc_stm_library/erpc‎

‎Shim/c_verofirmwareapi_server.cpp‎

Lines changed: 1 addition & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Generated by erpcgen 1.14.0 on Wed Oct 29 10:31:04 2025.
2+
* Generated by erpcgen 1.14.0 on Wed Nov 5 12:34:06 2025.
33
*
44
* AUTOGENERATED - DO NOT EDIT
55
*/
@@ -35,7 +35,6 @@ using namespace erpcShim;
3535

3636

3737

38-
3938

4039

4140
class api_server: public api_interface
@@ -3818,76 +3817,3 @@ void destroy_Diagnostics_service(erpc_service_t service)
38183817
#endif
38193818
}
38203819

3821-
3822-
class AdaptiveSensor_server: public AdaptiveSensor_interface
3823-
{
3824-
public:
3825-
virtual ~AdaptiveSensor_server() {};
3826-
3827-
3828-
AdaptiveSensorInfo * erpcAdaptiveGetInfo(void)
3829-
{
3830-
AdaptiveSensorInfo * result = NULL;
3831-
result = ::erpcAdaptiveGetInfo();
3832-
3833-
return result;
3834-
}
3835-
3836-
int8_t erpcAdaptiveReset(AdaptiveResetType resetType)
3837-
{
3838-
int8_t result;
3839-
result = ::erpcAdaptiveReset(resetType);
3840-
3841-
return result;
3842-
}
3843-
3844-
AdaptiveMeasurement * erpcAdaptiveGetFlowMeasurement(void)
3845-
{
3846-
AdaptiveMeasurement * result = NULL;
3847-
result = ::erpcAdaptiveGetFlowMeasurement();
3848-
3849-
return result;
3850-
}
3851-
};
3852-
3853-
ERPC_MANUALLY_CONSTRUCTED_STATIC(AdaptiveSensor_service, s_AdaptiveSensor_service);
3854-
ERPC_MANUALLY_CONSTRUCTED_STATIC(AdaptiveSensor_server, s_AdaptiveSensor_server);
3855-
3856-
erpc_service_t create_AdaptiveSensor_service(void)
3857-
{
3858-
erpc_service_t service;
3859-
3860-
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
3861-
service = new (nothrow) AdaptiveSensor_service(new (nothrow)AdaptiveSensor_server());
3862-
#else
3863-
if (s_AdaptiveSensor_service.isUsed())
3864-
{
3865-
service = NULL;
3866-
}
3867-
else
3868-
{
3869-
s_AdaptiveSensor_server.construct();
3870-
s_AdaptiveSensor_service.construct(s_AdaptiveSensor_server.get());
3871-
service = s_AdaptiveSensor_service.get();
3872-
}
3873-
#endif
3874-
3875-
return service;
3876-
}
3877-
3878-
void destroy_AdaptiveSensor_service(erpc_service_t service)
3879-
{
3880-
#if ERPC_ALLOCATION_POLICY == ERPC_ALLOCATION_POLICY_DYNAMIC
3881-
if (service)
3882-
{
3883-
delete (AdaptiveSensor_server *)(((AdaptiveSensor_service *)service)->getHandler());
3884-
delete (AdaptiveSensor_service *)service;
3885-
}
3886-
#else
3887-
(void)service;
3888-
erpc_assert(service == s_AdaptiveSensor_service.get());
3889-
s_AdaptiveSensor_service.destroy();
3890-
s_AdaptiveSensor_server.destroy();
3891-
#endif
3892-
}
3893-

‎Shim/c_verofirmwareapi_server.h‎

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Generated by erpcgen 1.14.0 on Wed Oct 29 10:31:04 2025.
2+
* Generated by erpcgen 1.14.0 on Wed Nov 5 12:34:06 2025.
33
*
44
* AUTOGENERATED - DO NOT EDIT
55
*/
@@ -530,16 +530,6 @@ enum _Diagnostics_ids
530530
kDiagnostics_erpcDiagStackSize_id = 6,
531531
};
532532

533-
534-
/*! @brief AdaptiveSensor identifiers */
535-
enum _AdaptiveSensor_ids
536-
{
537-
kAdaptiveSensor_service_id = 24,
538-
kAdaptiveSensor_erpcAdaptiveGetInfo_id = 1,
539-
kAdaptiveSensor_erpcAdaptiveReset_id = 2,
540-
kAdaptiveSensor_erpcAdaptiveGetFlowMeasurement_id = 3,
541-
};
542-
543533
//! @name api
544534
//@{
545535
SysInfoDateStatus * erpcSystemGetInfo(void);
@@ -1307,15 +1297,6 @@ uint16_t erpcDiagHeapSize(void);
13071297
uint16_t erpcDiagStackSize(void);
13081298
//@}
13091299

1310-
//! @name AdaptiveSensor
1311-
//@{
1312-
AdaptiveSensorInfo * erpcAdaptiveGetInfo(void);
1313-
1314-
int8_t erpcAdaptiveReset(AdaptiveResetType resetType);
1315-
1316-
AdaptiveMeasurement * erpcAdaptiveGetFlowMeasurement(void);
1317-
//@}
1318-
13191300

13201301
#endif // ERPC_FUNCTIONS_DEFINITIONS
13211302

@@ -1457,12 +1438,6 @@ erpc_service_t create_Diagnostics_service(void);
14571438
/*! @brief Destroy Diagnostics_service service object. */
14581439
void destroy_Diagnostics_service(erpc_service_t service);
14591440

1460-
/*! @brief Return AdaptiveSensor_service service object. */
1461-
erpc_service_t create_AdaptiveSensor_service(void);
1462-
1463-
/*! @brief Destroy AdaptiveSensor_service service object. */
1464-
void destroy_AdaptiveSensor_service(erpc_service_t service);
1465-
14661441

14671442
#if defined(__cplusplus)
14681443
}

‎Shim/verofirmwareapi_common.h‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Generated by erpcgen 1.14.0 on Wed Oct 29 10:31:04 2025.
2+
* Generated by erpcgen 1.14.0 on Wed Nov 5 12:34:06 2025.
33
*
44
* AUTOGENERATED - DO NOT EDIT
55
*/
@@ -604,13 +604,6 @@ typedef enum Flowpath
604604
NO_OUTPUT = 3
605605
} Flowpath;
606606

607-
typedef enum AdaptiveResetType
608-
{
609-
BOARD_RESET = 0,
610-
SENSOR_HARD_RESET = 1,
611-
SENSOR_SOFT_RESET = 2
612-
} AdaptiveResetType;
613-
614607
// Aliases data types declarations
615608
typedef struct SysInfoDateStatus SysInfoDateStatus;
616609
typedef struct EepromByte EepromByte;
@@ -664,8 +657,6 @@ typedef struct DosingModuleInfo DosingModuleInfo;
664657
typedef struct MotorPositionString MotorPositionString;
665658
typedef struct FirmwareInfo FirmwareInfo;
666659
typedef struct WaterTrapInfo WaterTrapInfo;
667-
typedef struct AdaptiveSensorInfo AdaptiveSensorInfo;
668-
typedef struct AdaptiveMeasurement AdaptiveMeasurement;
669660

670661
// Structures/unions data types declarations
671662
struct SysInfoDateStatus
@@ -1094,20 +1085,6 @@ struct WaterTrapInfo
10941085
bool TrapFull;
10951086
};
10961087

1097-
struct AdaptiveSensorInfo
1098-
{
1099-
int8_t err;
1100-
char * swVersion;
1101-
char * hwVersion;
1102-
char * article;
1103-
};
1104-
1105-
struct AdaptiveMeasurement
1106-
{
1107-
int8_t err;
1108-
int32_t value;
1109-
};
1110-
11111088

11121089
#endif // ERPC_TYPE_DEFINITIONS_VEROFIRMWAREAPI
11131090

‎Shim/verofirmwareapi_common.hpp‎

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Generated by erpcgen 1.14.0 on Wed Oct 29 10:31:04 2025.
2+
* Generated by erpcgen 1.14.0 on Wed Nov 5 12:34:06 2025.
33
*
44
* AUTOGENERATED - DO NOT EDIT
55
*/
@@ -599,13 +599,6 @@ typedef enum Flowpath
599599
NO_OUTPUT = 3
600600
} Flowpath;
601601

602-
typedef enum AdaptiveResetType
603-
{
604-
BOARD_RESET = 0,
605-
SENSOR_HARD_RESET = 1,
606-
SENSOR_SOFT_RESET = 2
607-
} AdaptiveResetType;
608-
609602
// Aliases data types declarations
610603
typedef struct SysInfoDateStatus SysInfoDateStatus;
611604
typedef struct EepromByte EepromByte;
@@ -659,8 +652,6 @@ typedef struct DosingModuleInfo DosingModuleInfo;
659652
typedef struct MotorPositionString MotorPositionString;
660653
typedef struct FirmwareInfo FirmwareInfo;
661654
typedef struct WaterTrapInfo WaterTrapInfo;
662-
typedef struct AdaptiveSensorInfo AdaptiveSensorInfo;
663-
typedef struct AdaptiveMeasurement AdaptiveMeasurement;
664655

665656
// Structures/unions data types declarations
666657
struct SysInfoDateStatus
@@ -1089,20 +1080,6 @@ struct WaterTrapInfo
10891080
bool TrapFull;
10901081
};
10911082

1092-
struct AdaptiveSensorInfo
1093-
{
1094-
int8_t err;
1095-
char * swVersion;
1096-
char * hwVersion;
1097-
char * article;
1098-
};
1099-
1100-
struct AdaptiveMeasurement
1101-
{
1102-
int8_t err;
1103-
int32_t value;
1104-
};
1105-
11061083

11071084
#endif // ERPC_TYPE_DEFINITIONS_VEROFIRMWAREAPI
11081085

‎Shim/verofirmwareapi_interface.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Generated by erpcgen 1.14.0 on Wed Oct 29 10:31:04 2025.
2+
* Generated by erpcgen 1.14.0 on Wed Nov 5 12:34:06 2025.
33
*
44
* AUTOGENERATED - DO NOT EDIT
55
*/
@@ -84,6 +84,3 @@ InjectionControl_interface::~InjectionControl_interface(void)
8484
Diagnostics_interface::~Diagnostics_interface(void)
8585
{
8686
}
87-
AdaptiveSensor_interface::~AdaptiveSensor_interface(void)
88-
{
89-
}

‎Shim/verofirmwareapi_interface.hpp‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Generated by erpcgen 1.14.0 on Wed Oct 29 10:31:04 2025.
2+
* Generated by erpcgen 1.14.0 on Wed Nov 5 12:34:06 2025.
33
*
44
* AUTOGENERATED - DO NOT EDIT
55
*/
@@ -1290,25 +1290,6 @@ class Diagnostics_interface
12901290
virtual uint16_t erpcDiagStackSize(void) = 0;
12911291
private:
12921292
};
1293-
1294-
// Abstract base class for AdaptiveSensor
1295-
class AdaptiveSensor_interface
1296-
{
1297-
public:
1298-
static const uint8_t m_serviceId = 24;
1299-
static const uint8_t m_erpcAdaptiveGetInfoId = 1;
1300-
static const uint8_t m_erpcAdaptiveResetId = 2;
1301-
static const uint8_t m_erpcAdaptiveGetFlowMeasurementId = 3;
1302-
1303-
virtual ~AdaptiveSensor_interface(void);
1304-
1305-
virtual AdaptiveSensorInfo * erpcAdaptiveGetInfo(void) = 0;
1306-
1307-
virtual int8_t erpcAdaptiveReset(AdaptiveResetType resetType) = 0;
1308-
1309-
virtual AdaptiveMeasurement * erpcAdaptiveGetFlowMeasurement(void) = 0;
1310-
private:
1311-
};
13121293
} // erpcShim
13131294

13141295

0 commit comments

Comments
 (0)