Merge pull request TheThingsNetwork#170 from TheThingsNetwork/feature/change-proto-fields

changed/removed fields name

Author: johanstokking

src/api/appData.proto

@@ -4,7 +4,5 @@ package api;
 
 message AppData {
         optional bool light = 1;
-        optional bool activation_limit = 2;
-        optional bool switch_state  = 3;
-        optional float deactivation_limit = 4;
+        optional bool activate = 2;
 }

src/appData.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.7 at Fri Dec  9 17:11:33 2016. */
+/* Generated by nanopb-0.3.7 at Fri Dec 16 16:49:49 2016. */
 
 #include "appData.pb.h"
 
@@ -10,11 +10,9 @@
 
 
 
-const pb_field_t api_AppData_fields[5] = {
+const pb_field_t api_AppData_fields[3] = {
     PB_FIELD(  1, BOOL    , OPTIONAL, STATIC  , FIRST, api_AppData, light, light, 0),
-    PB_FIELD(  2, BOOL    , OPTIONAL, STATIC  , OTHER, api_AppData, activation_limit, light, 0),
-    PB_FIELD(  3, BOOL    , OPTIONAL, STATIC  , OTHER, api_AppData, switch_state, activation_limit, 0),
-    PB_FIELD(  4, FLOAT   , OPTIONAL, STATIC  , OTHER, api_AppData, deactivation_limit, switch_state, 0),
+    PB_FIELD(  2, BOOL    , OPTIONAL, STATIC  , OTHER, api_AppData, activate, light, 0),
     PB_LAST_FIELD
 };
 

src/appData.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.7 at Fri Dec  9 17:11:33 2016. */
+/* Generated by nanopb-0.3.7 at Fri Dec 16 16:49:49 2016. */
 
 #ifndef PB_API_APPDATA_PB_H_INCLUDED
 #define PB_API_APPDATA_PB_H_INCLUDED
@@ -18,32 +18,26 @@ extern "C" {
 typedef struct _api_AppData {
     bool has_light;
     bool light;
-    bool has_activation_limit;
-    bool activation_limit;
-    bool has_switch_state;
-    bool switch_state;
-    bool has_deactivation_limit;
-    float deactivation_limit;
+    bool has_activate;
+    bool activate;
 /* @@protoc_insertion_point(struct:api_AppData) */
 } api_AppData;
 
 /* Default values for struct fields */
 
 /* Initializer values for message structs */
-#define api_AppData_init_default                 {false, 0, false, 0, false, 0, false, 0}
-#define api_AppData_init_zero                    {false, 0, false, 0, false, 0, false, 0}
+#define api_AppData_init_default                 {false, 0, false, 0}
+#define api_AppData_init_zero                    {false, 0, false, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define api_AppData_light_tag                    1
-#define api_AppData_activation_limit_tag         2
-#define api_AppData_switch_state_tag             3
-#define api_AppData_deactivation_limit_tag       4
+#define api_AppData_activate_tag                 2
 
 /* Struct field encoding specification for nanopb */
-extern const pb_field_t api_AppData_fields[5];
+extern const pb_field_t api_AppData_fields[3];
 
 /* Maximum encoded size of messages (where known) */
-#define api_AppData_size                         11
+#define api_AppData_size                         4
 
 /* Message IDs (where set with "msgid" option) */
 #ifdef PB_MSGID

src/deviceData.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.3.7 at Fri Dec  9 17:11:33 2016. */
+/* Generated by nanopb-0.3.7 at Fri Dec 16 16:49:49 2016. */
 
 #include "deviceData.pb.h"
 

src/deviceData.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.3.7 at Fri Dec  9 17:11:33 2016. */
+/* Generated by nanopb-0.3.7 at Fri Dec 16 16:49:49 2016. */
 
 #ifndef PB_API_DEVICEDATA_PB_H_INCLUDED
 #define PB_API_DEVICEDATA_PB_H_INCLUDED