DBTEnv/direct_bt.debug: Aligning DBTManager alias to 'mgmt': 'direct_bt.debug.manager.event' -> 'direct_bt.debug.mgmt.event'

6 files changed, 8 insertions, 17 deletions

diff --git a/api/direct_bt/DBTEnv.hpp b/api/direct_bt/DBTEnv.hpp
index c2542169..f2fe52e0 100644
--- a/api/direct_bt/DBTEnv.hpp
+++ b/api/direct_bt/DBTEnv.hpp
@@ -141,11 +141,11 @@ namespace direct_bt {
              * Example 1
              * <pre>
              * Input Environment:
-             *   "direct_bt.debug" := "hci.event,manager.event=true,gatt.data=false"
+             *   "direct_bt.debug" := "hci.event,mgmt.event=true,gatt.data=false"
              *
              * Result Environment:
              *   "direct_bt.debug.hci.event"     := "true"
-             *   "direct_bt.debug.manager.event" := "true"
+             *   "direct_bt.debug.mgmt.event"    := "true"
              *   "direct_bt.debug.gatt.data"     := "false"
              *   "direct_bt.debug"               := "true" (will be overwritten)
              * </pre>
diff --git a/api/direct_bt/DBTManager.hpp b/api/direct_bt/DBTManager.hpp
index d2a3af3b..d7a7267b 100644
--- a/api/direct_bt/DBTManager.hpp
+++ b/api/direct_bt/DBTManager.hpp
@@ -95,7 +95,7 @@ namespace direct_bt {
             /**
              * Debug all Mgmt event communication
              * <p>
-             * Environment variable is 'direct_bt.debug.manager.event'.
+             * Environment variable is 'direct_bt.debug.mgmt.event'.
              * </p>
              */
             const bool DEBUG_EVENT;
@@ -127,10 +127,7 @@ namespace direct_bt {
      * Implementation utilizes a lock free ringbuffer receiving data within its separate thread.
      * </p>
      * <p>
-     * Controlling Environment variables:
-     * <pre>
-     * - 'direct_bt.debug.manager.event': Debug messages about events, see debug_event
-     * </pre>
+     * Controlling Environment variables, see {@link MgmtEnv}.
      * </p>
      */
     class DBTManager : public JavaUplink {
diff --git a/api/direct_bt/GATTHandler.hpp b/api/direct_bt/GATTHandler.hpp
index baa1f545..170819a9 100644
--- a/api/direct_bt/GATTHandler.hpp
+++ b/api/direct_bt/GATTHandler.hpp
@@ -141,10 +141,7 @@ namespace direct_bt {
      * Implementation utilizes a lock free ringbuffer receiving data within its separate thread.
      * </p>
      * <p>
-     * Controlling Environment variables:
-     * <pre>
-     * - 'direct_bt.debug.gatt.data': Debug messages about detailed GATT data, see debug_data
-     * </pre>
+     * Controlling Environment variables, see {@link GATTEnv}.
      * </p>
      */
     class GATTHandler {
diff --git a/api/direct_bt/HCIHandler.hpp b/api/direct_bt/HCIHandler.hpp
index 5aee317c..bbf91647 100644
--- a/api/direct_bt/HCIHandler.hpp
+++ b/api/direct_bt/HCIHandler.hpp
@@ -176,10 +176,7 @@ namespace direct_bt {
      * Implementation utilizes a lock free ringbuffer receiving data within its separate thread.
      * </p>
      * <p>
-     * Controlling Environment variables:
-     * <pre>
-     * - 'direct_bt.debug.hci.event': Debug messages about events, see debug_event
-     * </pre>
+     * Controlling Environment variables, see {@link HCIEnv}.
      * </p>
      */
     class HCIHandler {
diff --git a/examples/java/ScannerTinyB10.java b/examples/java/ScannerTinyB10.java
index dcf1d77a..50570456 100644
--- a/examples/java/ScannerTinyB10.java
+++ b/examples/java/ScannerTinyB10.java
@@ -551,7 +551,7 @@ public class ScannerTinyB10 {
                     "[-bluetoothManager <BluetoothManager-Implementation-Class-Name>] "+
                     "[-verbose] [-debug] "+
                     "[-dbt_verbose [true|false]] "+
-                    "[-dbt_debug [true|false|hci.event,manager.event,adapter.event,gatt.data]] "+
+                    "[-dbt_debug [true|false|hci.event,mgmt.event,adapter.event,gatt.data]] "+
                     "[-dbt_mgmt cmd.timeout=3000,ringsize=64,... "+
                     "[-dbt_hci cmd.complete.timeout=10000,cmd.status.timeout=3000,ringsize=64,... "+
                     "[-dbt_gatt cmd.read.timeout=500,cmd.write.timeout=500,cmd.init.timeout=2500,ringsize=128,... "+
diff --git a/src/direct_bt/DBTManager.cpp b/src/direct_bt/DBTManager.cpp
index 91aab36d..a77b93c7 100644
--- a/src/direct_bt/DBTManager.cpp
+++ b/src/direct_bt/DBTManager.cpp
@@ -57,7 +57,7 @@ MgmtEnv::MgmtEnv()
   MGMT_READER_THREAD_POLL_TIMEOUT( DBTEnv::getInt32Property("direct_bt.mgmt.reader.timeout", 10000, 1500 /* min */, INT32_MAX /* max */) ),
   MGMT_COMMAND_REPLY_TIMEOUT( DBTEnv::getInt32Property("direct_bt.mgmt.cmd.timeout", 3000, 1500 /* min */, INT32_MAX /* max */) ),
   MGMT_EVT_RING_CAPACITY( DBTEnv::getInt32Property("direct_bt.mgmt.ringsize", 64, 64 /* min */, 1024 /* max */) ),
-  DEBUG_EVENT( DBTEnv::getBooleanProperty("direct_bt.debug.manager.event", false) ),
+  DEBUG_EVENT( DBTEnv::getBooleanProperty("direct_bt.debug.mgmt.event", false) ),
   MGMT_READ_PACKET_MAX_RETRY( MGMT_EVT_RING_CAPACITY )
 {
 }