You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2016/10/25 01:53:36 UTC
[2/2] incubator-mynewt-core git commit: ocf_sample - whitespace
cleanup.
ocf_sample - whitespace cleanup.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/ac3c314c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/ac3c314c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/ac3c314c
Branch: refs/heads/develop
Commit: ac3c314cefeca7ca79564294107202cf28c20d4f
Parents: 94f0a7f97
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Oct 24 18:53:15 2016 -0700
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Oct 24 18:53:28 2016 -0700
----------------------------------------------------------------------
apps/ocf_sample/src/main.c | 196 +++++++++++++++++++++-------------------
1 file changed, 101 insertions(+), 95 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/ac3c314c/apps/ocf_sample/src/main.c
----------------------------------------------------------------------
diff --git a/apps/ocf_sample/src/main.c b/apps/ocf_sample/src/main.c
index b174fd5..c657592 100644
--- a/apps/ocf_sample/src/main.c
+++ b/apps/ocf_sample/src/main.c
@@ -54,44 +54,44 @@ static bool light_state = false;
static void
get_light(oc_request_t *request, oc_interface_mask_t interface)
{
- PRINT("GET_light:\n");
- oc_rep_start_root_object();
- switch (interface) {
- case OC_IF_BASELINE:
- oc_process_baseline_interface(request->resource);
- case OC_IF_RW:
- oc_rep_set_boolean(root, state, light_state);
- break;
- default:
- break;
- }
- oc_rep_end_root_object();
- oc_send_response(request, OC_STATUS_OK);
- PRINT("Light state %d\n", light_state);
+ PRINT("GET_light:\n");
+ oc_rep_start_root_object();
+ switch (interface) {
+ case OC_IF_BASELINE:
+ oc_process_baseline_interface(request->resource);
+ case OC_IF_RW:
+ oc_rep_set_boolean(root, state, light_state);
+ break;
+ default:
+ break;
+ }
+ oc_rep_end_root_object();
+ oc_send_response(request, OC_STATUS_OK);
+ PRINT("Light state %d\n", light_state);
}
static void
put_light(oc_request_t *request, oc_interface_mask_t interface)
{
- PRINT("PUT_light:\n");
- bool state = false;
- oc_rep_t *rep = request->request_payload;
- while (rep != NULL) {
- PRINT("key: %s ", oc_string(rep->name));
- switch (rep->type) {
- case BOOL:
- state = rep->value_boolean;
- PRINT("value: %d\n", state);
- break;
- default:
- oc_send_response(request, OC_STATUS_BAD_REQUEST);
- return;
- break;
+ PRINT("PUT_light:\n");
+ bool state = false;
+ oc_rep_t *rep = request->request_payload;
+ while (rep != NULL) {
+ PRINT("key: %s ", oc_string(rep->name));
+ switch (rep->type) {
+ case BOOL:
+ state = rep->value_boolean;
+ PRINT("value: %d\n", state);
+ break;
+ default:
+ oc_send_response(request, OC_STATUS_BAD_REQUEST);
+ return;
+ break;
+ }
+ rep = rep->next;
}
- rep = rep->next;
- }
- oc_send_response(request, OC_STATUS_CHANGED);
- light_state = state;
+ oc_send_response(request, OC_STATUS_CHANGED);
+ light_state = state;
}
static void
@@ -119,120 +119,125 @@ static bool light_state = false;
static void
set_device_custom_property(void *data)
{
- oc_set_custom_device_property(purpose, "operate mynewt-light");
+ oc_set_custom_device_property(purpose, "operate mynewt-light");
}
static oc_event_callback_retval_t
stop_observe(void *data)
{
- PRINT("Stopping OBSERVE\n");
- oc_stop_observe(light_1, &light_server);
- return DONE;
+ PRINT("Stopping OBSERVE\n");
+ oc_stop_observe(light_1, &light_server);
+ return DONE;
}
static void
put_light(oc_client_response_t *data)
{
- PRINT("PUT_light:\n");
- if (data->code == OC_STATUS_CHANGED)
- PRINT("PUT response OK\n");
- else
- PRINT("PUT response code %d\n", data->code);
+ PRINT("PUT_light:\n");
+ if (data->code == OC_STATUS_CHANGED)
+ PRINT("PUT response OK\n");
+ else
+ PRINT("PUT response code %d\n", data->code);
}
static void
observe_light(oc_client_response_t *data)
{
- PRINT("OBSERVE_light:\n");
- oc_rep_t *rep = data->payload;
- while (rep != NULL) {
- PRINT("key %s, value ", oc_string(rep->name));
- switch (rep->type) {
- case BOOL:
- PRINT("%d\n", rep->value_boolean);
- light_state = rep->value_boolean;
- break;
- default:
- break;
+ PRINT("OBSERVE_light:\n");
+ oc_rep_t *rep = data->payload;
+ while (rep != NULL) {
+ PRINT("key %s, value ", oc_string(rep->name));
+ switch (rep->type) {
+ case BOOL:
+ PRINT("%d\n", rep->value_boolean);
+ light_state = rep->value_boolean;
+ break;
+ default:
+ break;
+ }
+ rep = rep->next;
}
- rep = rep->next;
- }
- if (oc_init_put(light_1, &light_server, NULL, &put_light, LOW_QOS)) {
- oc_rep_start_root_object();
- oc_rep_set_boolean(root, state, !light_state);
- oc_rep_end_root_object();
- if (oc_do_put())
- PRINT("Sent PUT request\n");
- else
- PRINT("Could not send PUT\n");
- } else
- PRINT("Could not init PUT\n");
+ if (oc_init_put(light_1, &light_server, NULL, &put_light, LOW_QOS)) {
+ oc_rep_start_root_object();
+ oc_rep_set_boolean(root, state, !light_state);
+ oc_rep_end_root_object();
+ if (oc_do_put())
+ PRINT("Sent PUT request\n");
+ else
+ PRINT("Could not send PUT\n");
+ } else
+ PRINT("Could not init PUT\n");
}
static oc_discovery_flags_t
discovery(const char *di, const char *uri, oc_string_array_t types,
oc_interface_mask_t interfaces, oc_server_handle_t *server)
{
- int i;
- int uri_len = strlen(uri);
- uri_len = (uri_len >= MAX_URI_LENGTH) ? MAX_URI_LENGTH - 1 : uri_len;
-
- for (i = 0; i < oc_string_array_get_allocated_size(types); i++) {
- char *t = oc_string_array_get_item(types, i);
- if (strlen(t) == 11 && strncmp(t, "oic.r.light", 11) == 0) {
- memcpy(&light_server, server, sizeof(oc_server_handle_t));
-
- strncpy(light_1, uri, uri_len);
- light_1[uri_len] = '\0';
-
- oc_do_observe(light_1, &light_server, NULL, &observe_light, LOW_QOS);
- oc_set_delayed_callback(NULL, &stop_observe, 30);
- return OC_STOP_DISCOVERY;
+ int i;
+ int uri_len = strlen(uri);
+ uri_len = (uri_len >= MAX_URI_LENGTH) ? MAX_URI_LENGTH - 1 : uri_len;
+
+ for (i = 0; i < oc_string_array_get_allocated_size(types); i++) {
+ char *t = oc_string_array_get_item(types, i);
+ if (strlen(t) == 11 && strncmp(t, "oic.r.light", 11) == 0) {
+ memcpy(&light_server, server, sizeof(oc_server_handle_t));
+
+ strncpy(light_1, uri, uri_len);
+ light_1[uri_len] = '\0';
+
+ oc_do_observe(light_1, &light_server, NULL, &observe_light,
+ LOW_QOS);
+ oc_set_delayed_callback(NULL, &stop_observe, 30);
+ return OC_STOP_DISCOVERY;
+ }
}
- }
- return OC_CONTINUE_DISCOVERY;
+ return OC_CONTINUE_DISCOVERY;
}
static void
issue_requests(void)
{
- oc_do_ip_discovery("oic.r.light", &discovery);
+ oc_do_ip_discovery("oic.r.light", &discovery);
}
#endif
static void
app_init(void)
{
- oc_init_platform("Mynewt", NULL, NULL);
+ oc_init_platform("Mynewt", NULL, NULL);
#if (MYNEWT_VAL(OC_CLIENT) == 1)
- oc_add_device("/oic/d", "oic.d.light", "MynewtClient", "1.0", "1.0",
- set_device_custom_property, NULL);
+ oc_add_device("/oic/d", "oic.d.light", "MynewtClient", "1.0", "1.0",
+ set_device_custom_property, NULL);
#endif
#if (MYNEWT_VAL(OC_SERVER) == 1)
- oc_add_device("/oic/d", "oic.d.light", "MynewtServer", "1.0", "1.0", NULL, NULL);
+ oc_add_device("/oic/d", "oic.d.light", "MynewtServer", "1.0", "1.0", NULL,
+ NULL);
#endif
}
- oc_handler_t ocf_handler = {.init = app_init,
+oc_handler_t ocf_handler = {
+ .init = app_init,
#if (MYNEWT_VAL(OC_SERVER) == 1)
- .register_resources = register_resources,
+ .register_resources = register_resources,
#endif
#if (MYNEWT_VAL(OC_CLIENT) == 1)
- .requests_entry = issue_requests,
+ .requests_entry = issue_requests,
#endif
};
struct os_sem ocf_main_loop_sem;
- void
-oc_signal_main_loop(void) {
+void
+oc_signal_main_loop(void)
+{
os_sem_release(&ocf_main_loop_sem);
}
-void ocf_task_handler(void *arg) {
-
+void
+ocf_task_handler(void *arg)
+{
os_sem_init(&ocf_main_loop_sem, 1);
while (1) {
@@ -251,9 +256,10 @@ void ocf_task_handler(void *arg) {
}
void
-ocf_task_init(void) {
-
+ocf_task_init(void)
+{
int rc;
+
rc = os_task_init(&ocf_task, "ocf", ocf_task_handler, NULL,
OCF_TASK_PRIO, OS_WAIT_FOREVER, ocf_stack, OCF_TASK_STACK_SIZE);
assert(rc == 0);