From b276e6edafc4f5dd947cdd5c44b3d980119ae8e5 Mon Sep 17 00:00:00 2001
From: paul-szczepanek-arm
 <33840200+paul-szczepanek-arm@users.noreply.github.com>
Date: Fri, 9 Nov 2018 14:53:13 +0000
Subject: [PATCH] fix high duty cycle setting (reversed)

---
 features/FEATURE_BLE/ble/pal/GapTypes.h            | 14 +++++++-------
 features/FEATURE_BLE/source/generic/GenericGap.cpp |  2 +-
 .../targets/TARGET_CORDIO/source/CordioPalGap.cpp  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/features/FEATURE_BLE/ble/pal/GapTypes.h b/features/FEATURE_BLE/ble/pal/GapTypes.h
index 966ccc99f9..4921d16a7b 100644
--- a/features/FEATURE_BLE/ble/pal/GapTypes.h
+++ b/features/FEATURE_BLE/ble/pal/GapTypes.h
@@ -560,7 +560,7 @@ struct advertising_event_properties_t {
         directed(false),
         high_duty_cycle(false),
         use_legacy_pdu(false),
-        omit_advertisser_address(false),
+        omit_advertiser_address(false),
         include_tx_power(false)
     { }
 
@@ -591,7 +591,7 @@ struct advertising_event_properties_t {
         directed(directed),
         high_duty_cycle(high_duty_cycle),
         use_legacy_pdu(use_legacy_pdu),
-        omit_advertisser_address(omit_advertisser_address),
+        omit_advertiser_address(omit_advertisser_address),
         include_tx_power(include_tx_power)
     { }
 
@@ -610,7 +610,7 @@ struct advertising_event_properties_t {
         directed(false),
         high_duty_cycle(false),
         use_legacy_pdu(true),
-        omit_advertisser_address(false),
+        omit_advertiser_address(false),
         include_tx_power(false)
     {
         switch ((advertising_type_t::type) adv_type.value()) {
@@ -621,11 +621,11 @@ struct advertising_event_properties_t {
             case advertising_type_t::ADV_DIRECT_IND:
                 connectable = true;
                 directed = true;
+                high_duty_cycle = true;
                 break;
             case advertising_type_t::ADV_DIRECT_IND_LOW_DUTY_CYCLE:
                 connectable = true;
                 directed = true;
-                high_duty_cycle = true;
                 use_legacy_pdu = true;
                 break;
             case advertising_type_t::ADV_SCAN_IND:
@@ -642,7 +642,7 @@ struct advertising_event_properties_t {
         directed(false),
         high_duty_cycle(false),
         use_legacy_pdu(true),
-        omit_advertisser_address(false),
+        omit_advertiser_address(false),
         include_tx_power(false)
     {
         switch (adv_type) {
@@ -696,7 +696,7 @@ struct advertising_event_properties_t {
     /**
      * If set omit the advertiser address in all PDUs.
      */
-    bool omit_advertisser_address :1;
+    bool omit_advertiser_address :1;
 
     /**
      * If set include the Tx power in the extended advertising header.
@@ -714,7 +714,7 @@ struct advertising_event_properties_t {
         result |= directed << 2;
         result |= high_duty_cycle << 3;
         result |= use_legacy_pdu << 4;
-        result |= omit_advertisser_address << 5;
+        result |= omit_advertiser_address << 5;
         result |= include_tx_power << 6;
         return result;
     }
diff --git a/features/FEATURE_BLE/source/generic/GenericGap.cpp b/features/FEATURE_BLE/source/generic/GenericGap.cpp
index d29620984b..7a677a49d3 100644
--- a/features/FEATURE_BLE/source/generic/GenericGap.cpp
+++ b/features/FEATURE_BLE/source/generic/GenericGap.cpp
@@ -1617,7 +1617,7 @@ ble_error_t GenericGap::setAdvertisingParams(AdvHandle_t handle, const GapAdvert
     pal::advertising_event_properties_t event_properties((pal::advertising_type_t::type)params->getType());
 
     event_properties.include_tx_power = params->getTxPowerInHeader();
-    event_properties.omit_advertisser_address = params->getAnonymousAdvertising();
+    event_properties.omit_advertiser_address = params->getAnonymousAdvertising();
     event_properties.use_legacy_pdu = params->getUseLegacyPDU();
 
     pal::advertising_channel_map_t channel_map(params->getChannel37(), params->getChannel38(), params->getChannel39());
diff --git a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalGap.cpp b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalGap.cpp
index 8df8dc7c66..782aa16b43 100644
--- a/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalGap.cpp
+++ b/features/FEATURE_BLE/targets/TARGET_CORDIO/source/CordioPalGap.cpp
@@ -655,7 +655,7 @@ ble_error_t Gap::set_extended_advertising_parameters(
     );
 
     DmAdvUseLegacyPdu(advertising_handle, event_properties.use_legacy_pdu);
-    DmAdvOmitAdvAddr(advertising_handle, event_properties.omit_advertisser_address);
+    DmAdvOmitAdvAddr(advertising_handle, event_properties.omit_advertiser_address);
 
     DmAdvConfig(
         advertising_handle,