Skip to content

Commit 80ef0ea

Browse files
pratik-prajapati-imgtecpratik-prajapati-imgtec
committed
Update api's to awalwm2m 0.1.10 version
Signed-off-by: Pratik Prajapati <Pratik.Prajapati@imgtec.com>
1 parent 10278bb commit 80ef0ea

6 files changed

+66
-82
lines changed

‎lwm2m-client-device-object.c‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -128,30 +128,30 @@ AwaResult executeHandler(AwaStaticClient *client, AwaOperation operation, AwaObj
128128

129129
int DefineDeviceObject(AwaStaticClient *awaClient)
130130
{
131-
AwaStaticClient_DefineObject(awaClient, "Device" , LWM2M_DEVICE_OBJECT, 1, 1);
132-
AwaStaticClient_DefineResourceWithPointer(awaClient, "Manufacturer", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_MANUFACTURER, AwaResourceType_String, 0, 1, AwaResourceOperations_ReadOnly, DeviceObjectStorage.Manufacturer, sizeof(DeviceObjectStorage.Manufacturer), 0);
133-
AwaStaticClient_DefineResourceWithPointer(awaClient, "ModelNumber", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_MODEL_NUMBER, AwaResourceType_String, 0, 1, AwaResourceOperations_ReadOnly, DeviceObjectStorage.ModelNumber, sizeof(DeviceObjectStorage.ModelNumber), 0);
134-
AwaStaticClient_DefineResourceWithPointer(awaClient, "SerialNumber", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_SERIAL_NUMBER, AwaResourceType_String, 0, 1, AwaResourceOperations_ReadOnly, DeviceObjectStorage.SerialNumber, sizeof(DeviceObjectStorage.SerialNumber), 0);
135-
AwaStaticClient_DefineResourceWithPointer(awaClient, "FirmwareVersion", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_FIRMWARE_VERSION, AwaResourceType_String, 0, 1, AwaResourceOperations_ReadOnly, DeviceObjectStorage.FirmwareVersion, sizeof(DeviceObjectStorage.FirmwareVersion), 0);
136-
AwaStaticClient_DefineResourceWithPointer(awaClient, "AvailablePowerSources", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_AVAILABLE_POWER_SOURCES, AwaResourceType_Integer, 0, LWM2M_DEVICE_OBJECT_POWER_SOURCES_COUNT, AwaResourceOperations_ReadOnly, DeviceObjectStorage.AvailablePowerSources, sizeof(AwaInteger), 0);
137-
AwaStaticClient_DefineResourceWithPointer(awaClient, "PowerSourceVoltage", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_POWER_SOURCE_VOLTAGE, AwaResourceType_Integer, 0, LWM2M_DEVICE_OBJECT_POWER_SOURCES_COUNT, AwaResourceOperations_ReadOnly, DeviceObjectStorage.PowerSourceVoltage, sizeof(AwaInteger), 0);
138-
AwaStaticClient_DefineResourceWithPointer(awaClient, "PowerSourceCurrent", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_POWER_SOURCE_CURRENT, AwaResourceType_Integer, 0, LWM2M_DEVICE_OBJECT_POWER_SOURCES_COUNT, AwaResourceOperations_ReadOnly, DeviceObjectStorage.PowerSourceCurrent, sizeof(AwaInteger), 0);
139-
AwaStaticClient_DefineResourceWithPointer(awaClient, "BatteryLevel", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_BATTERY_LEVEL, AwaResourceType_Integer, 0, 1, AwaResourceOperations_ReadOnly, &DeviceObjectStorage.BatteryLevel, sizeof(AwaInteger), 0 );
140-
AwaStaticClient_DefineResourceWithPointer(awaClient, "MemoryFree", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_MEMORY_FREE, AwaResourceType_Integer, 0, 1, AwaResourceOperations_ReadOnly, &DeviceObjectStorage.BatteryStatus, sizeof(AwaInteger), 0 );
141-
AwaStaticClient_DefineResourceWithPointer(awaClient, "ErrorCode", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_ERROR_CODE, AwaResourceType_Integer, 1, LWM2M_DEVICE_OBJECT_ERROR_CODE_COUNT, AwaResourceOperations_ReadOnly, DeviceObjectStorage.ErrorCode, sizeof(AwaInteger), 0);
142-
AwaStaticClient_DefineResourceWithPointer(awaClient, "CurrentTime", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_CURRENT_TIME, AwaResourceType_Time, 0, 0, AwaResourceOperations_ReadWrite, &DeviceObjectStorage.CurrentTime, sizeof(AwaTime), 0 );
143-
AwaStaticClient_DefineResourceWithPointer(awaClient, "UTCOffset", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_UTC_OFFSET, AwaResourceType_String, 0, 0, AwaResourceOperations_ReadWrite, DeviceObjectStorage.UTCOffset, sizeof(DeviceObjectStorage.UTCOffset), 0);
144-
AwaStaticClient_DefineResourceWithPointer(awaClient, "Timezone", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_TIME_ZONE, AwaResourceType_String, 0, 0, AwaResourceOperations_ReadWrite, DeviceObjectStorage.Timezone, sizeof(DeviceObjectStorage.Timezone), 0);
145-
AwaStaticClient_DefineResourceWithPointer(awaClient, "SupportedBindingandModes", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_SUPPORTED_BINDING_AND_MODES, AwaResourceType_String, 1, 1, AwaResourceOperations_ReadOnly, DeviceObjectStorage.SupportedBindingandModes, sizeof(DeviceObjectStorage.SupportedBindingandModes), 0);
146-
AwaStaticClient_DefineResourceWithPointer(awaClient, "DeviceType", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_DEVICE_TYPE, AwaResourceType_String, 0, 0, AwaResourceOperations_ReadOnly, DeviceObjectStorage.DeviceType, sizeof(DeviceObjectStorage.DeviceType), 0);
147-
AwaStaticClient_DefineResourceWithPointer(awaClient, "HardwareVersion", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_HARDWARE_VERSION, AwaResourceType_String, 0, 0, AwaResourceOperations_ReadOnly, DeviceObjectStorage.HardwareVersion, sizeof(DeviceObjectStorage.DeviceType), 0);
148-
AwaStaticClient_DefineResourceWithPointer(awaClient, "SoftwareVersion", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_SOFTWARE_VERSION, AwaResourceType_String, 0, 0, AwaResourceOperations_ReadOnly, DeviceObjectStorage.SoftwareVersion, sizeof(DeviceObjectStorage.SoftwareVersion), 0);
149-
AwaStaticClient_DefineResourceWithPointer(awaClient, "BatteryStatus", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_BATTERY_STATUS, AwaResourceType_Integer, 0, 0, AwaResourceOperations_ReadOnly, &DeviceObjectStorage.BatteryStatus , sizeof(AwaInteger), 0 );
150-
AwaStaticClient_DefineResourceWithPointer(awaClient, "MemoryTotal", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_MEMORY_TOTAL, AwaResourceType_Integer, 0, 0, AwaResourceOperations_ReadOnly, &DeviceObjectStorage.MemoryTotal , sizeof(AwaInteger), 0 );
151-
152-
AwaStaticClient_DefineResourceWithHandler(awaClient, "Reboot", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_REBOOT, AwaResourceType_None, 1, 1, AwaResourceOperations_Execute, executeHandler);
153-
AwaStaticClient_DefineResourceWithHandler(awaClient, "FactoryReset", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_FACTORY_RESET, AwaResourceType_None, 0, 0, AwaResourceOperations_Execute, executeHandler);
154-
AwaStaticClient_DefineResourceWithHandler(awaClient, "ResetErrorCode", LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_RESET_ERROR_CODE, AwaResourceType_None, 0, 0, AwaResourceOperations_Execute, executeHandler);
131+
AwaStaticClient_DefineObject(awaClient, LWM2M_DEVICE_OBJECT, "Device", 1, 1);
132+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_MANUFACTURER, DeviceObjectStorage.Manufacturer, sizeof(DeviceObjectStorage.Manufacturer), 0);
133+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_MODEL_NUMBER, DeviceObjectStorage.ModelNumber, sizeof(DeviceObjectStorage.ModelNumber), 0);
134+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_SERIAL_NUMBER, DeviceObjectStorage.SerialNumber, sizeof(DeviceObjectStorage.SerialNumber), 0);
135+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_FIRMWARE_VERSION, DeviceObjectStorage.FirmwareVersion, sizeof(DeviceObjectStorage.FirmwareVersion), 0);
136+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_AVAILABLE_POWER_SOURCES, DeviceObjectStorage.AvailablePowerSources, sizeof(AwaInteger), 0);
137+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_POWER_SOURCE_VOLTAGE, DeviceObjectStorage.PowerSourceVoltage, sizeof(AwaInteger), 0);
138+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_POWER_SOURCE_CURRENT, DeviceObjectStorage.PowerSourceCurrent, sizeof(AwaInteger), 0);
139+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_BATTERY_LEVEL, &DeviceObjectStorage.BatteryLevel, sizeof(AwaInteger), 0 );
140+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_MEMORY_FREE, &DeviceObjectStorage.BatteryStatus, sizeof(AwaInteger), 0 );
141+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_ERROR_CODE, DeviceObjectStorage.ErrorCode, sizeof(AwaInteger), 0);
142+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_CURRENT_TIME, &DeviceObjectStorage.CurrentTime, sizeof(AwaTime), 0);
143+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_UTC_OFFSET, DeviceObjectStorage.UTCOffset, sizeof(DeviceObjectStorage.UTCOffset), 0);
144+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_TIME_ZONE, DeviceObjectStorage.Timezone, sizeof(DeviceObjectStorage.Timezone), 0);
145+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_SUPPORTED_BINDING_AND_MODES, DeviceObjectStorage.SupportedBindingandModes, sizeof(DeviceObjectStorage.SupportedBindingandModes), 0);
146+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_DEVICE_TYPE, DeviceObjectStorage.DeviceType, sizeof(DeviceObjectStorage.DeviceType), 0);
147+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_HARDWARE_VERSION, DeviceObjectStorage.HardwareVersion, sizeof(DeviceObjectStorage.DeviceType), 0);
148+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_SOFTWARE_VERSION, DeviceObjectStorage.SoftwareVersion, sizeof(DeviceObjectStorage.SoftwareVersion), 0);
149+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_BATTERY_STATUS, &DeviceObjectStorage.BatteryStatus , sizeof(AwaInteger), 0 );
150+
AwaStaticClient_SetResourceStorageWithPointer(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_MEMORY_TOTAL, &DeviceObjectStorage.MemoryTotal , sizeof(AwaInteger), 0 );
151+
152+
AwaStaticClient_SetResourceOperationHandler(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_REBOOT, executeHandler);
153+
AwaStaticClient_SetResourceOperationHandler(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_FACTORY_RESET, executeHandler);
154+
AwaStaticClient_SetResourceOperationHandler(awaClient, LWM2M_DEVICE_OBJECT, LWM2M_DEVICE_OBJECT_RESET_ERROR_CODE, executeHandler);
155155

156156
AwaStaticClient_CreateObjectInstance(awaClient, LWM2M_DEVICE_OBJECT, 0);
157157

‎lwm2m-client-flow-access-object.c‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -194,47 +194,42 @@ int DefineFlowAccessObject(AwaStaticClient *awaClient)
194194
{
195195
AwaError error;
196196

197-
error = AwaStaticClient_DefineObjectWithHandler(awaClient, "FlowAccess", FLOWM2M_FLOW_ACCESS_OBJECT, 0, FLOW_ACCESS_INSTANCES, accessHandler);
197+
error = AwaStaticClient_SetObjectOperationHandler(awaClient, FLOWM2M_FLOW_ACCESS_OBJECT, accessHandler);
198198
if (error != AwaError_Success)
199199
{
200200
printf("Failed to register flow access object\n");
201201
return 1;
202202
}
203203

204-
error = AwaStaticClient_DefineResourceWithHandler(awaClient, "URL", FLOWM2M_FLOW_ACCESS_OBJECT, FLOWM2M_FLOW_ACCESS_OBJECT_URL, AwaResourceType_String, 0, 1, AwaResourceOperations_ReadWrite,
205-
accessHandler);
204+
error = AwaStaticClient_SetResourceOperationHandler(awaClient, FLOWM2M_FLOW_ACCESS_OBJECT, FLOWM2M_FLOW_ACCESS_OBJECT_URL, accessHandler);
206205
if (error != AwaError_Success)
207206
{
208207
printf("Failed to define URL resource\n");
209208
return 1;
210209
}
211210

212-
error = AwaStaticClient_DefineResourceWithHandler(awaClient, "CustomerKey", FLOWM2M_FLOW_ACCESS_OBJECT, FLOWM2M_FLOW_ACCESS_OBJECT_CUSTOMERKEY, AwaResourceType_String, 0, 1, AwaResourceOperations_ReadWrite,
213-
accessHandler);
211+
error = AwaStaticClient_SetResourceOperationHandler(awaClient, FLOWM2M_FLOW_ACCESS_OBJECT, FLOWM2M_FLOW_ACCESS_OBJECT_CUSTOMERKEY, accessHandler);
214212
if (error != AwaError_Success)
215213
{
216214
printf("Failed to define CustomerKey resource\n");
217215
return 1;
218216
}
219217

220-
error = AwaStaticClient_DefineResourceWithHandler(awaClient, "CustomerSecret", FLOWM2M_FLOW_ACCESS_OBJECT, FLOWM2M_FLOW_ACCESS_OBJECT_CUSTOMERSECRET, AwaResourceType_String, 0, 1, AwaResourceOperations_ReadWrite,
221-
accessHandler);
218+
error = AwaStaticClient_SetResourceOperationHandler(awaClient, FLOWM2M_FLOW_ACCESS_OBJECT, FLOWM2M_FLOW_ACCESS_OBJECT_CUSTOMERSECRET, accessHandler);
222219
if (error != AwaError_Success)
223220
{
224221
printf("Failed to define CustomerSecret resource\n");
225222
return 1;
226223
}
227224

228-
error = AwaStaticClient_DefineResourceWithHandler(awaClient, "RememberMeToken", FLOWM2M_FLOW_ACCESS_OBJECT, FLOWM2M_FLOW_ACCESS_OBJECT_REMEMBERMETOKEN, AwaResourceType_String, 0, 1, AwaResourceOperations_ReadWrite,
229-
accessHandler);
225+
error = AwaStaticClient_SetResourceOperationHandler(awaClient, FLOWM2M_FLOW_ACCESS_OBJECT, FLOWM2M_FLOW_ACCESS_OBJECT_REMEMBERMETOKEN, accessHandler);
230226
if (error != AwaError_Success)
231227
{
232228
printf("Failed to define RememberMeToken resource\n");
233229
return 1;
234230
}
235231

236-
error = AwaStaticClient_DefineResourceWithHandler(awaClient, "RememberMeTokenExpiry", FLOWM2M_FLOW_ACCESS_OBJECT, FLOWM2M_FLOW_ACCESS_OBJECT_REMEMBERMETOKENEXPIRY, AwaResourceType_Time, 0, 1, AwaResourceOperations_ReadWrite,
237-
accessHandler);
232+
error = AwaStaticClient_SetResourceOperationHandler(awaClient, FLOWM2M_FLOW_ACCESS_OBJECT, FLOWM2M_FLOW_ACCESS_OBJECT_REMEMBERMETOKENEXPIRY, accessHandler);
238233
if (error != AwaError_Success)
239234
{
240235
printf("Failed to define RememberMeTokenExpiry resource\n");

0 commit comments

Comments
 (0)