Merge pull request #33 from IRNAS/release/v1.3.4

Release v1.3.4
IRNAS · Feb 16, 2023 · 72d9668 · 72d9668
2 parents 9cf6a37 + bc453e5
commit 72d9668
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
 ## [Unreleased]
 
+## [1.3.4] - 2023-02-16
+
+### Fixed
+
+-   Zephyr include statements for NCS 2.2.
+
 ## [1.3.3] - 2023-02-03
 
 ### Fixed
@@ -69,7 +75,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 -   Basic sample.
 -   Callbacks sample.
 
-[Unreleased]: https://github.com/IRNAS/irnas-usersettings-lib/compare/v1.3.3...HEAD
+[Unreleased]: https://github.com/IRNAS/irnas-usersettings-lib/compare/v1.3.4...HEAD
+
+[1.3.4]: https://github.com/IRNAS/irnas-usersettings-lib/compare/v1.3.3...v1.3.4
 
 [1.3.3]: https://github.com/IRNAS/irnas-usersettings-lib/compare/v1.3.2...v1.3.3
 

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ The supported types can be seen in [user_settings_types.h](./user-settings/inclu
       repo-path: irnas-usersettings-lib
       path: irnas/irnas-usersettings-lib
       remote: irnas
-      revision: v1.0.0
+      revision: v1.3.4
 
 ## Usage
 

diff --git a/library/bt_service/bt_uss.c b/library/bt_service/bt_uss.c
@@ -8,10 +8,10 @@
 
 #include <bt_uss.h>
 
+#include <zephyr/bluetooth/gatt.h>
+#include <zephyr/bluetooth/uuid.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/types.h>
-#include <bluetooth/gatt.h>
-#include <bluetooth/uuid.h>
-#include <logging/log.h>
 
 #include <user_settings_list.h>
 #include <user_settings_protocol_types.h>

diff --git a/library/include/bt_uss.h b/library/include/bt_uss.h
@@ -28,7 +28,7 @@
 extern "C" {
 #endif
 
-#include <bluetooth/conn.h>
+#include <zephyr/bluetooth/conn.h>
 
 /**
  * @brief Enable the USS Service

diff --git a/library/user_settings/user_settings.c b/library/user_settings/user_settings.c
@@ -14,9 +14,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 #include <zephyr/settings/settings.h>
 
-#include <logging/log.h>
 LOG_MODULE_REGISTER(user_settings, CONFIG_USER_SETTINGS_LOG_LEVEL);
 
 #define INIT_ASSERT_TEXT "user_settings_init should be called before this function"

diff --git a/samples/bluetooth_service/src/main.c b/samples/bluetooth_service/src/main.c
@@ -4,11 +4,11 @@
 
 #include <zephyr/bluetooth/bluetooth.h>
 #include <zephyr/kernel.h>
+#include <zephyr/logging/log.h>
 
 #include <bt_uss.h>
 #include <user_settings.h>
 
-#include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(main);
 
 /* BLUETOOTH HANDLING */