From 1a17f28bfd36188b18816c708a5177ccf20fbe9a Mon Sep 17 00:00:00 2001
From: Milanka Ringwald <mila@ringwald.ch>
Date: Mon, 24 Jun 2019 11:29:33 +0200
Subject: [PATCH] mesh: move message IDs to mesh_generic_model.h

---
 test/mesh/mesh_generic_level_server.c |  1 +
 test/mesh/mesh_generic_level_server.h | 10 -----
 test/mesh/mesh_generic_model.h        | 64 +++++++++++++++++++++++++++
 test/mesh/mesh_generic_server.c       |  1 +
 test/mesh/mesh_generic_server.h       |  5 ---
 5 files changed, 66 insertions(+), 15 deletions(-)
 create mode 100644 test/mesh/mesh_generic_model.h

diff --git a/test/mesh/mesh_generic_level_server.c b/test/mesh/mesh_generic_level_server.c
index 29847f602..87692a77e 100644
--- a/test/mesh/mesh_generic_level_server.c
+++ b/test/mesh/mesh_generic_level_server.c
@@ -41,6 +41,7 @@
 #include <stdio.h>
 #include "mesh_generic_level_server.h"
 #include "btstack_util.h"
+#include "mesh_generic_model.h"
 #include "ble/mesh/mesh_network.h"
 #include "mesh_keys.h"
 #include "mesh_transport.h"
diff --git a/test/mesh/mesh_generic_level_server.h b/test/mesh/mesh_generic_level_server.h
index 6efc5b288..d07a08fb9 100644
--- a/test/mesh/mesh_generic_level_server.h
+++ b/test/mesh/mesh_generic_level_server.h
@@ -46,16 +46,6 @@ extern "C"
 {
 #endif
 
-#define MESH_GENERIC_LEVEL_GET                     0x8205u    
-#define MESH_GENERIC_LEVEL_SET                     0x8206u
-#define MESH_GENERIC_LEVEL_SET_UNACKNOWLEDGED      0x8207u
-#define MESH_GENERIC_LEVEL_STATUS                  0x8208u
-#define MESH_GENERIC_DELTA_SET                     0x8209u
-#define MESH_GENERIC_DELTA_SET_UNACKNOWLEDGED      0x820Au
-#define MESH_GENERIC_MOVE_SET                      0x820Bu
-#define MESH_GENERIC_MOVE_SET_UNACKNOWLEDGED       0x820Cu
-
-
 typedef struct {
     mesh_transition_t base_transition;
 
diff --git a/test/mesh/mesh_generic_model.h b/test/mesh/mesh_generic_model.h
new file mode 100644
index 000000000..ce72e11ee
--- /dev/null
+++ b/test/mesh/mesh_generic_model.h
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2019 BlueKitchen GmbH
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the copyright holders nor the names of
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ * 4. Any redistribution, use, or modification is done solely for
+ *    personal benefit and not for any commercial purpose or for
+ *    monetary gain.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BLUEKITCHEN GMBH AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL MATTHIAS
+ * RINGWALD OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * Please inquire about commercial licensing options at 
+ * contact@bluekitchen-gmbh.com
+ *
+ */
+
+#ifndef __MESH_GENERIC_MODEL_H
+#define __MESH_GENERIC_MODEL_H
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#define MESH_GENERIC_ON_OFF_GET                     0x8201u    
+#define MESH_GENERIC_ON_OFF_SET                     0x8202u
+#define MESH_GENERIC_ON_OFF_SET_UNACKNOWLEDGED      0x8203u
+#define MESH_GENERIC_ON_OFF_STATUS                  0x8204u
+
+#define MESH_GENERIC_LEVEL_GET                      0x8205u    
+#define MESH_GENERIC_LEVEL_SET                      0x8206u
+#define MESH_GENERIC_LEVEL_SET_UNACKNOWLEDGED       0x8207u
+#define MESH_GENERIC_LEVEL_STATUS                   0x8208u
+#define MESH_GENERIC_DELTA_SET                      0x8209u
+#define MESH_GENERIC_DELTA_SET_UNACKNOWLEDGED       0x820Au
+#define MESH_GENERIC_MOVE_SET                       0x820Bu
+#define MESH_GENERIC_MOVE_SET_UNACKNOWLEDGED        0x820Cu
+
+#ifdef __cplusplus
+} /* end of extern "C" */
+#endif
+
+#endif
diff --git a/test/mesh/mesh_generic_server.c b/test/mesh/mesh_generic_server.c
index 1a01be205..8b3519c27 100644
--- a/test/mesh/mesh_generic_server.c
+++ b/test/mesh/mesh_generic_server.c
@@ -41,6 +41,7 @@
 #include <stdio.h>
 #include "mesh_generic_server.h"
 #include "btstack_util.h"
+#include "mesh_generic_model.h"
 #include "ble/mesh/mesh_network.h"
 #include "mesh_keys.h"
 #include "mesh_transport.h"
diff --git a/test/mesh/mesh_generic_server.h b/test/mesh/mesh_generic_server.h
index a0280f900..b94cf6a78 100644
--- a/test/mesh/mesh_generic_server.h
+++ b/test/mesh/mesh_generic_server.h
@@ -46,11 +46,6 @@ extern "C"
 {
 #endif
 
-#define MESH_GENERIC_ON_OFF_GET                     0x8201u    
-#define MESH_GENERIC_ON_OFF_SET                     0x8202u
-#define MESH_GENERIC_ON_OFF_SET_UNACKNOWLEDGED      0x8203u
-#define MESH_GENERIC_ON_OFF_STATUS                  0x8204u
-
 typedef struct {
     mesh_transition_t base_transition;