pkg/wakaama: add on off switch #21109
Open
+735
−3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
Area: pkg
leandrolanzieri
changed the title
leandrolanzieri
added
the
Type: new feature
leandrolanzieri
added
the
CI: ready for build
leandrolanzieri
force-pushed
the
pkg/wakaama/add_on_off_switch
branch
from
3621c59 to
2254a35
Compare
Teufelchen1
requested changes
Jan 6, 2025
| @@ -159,6 +172,25 @@ static int _parse_lwm2m_light_cmd(int argc, char **argv) | |||
| return 0; | |||
| } | |||
|
|
|||
| static int _parse_lwm2m_switch_cmd(int argc, char **argv) | |||
| { | |||
| if (argc < 3) { | |||
There was a problem hiding this comment.
Suggested change
| if (argc < 3) { | |
| if (argc != 3) { |
Or, if the <on|off> is optional (in which case the follow up printf should be changed to [on|off] imo)
Suggested change
| if (argc < 3) { | |
| if ((argc != 3) && (argc != 2)) { |
| return 0; | ||
| } | ||
|
|
||
|
|
Comment on lines
+38
to
+41
| bool status; /**< digital input status */ | ||
| uint32_t counter; /**< counter for the digital input */ | ||
| ztimer_stopwatch_t stopwatch; /**< stopwatch for time periods */ | ||
| char app_type[CONFIG_LWM2M_ON_OFF_SWITCH_APP_TYPE_MAX_SIZE]; /**< application type */ |
There was a problem hiding this comment.
Suggested change
| bool status; /**< digital input status */ | |
| uint32_t counter; /**< counter for the digital input */ | |
| ztimer_stopwatch_t stopwatch; /**< stopwatch for time periods */ | |
| char app_type[CONFIG_LWM2M_ON_OFF_SWITCH_APP_TYPE_MAX_SIZE]; /**< application type */ | |
| bool status; /**< wether the switch is on or off */ | |
| uint32_t counter; /**< how often the switch was flipped */ | |
| ztimer_stopwatch_t stopwatch; /**< ??? How long the switch was on ? */ | |
| char app_type[CONFIG_LWM2M_ON_OFF_SWITCH_APP_TYPE_MAX_SIZE]; /**< application type */ |
| * @return COAP_404_NOT_FOUND if the instance was not found | ||
| * @return COAP_500_INTERNAL_SERVER_ERROR otherwise | ||
| */ | ||
| static uint8_t _read_cb(lwm2m_context_t * context, uint16_t instance_id, int * num_data, |
There was a problem hiding this comment.
It bugs me that the return type is uint8_t instead of e.g. lwm2m_cb_result_t. But I don't think it is up to you to change?
Comment on lines
+158
to
+159
| static uint8_t _read_cb(lwm2m_context_t * context, uint16_t instance_id, int * num_data, | ||
| lwm2m_data_t ** data_array, lwm2m_object_t * object) |
There was a problem hiding this comment.
How sure are you that the pointer, in this cb and the write_cb, can not be NULL? If you have doubt, please add asserts or additional checks.
| break; | ||
| } | ||
|
|
||
| case LWM2M_ON_OFF_SWITCH_APP_TYPE_ID: |
There was a problem hiding this comment.
Could you clarify to me why we have this functionality here and lower in the lwm2m_object_on_off_switch_update_app_type()? It's not a drop-in replacement due to the mutex tho.
| } | ||
|
|
||
| for (int i = 0; i < num_data && result == COAP_204_CHANGED; i++) { | ||
| switch (data_array[i].id) { |
There was a problem hiding this comment.
There's no default case. Does it matter?
Comment on lines
+323
to
+324
| client_data = (lwm2m_client_data_t *)_on_off_switch_object.wakaama_object.userData; | ||
| lwm2m_resource_value_changed(client_data->lwm2m_ctx, &uri); |
There was a problem hiding this comment.
client_data might be NULL!
Comment on lines
+328
to
+330
| lwm2m_object_t *lwm2m_object_on_off_switch_init(lwm2m_client_data_t *client_data) | ||
| { | ||
| /* initialize the instances */ |
There was a problem hiding this comment.
Suggested change
| lwm2m_object_t *lwm2m_object_on_off_switch_init(lwm2m_client_data_t *client_data) | |
| { | |
| /* initialize the instances */ | |
| lwm2m_object_t *lwm2m_object_on_off_switch_init(lwm2m_client_data_t *client_data) | |
| { | |
| assert(client_data); | |
| /* initialize the instances */ |
Alternatively, ensure all code can handle NULL in the field.
| /* if app is specified, copy locally */ | ||
| if (args->app_type) { | ||
| if (args->app_type_len > CONFIG_LWM2M_ON_OFF_SWITCH_APP_TYPE_MAX_SIZE) { | ||
| DEBUG("[lwm2m:on_off_switch]: not enough space for app_type string\n"); |
There was a problem hiding this comment.
Suggested change
| DEBUG("[lwm2m:on_off_switch]: not enough space for app_type string\n"); | |
| DEBUG("[lwm2m:on_off_switch]: not enough space for app_type string, got %d but max is %d\n", args->app_type_len, CONFIG_LWM2M_ON_OFF_SWITCH_APP_TYPE_MAX_SIZE -1); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Contribution description
This adds a simple on/off switch object to the supported LwM2M objects: Object 3342. From the specs:
Testing procedure
Use the lwm2m example, the 'switch' can be controlled via shell.
Issues/PRs references
None