diff options
| author | Alex Vakulenko <avakulenko@google.com> | 2015-11-24 14:44:25 -0800 |
|---|---|---|
| committer | Alex Vakulenko <avakulenko@google.com> | 2015-11-24 14:44:25 -0800 |
| commit | 47be954a7b4c9891d9f565560cdaf1eda2d7d80b (patch) | |
| tree | 627e80cee3ae662f85e12bff4eac24526e5525e4 | |
| parent | 07ed8c015c6213be87b91ef7c534e8a95dbc71e0 (diff) | |
| download | example-ledflasher-47be954a7b4c9891d9f565560cdaf1eda2d7d80b.tar.gz | |
Fix ledflasher weave schema to match server definitions
Now that libweave doesn't do any type checking on command/state
schemas, it is no longer able to "fix" the schema to make it usable
by the cloud server. The applications must provide the correct schemas
to libweave from the start.
Change-Id: If3068024e4cefa5330197822582ad3422d744ce1
| -rw-r--r-- | src/ledflasher/etc/weaved/commands/ledflasher.json | 28 | ||||
| -rw-r--r-- | src/ledflasher/etc/weaved/states/ledflasher.schema.json | 11 |
2 files changed, 31 insertions, 8 deletions
diff --git a/src/ledflasher/etc/weaved/commands/ledflasher.json b/src/ledflasher/etc/weaved/commands/ledflasher.json index 08fe6e5..eab757c 100644 --- a/src/ledflasher/etc/weaved/commands/ledflasher.json +++ b/src/ledflasher/etc/weaved/commands/ledflasher.json @@ -1,20 +1,38 @@ { "_ledflasher": { "_set": { + "minimalRole": "user", "parameters": { - "_led": {"minimum": 1, "maximum": 4}, - "_on": "boolean" + "_led": { + "type": "integer", + "minimum": 1, + "maximum": 4 + }, + "_on": {"type": "boolean"} } }, "_toggle": { + "minimalRole": "user", "parameters": { - "_led": {"minimum": 1, "maximum": 4} + "_led": { + "type": "integer", + "minimum": 1, + "maximum": 4 + } } }, "_animate": { + "minimalRole": "user", "parameters": { - "_duration": {"minimum": 0.1, "maximum": 100.0}, - "_type": ["none", "marquee_left", "marquee_right", "blink"] + "_duration": { + "type": "number", + "minimum": 0.1, + "maximum": 100.0 + }, + "_type": { + "type": "string", + "enum": ["none", "marquee_left", "marquee_right", "blink"] + } } } } diff --git a/src/ledflasher/etc/weaved/states/ledflasher.schema.json b/src/ledflasher/etc/weaved/states/ledflasher.schema.json index c38cf44..0f0e37e 100644 --- a/src/ledflasher/etc/weaved/states/ledflasher.schema.json +++ b/src/ledflasher/etc/weaved/states/ledflasher.schema.json @@ -1,9 +1,14 @@ { "_ledflasher": { "_status": { - "enum": ["idle", "animating"], - "default": "idle" + "enum": { + "type": "string", + "enum": [ "idle", "animating" ] + } }, - "_leds": {"items": "boolean"} + "_leds": { + "type": "array", + "items": { "type": "boolean" } + } } } |