diff --git a/Manual/Ch1-Intro.pdf b/Manual/Ch1-Intro.pdf
index 21efacc..141c453 100644
Binary files a/Manual/Ch1-Intro.pdf and b/Manual/Ch1-Intro.pdf differ
diff --git a/Manual/Ch2-Application-Architecture.pdf b/Manual/Ch2-Application-Architecture.pdf
index 26c66d8..ad9a6f0 100644
Binary files a/Manual/Ch2-Application-Architecture.pdf and b/Manual/Ch2-Application-Architecture.pdf differ
diff --git a/Manual/Ch3-Peripherals.pdf b/Manual/Ch3-Peripherals.pdf
index 8d084ac..d55ce04 100644
Binary files a/Manual/Ch3-Peripherals.pdf and b/Manual/Ch3-Peripherals.pdf differ
diff --git a/Manual/Ch4-RTOS.pdf b/Manual/Ch4-RTOS.pdf
index da578e6..cc00361 100644
Binary files a/Manual/Ch4-RTOS.pdf and b/Manual/Ch4-RTOS.pdf differ
diff --git a/Manual/Ch5-Debugging.pdf b/Manual/Ch5-Debugging.pdf
index 71a5595..28f5189 100644
Binary files a/Manual/Ch5-Debugging.pdf and b/Manual/Ch5-Debugging.pdf differ
diff --git a/Manual/Ch6-Supplemental-Material.pdf b/Manual/Ch6-Supplemental-Material.pdf
index b3f1bc4..6677c3c 100644
Binary files a/Manual/Ch6-Supplemental-Material.pdf and b/Manual/Ch6-Supplemental-Material.pdf differ
diff --git a/Projects/key_ch03_ex01_blinkled/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex01_blinkled/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex01_blinkled/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex01_blinkled/libs/index.html b/Projects/key_ch03_ex01_blinkled/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex01_blinkled/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex01_blinkled/makefile b/Projects/key_ch03_ex01_blinkled/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex01_blinkled/makefile
+++ b/Projects/key_ch03_ex01_blinkled/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex02_blinkled_print/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex02_blinkled_print/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex02_blinkled_print/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex02_blinkled_print/libs/index.html b/Projects/key_ch03_ex02_blinkled_print/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex02_blinkled_print/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex02_blinkled_print/makefile b/Projects/key_ch03_ex02_blinkled_print/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex02_blinkled_print/makefile
+++ b/Projects/key_ch03_ex02_blinkled_print/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex03_button/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex03_button/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex03_button/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex03_button/libs/index.html b/Projects/key_ch03_ex03_button/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex03_button/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex03_button/makefile b/Projects/key_ch03_ex03_button/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex03_button/makefile
+++ b/Projects/key_ch03_ex03_button/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex04_interrupt/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex04_interrupt/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex04_interrupt/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex04_interrupt/libs/index.html b/Projects/key_ch03_ex04_interrupt/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex04_interrupt/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex04_interrupt/makefile b/Projects/key_ch03_ex04_interrupt/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex04_interrupt/makefile
+++ b/Projects/key_ch03_ex04_interrupt/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex05_timer/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex05_timer/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex05_timer/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex05_timer/libs/index.html b/Projects/key_ch03_ex05_timer/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex05_timer/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex05_timer/makefile b/Projects/key_ch03_ex05_timer/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex05_timer/makefile
+++ b/Projects/key_ch03_ex05_timer/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex06_pwm/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex06_pwm/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex06_pwm/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex06_pwm/libs/index.html b/Projects/key_ch03_ex06_pwm/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex06_pwm/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex06_pwm/makefile b/Projects/key_ch03_ex06_pwm/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex06_pwm/makefile
+++ b/Projects/key_ch03_ex06_pwm/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex07_pwm_blink/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex07_pwm_blink/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex07_pwm_blink/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex07_pwm_blink/libs/index.html b/Projects/key_ch03_ex07_pwm_blink/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex07_pwm_blink/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex07_pwm_blink/makefile b/Projects/key_ch03_ex07_pwm_blink/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex07_pwm_blink/makefile
+++ b/Projects/key_ch03_ex07_pwm_blink/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex08_nvram/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex08_nvram/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex08_nvram/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex08_nvram/libs/index.html b/Projects/key_ch03_ex08_nvram/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex08_nvram/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex08_nvram/makefile b/Projects/key_ch03_ex08_nvram/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex08_nvram/makefile
+++ b/Projects/key_ch03_ex08_nvram/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex09_adc/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex09_adc/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex09_adc/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex09_adc/libs/index.html b/Projects/key_ch03_ex09_adc/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex09_adc/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex09_adc/makefile b/Projects/key_ch03_ex09_adc/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex09_adc/makefile
+++ b/Projects/key_ch03_ex09_adc/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex10_uartsend/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex10_uartsend/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex10_uartsend/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex10_uartsend/libs/index.html b/Projects/key_ch03_ex10_uartsend/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex10_uartsend/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex10_uartsend/makefile b/Projects/key_ch03_ex10_uartsend/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex10_uartsend/makefile
+++ b/Projects/key_ch03_ex10_uartsend/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex11_uartreceive/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex11_uartreceive/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex11_uartreceive/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex11_uartreceive/libs/index.html b/Projects/key_ch03_ex11_uartreceive/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex11_uartreceive/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex11_uartreceive/makefile b/Projects/key_ch03_ex11_uartreceive/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex11_uartreceive/makefile
+++ b/Projects/key_ch03_ex11_uartreceive/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch03_ex12_rtc/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch03_ex12_rtc/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch03_ex12_rtc/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch03_ex12_rtc/libs/index.html b/Projects/key_ch03_ex12_rtc/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch03_ex12_rtc/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch03_ex12_rtc/makefile b/Projects/key_ch03_ex12_rtc/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch03_ex12_rtc/makefile
+++ b/Projects/key_ch03_ex12_rtc/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch04_ex01_sempahore/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch04_ex01_sempahore/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch04_ex01_sempahore/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch04_ex01_sempahore/libs/index.html b/Projects/key_ch04_ex01_sempahore/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch04_ex01_sempahore/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch04_ex01_sempahore/makefile b/Projects/key_ch04_ex01_sempahore/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch04_ex01_sempahore/makefile
+++ b/Projects/key_ch04_ex01_sempahore/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch04_ex02_mutex/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch04_ex02_mutex/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch04_ex02_mutex/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch04_ex02_mutex/libs/index.html b/Projects/key_ch04_ex02_mutex/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch04_ex02_mutex/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch04_ex02_mutex/makefile b/Projects/key_ch04_ex02_mutex/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch04_ex02_mutex/makefile
+++ b/Projects/key_ch04_ex02_mutex/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch04_ex03_queue/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch04_ex03_queue/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch04_ex03_queue/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch04_ex03_queue/libs/index.html b/Projects/key_ch04_ex03_queue/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch04_ex03_queue/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch04_ex03_queue/makefile b/Projects/key_ch04_ex03_queue/makefile
index 0bb25f6..1e8e687 100644
--- a/Projects/key_ch04_ex03_queue/makefile
+++ b/Projects/key_ch04_ex03_queue/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Projects/key_ch05_ex01_debug/deps/btsdk-host-apps-bt-ble.mtb b/Projects/key_ch05_ex01_debug/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Projects/key_ch05_ex01_debug/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Projects/key_ch05_ex01_debug/libs/index.html b/Projects/key_ch05_ex01_debug/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Projects/key_ch05_ex01_debug/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Projects/key_ch05_ex01_debug/makefile b/Projects/key_ch05_ex01_debug/makefile
index 314a0be..025120a 100644
--- a/Projects/key_ch05_ex01_debug/makefile
+++ b/Projects/key_ch05_ex01_debug/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Templates/ch03/deps/btsdk-host-apps-bt-ble.mtb b/Templates/ch03/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Templates/ch03/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Templates/ch03/libs/index.html b/Templates/ch03/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Templates/ch03/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Templates/ch03_ex08_nvram/deps/btsdk-host-apps-bt-ble.mtb b/Templates/ch03_ex08_nvram/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Templates/ch03_ex08_nvram/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Templates/ch03_ex08_nvram/libs/index.html b/Templates/ch03_ex08_nvram/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Templates/ch03_ex08_nvram/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Templates/ch03_ex08_nvram/makefile b/Templates/ch03_ex08_nvram/makefile
index 0bb25f6..1e8e687 100644
--- a/Templates/ch03_ex08_nvram/makefile
+++ b/Templates/ch03_ex08_nvram/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Templates/ch03_ex12_rtc/deps/btsdk-host-apps-bt-ble.mtb b/Templates/ch03_ex12_rtc/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Templates/ch03_ex12_rtc/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Templates/ch03_ex12_rtc/libs/index.html b/Templates/ch03_ex12_rtc/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Templates/ch03_ex12_rtc/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Templates/ch03_ex12_rtc/makefile b/Templates/ch03_ex12_rtc/makefile
index 0bb25f6..1e8e687 100644
--- a/Templates/ch03_ex12_rtc/makefile
+++ b/Templates/ch03_ex12_rtc/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Templates/ch04/deps/btsdk-host-apps-bt-ble.mtb b/Templates/ch04/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Templates/ch04/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Templates/ch04/libs/index.html b/Templates/ch04/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Templates/ch04/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Templates/ch04_ex02_mutex/deps/btsdk-host-apps-bt-ble.mtb b/Templates/ch04_ex02_mutex/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Templates/ch04_ex02_mutex/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Templates/ch04_ex02_mutex/libs/index.html b/Templates/ch04_ex02_mutex/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Templates/ch04_ex02_mutex/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Templates/ch04_ex02_mutex/makefile b/Templates/ch04_ex02_mutex/makefile
index 0bb25f6..1e8e687 100644
--- a/Templates/ch04_ex02_mutex/makefile
+++ b/Templates/ch04_ex02_mutex/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \
diff --git a/Templates/ch05_ex01_debug/deps/btsdk-host-apps-bt-ble.mtb b/Templates/ch05_ex01_debug/deps/btsdk-host-apps-bt-ble.mtb
deleted file mode 100644
index fda1742..0000000
--- a/Templates/ch05_ex01_debug/deps/btsdk-host-apps-bt-ble.mtb
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/cypresssemiconductorco/btsdk-host-apps-bt-ble#latest-v2.X#$$ASSET_REPO$$/wiced_btsdk/tools/btsdk-host-apps-bt-ble/latest-v2.X
diff --git a/Templates/ch05_ex01_debug/libs/index.html b/Templates/ch05_ex01_debug/libs/index.html
new file mode 100644
index 0000000..3f69892
--- /dev/null
+++ b/Templates/ch05_ex01_debug/libs/index.html
@@ -0,0 +1,9 @@
+
+
+
+ AIROC™ Bluetooth® SDK Documentation
+
+
+ Redirect
+
+
diff --git a/Templates/ch05_ex01_debug/makefile b/Templates/ch05_ex01_debug/makefile
index 0bb25f6..1e8e687 100644
--- a/Templates/ch05_ex01_debug/makefile
+++ b/Templates/ch05_ex01_debug/makefile
@@ -49,6 +49,7 @@ TARGET=CYW920835M2EVB-01
SUPPORTED_TARGETS = \
CYW920820M2EVB-01 \
CYW920835M2EVB-01 \
+ CYBLE-343072-EVAL-M2B \
CYW920819EVB-02 \
CYW920820EVB-02 \
CYBT-213043-EVAL \