From 5041ca23971386da6c931593b9f90894b2df896e Mon Sep 17 00:00:00 2001
From: Brian Bradley <brian.bradley.p@gmail.com>
Date: Wed, 4 Jan 2023 18:41:01 -0500
Subject: [PATCH 1/2] Migrate to zephyr 3.2

---
 app/CMakeLists.txt                                |  3 +--
 app/include/shredlink/daq.h                       |  2 +-
 app/src/hid.c                                     | 10 +++++-----
 app/src/main.c                                    |  4 ++--
 app/src/polling.c                                 |  7 +++----
 app/src/tilt.c                                    |  8 ++++----
 extras/drivers/sensor/tilt/gpio/src/gpio_tilt.c   | 10 +++-------
 extras/drivers/sensor/tilt/gpio/src/gpio_tilt.h   |  8 ++++----
 .../sensor/tilt/gpio/src/gpio_tilt_triggers.c     |  4 ++--
 extras/drivers/wii/include/wii.h                  |  3 ++-
 extras/drivers/wii/src/wii_peripheral.c           | 15 +++++++--------
 extras/include/drivers/sensor/tilt.h              |  2 +-
 west.yml                                          |  2 +-
 13 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index b8aec1e..d69dbdb 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -3,11 +3,10 @@
 # Copyright (c) 2021 Brian Bradley
 
 cmake_minimum_required(VERSION 3.20.0)
-
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON CACHE INTERNAL "")
 list (APPEND SYSCALL_INCLUDE_DIRS 
     ${CMAKE_SOURCE_DIR}/../extras/drivers/wii
 )
-
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(shredlink LANGUAGES C VERSION 0.2.0)
diff --git a/app/include/shredlink/daq.h b/app/include/shredlink/daq.h
index ccce789..61977af 100644
--- a/app/include/shredlink/daq.h
+++ b/app/include/shredlink/daq.h
@@ -12,7 +12,7 @@
 #ifndef __SHREDLINK_POLLER_H
 #define __SHREDLINK_POLLER_H
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 
 /**
  * @TODO: this should be configurable and part of the gamepad API
diff --git a/app/src/hid.c b/app/src/hid.c
index 2844d1d..939254a 100644
--- a/app/src/hid.c
+++ b/app/src/hid.c
@@ -8,12 +8,12 @@
  * SPDX-License-Identifier: Apache-2.0
  * 
  */
-#include <zephyr.h>
-#include <device.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/logging/log.h>
 #include <shredlink/hid.h>
-#include <usb/usb_device.h>
-#include <usb/class/usb_hid.h>
+#include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/class/usb_hid.h>
 
 LOG_MODULE_DECLARE(shredlink, CONFIG_SHREDLINK_LOG_LEVEL);
 
diff --git a/app/src/main.c b/app/src/main.c
index ef4fa3e..979d33b 100644
--- a/app/src/main.c
+++ b/app/src/main.c
@@ -9,8 +9,8 @@
  * 
  */
 
-#include <zephyr.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <app_version.h>
 
 LOG_MODULE_REGISTER(shredlink, CONFIG_SHREDLINK_LOG_LEVEL);
diff --git a/app/src/polling.c b/app/src/polling.c
index b85b059..53ff5c1 100644
--- a/app/src/polling.c
+++ b/app/src/polling.c
@@ -9,11 +9,10 @@
  * SPDX-License-Identifier: Apache-2.0
  * 
  */
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <wii.h>
-#include <device.h>
-#include <sys/util.h>
-#include <logging/log.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/logging/log.h>
 #include <shredlink/daq.h>
 #include <shredlink/hid.h>
 
diff --git a/app/src/tilt.c b/app/src/tilt.c
index 5cf6a5a..b5c33d3 100644
--- a/app/src/tilt.c
+++ b/app/src/tilt.c
@@ -8,10 +8,10 @@
  * SPDX-License-Identifier: Apache-2.0
  * 
  */
-#include <zephyr.h>
-#include <logging/log.h>
-#include <device.h>
-#include <drivers/sensor.h>
+#include <zephyr/zephyr.h>
+#include <zephyr/logging/log.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
 #include <drivers/sensor/tilt.h>
 #include <shredlink/daq.h>
 
diff --git a/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.c b/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.c
index 0231d25..32ba40f 100644
--- a/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.c
+++ b/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.c
@@ -12,8 +12,8 @@
 #define DT_DRV_COMPAT gpio_tilt
 
 #include <errno.h>
-#include <zephyr.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <drivers/sensor/tilt.h>
 #include "gpio_tilt.h"
 
@@ -82,10 +82,6 @@ static struct gpio_tilt_data gpio_tilt_data = {
 	.sensor = GPIO_DT_SPEC_INST_GET(0, tilt_gpios),
 };
 
-static const struct gpio_tilt_config gpio_tilt_cfg = {
-	.tilt_controller = DT_INST_GPIO_LABEL(0, tilt_gpios),
-};
-
 DEVICE_DT_INST_DEFINE(0, gpio_tilt_init, NULL,
-		      &gpio_tilt_data, &gpio_tilt_cfg, POST_KERNEL,
+		      &gpio_tilt_data, NULL, POST_KERNEL,
 		      CONFIG_SENSOR_INIT_PRIORITY, &gpio_tilt_api_funcs);
diff --git a/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.h b/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.h
index 804533c..dbe186a 100644
--- a/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.h
+++ b/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.h
@@ -3,10 +3,10 @@
 
 #include <errno.h>
 #include <zephyr/types.h>
-#include <device.h>
-#include <drivers/sensor.h>
-#include <sys/util.h>
-#include <drivers/gpio.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/sensor.h>
+#include <zephyr/sys/util.h>
+#include <zephyr/drivers/gpio.h>
 
 struct gpio_tilt_data {
 	struct gpio_dt_spec sensor;
diff --git a/extras/drivers/sensor/tilt/gpio/src/gpio_tilt_triggers.c b/extras/drivers/sensor/tilt/gpio/src/gpio_tilt_triggers.c
index e202eb5..e8a1c41 100644
--- a/extras/drivers/sensor/tilt/gpio/src/gpio_tilt_triggers.c
+++ b/extras/drivers/sensor/tilt/gpio/src/gpio_tilt_triggers.c
@@ -9,9 +9,9 @@
  * 
  */
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include "gpio_tilt.h"
-#include <logging/log.h>
+#include <zephyr/logging/log.h>
 
 LOG_MODULE_DECLARE(tilt_gpio, CONFIG_SENSOR_LOG_LEVEL);
 
diff --git a/extras/drivers/wii/include/wii.h b/extras/drivers/wii/include/wii.h
index 38c19b1..c12364f 100644
--- a/extras/drivers/wii/include/wii.h
+++ b/extras/drivers/wii/include/wii.h
@@ -13,7 +13,8 @@
 #define SHREDLINK_DRIVERS_SENSOR_NINTENDO_WII_H_
 
 #include <zephyr/types.h>
-#include <device.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/extras/drivers/wii/src/wii_peripheral.c b/extras/drivers/wii/src/wii_peripheral.c
index a17f35c..3e4c9e3 100644
--- a/extras/drivers/wii/src/wii_peripheral.c
+++ b/extras/drivers/wii/src/wii_peripheral.c
@@ -12,15 +12,14 @@
 #define DT_DRV_COMPAT nintendo_wii
 
 #include <errno.h>
-#include <zephyr.h>
-#include <device.h>
-#include <kernel.h>
-#include <drivers/i2c.h>
-#include <init.h>
-#include <sys/__assert.h>
-#include <logging/log.h>
+#include <zephyr/kernel.h>
+#include <zephyr/device.h>
+#include <zephyr/drivers/i2c.h>
+#include <zephyr/init.h>
+#include <zephyr/sys/__assert.h>
+#include <zephyr/logging/log.h>
 #include <wii.h>
-#include <sys/byteorder.h>
+#include <zephyr/sys/byteorder.h>
 
 LOG_MODULE_REGISTER(wii, CONFIG_WII_LOG_LEVEL);
 
diff --git a/extras/include/drivers/sensor/tilt.h b/extras/include/drivers/sensor/tilt.h
index 9e1530a..bd872d0 100644
--- a/extras/include/drivers/sensor/tilt.h
+++ b/extras/include/drivers/sensor/tilt.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#include <drivers/sensor.h>
+#include <zephyr/drivers/sensor.h>
 
 enum sensor_channel_tilt {
     /**
diff --git a/west.yml b/west.yml
index 05e301d..6218d0b 100644
--- a/west.yml
+++ b/west.yml
@@ -9,6 +9,6 @@ manifest:
   projects:
     - name: zephyr
       remote: zephyrproject-rtos
-      revision: zephyr-v3.0.0
+      revision: zephyr-v3.2.0
       import:
         path-prefix: rtos

From 4165a5e03a51c678cf53a6f1c17d9c74260eeefb Mon Sep 17 00:00:00 2001
From: Brian Bradley <brian.bradley.p@gmail.com>
Date: Wed, 4 Jan 2023 18:58:51 -0500
Subject: [PATCH 2/2] Update samples and tests to work with v3.2

---
 extras/drivers/sensor/tilt/gpio/src/gpio_tilt.h |  4 ----
 samples/tilt_sensor/src/main.c                  |  6 +++---
 samples/wii_guitar/src/main.c                   |  8 ++++----
 tests/tilt/src/main.c                           | 12 ++++++------
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.h b/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.h
index dbe186a..4fe33dc 100644
--- a/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.h
+++ b/extras/drivers/sensor/tilt/gpio/src/gpio_tilt.h
@@ -30,10 +30,6 @@ struct gpio_tilt_data {
     #endif
 };
 
-struct gpio_tilt_config {
-	const char *tilt_controller;
-};
-
 #ifdef CONFIG_TILT_SENSOR_TRIGGER
 int gpio_tilt_trigger_set(const struct device *dev,
 			const struct sensor_trigger *trig,
diff --git a/samples/tilt_sensor/src/main.c b/samples/tilt_sensor/src/main.c
index 7a7c29e..37adce0 100644
--- a/samples/tilt_sensor/src/main.c
+++ b/samples/tilt_sensor/src/main.c
@@ -8,10 +8,10 @@
  * 
  */
 
-#include <zephyr.h>
-#include <drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/drivers/sensor.h>
 #include <drivers/sensor/tilt.h>
-#include <drivers/gpio.h>
+#include <zephyr/drivers/gpio.h>
 
 #define LED_ID	DT_ALIAS(led0)
 #define TILT_SENSOR	DT_NODELABEL(tilt0)
diff --git a/samples/wii_guitar/src/main.c b/samples/wii_guitar/src/main.c
index 1ae6573..5295af0 100644
--- a/samples/wii_guitar/src/main.c
+++ b/samples/wii_guitar/src/main.c
@@ -9,11 +9,11 @@
  * 
  */
 
-#include <zephyr.h>
+#include <zephyr/kernel.h>
 #include <wii.h>
 #include <string.h>
 
-#define WII_GUITAR	DT_LABEL(DT_NODELABEL(wii_guitar))
+#define WII_GUITAR	DT_NODELABEL(wii_guitar)
 
 struct __attribute__((packed)) guitar_data{
 	uint8_t analog_x: 6;
@@ -37,9 +37,9 @@ void main(void)
 	const struct device *wii;
 	int ret;
 
-	wii = device_get_binding(WII_GUITAR);
+	wii = DEVICE_DT_GET(WII_GUITAR);
 	if (wii == NULL) {
-		printk("Error getting device: %s\n", WII_GUITAR);
+		printk("Error getting device");
 	}
 
 	while (1) {
diff --git a/tests/tilt/src/main.c b/tests/tilt/src/main.c
index 98b193d..62f9134 100644
--- a/tests/tilt/src/main.c
+++ b/tests/tilt/src/main.c
@@ -9,15 +9,15 @@
  * 
  */
 
-#include <zephyr.h>
-#include <ztest.h>
-#include <drivers/sensor.h>
+#include <zephyr/kernel.h>
+#include <zephyr/ztest.h>
+#include <zephyr/drivers/sensor.h>
 #include <drivers/sensor/tilt.h>
 
-#define TILT_SENSOR_LABEL DT_LABEL(DT_NODELABEL(tilt0))
+#define TILT_SENSOR DT_NODELABEL(tilt0)
 const struct device *get_tilt_sensor_device(void){
-    const struct device * dev = device_get_binding(TILT_SENSOR_LABEL);
-    zassert_not_null(dev, "failed: dev '%s' is null", TILT_SENSOR_LABEL);
+    const struct device * dev = DEVICE_DT_GET(TILT_SENSOR);
+    zassert_not_null(dev, "failed: No tilt device");
     return dev;
 }