Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[mbed-os-5.15] ODIN-W2 release v3.7.2 and bug fixes. #13450

Merged
merged 4 commits into from
Sep 2, 2020
Merged

[mbed-os-5.15] ODIN-W2 release v3.7.2 and bug fixes. #13450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e2167e8
updating wlan parameter configuration under appropriate settings
qasim-ublox Apr 21, 2020
545dcbb
Merge pull request #1 from aqib-ublox/bt_configAPI_fix
aqib-ublox May 5, 2020
be50fcd
Merge pull request #43 from aqib-ublox/ublox_odin_driver_os_5_v3.8.0_rc1
aqib-ublox Jul 6, 2020
876c3e8
ODIN drivers updated to v3.7.2
qasim-ublox Aug 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified ...RGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/TOOLCHAIN_ARM/libublox-odin-w2-driver.ar
View file
Open in desktop
Binary file not shown.
Binary file modified ...T_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/TOOLCHAIN_GCC_ARM/libublox-odin-w2-driver.a
View file
Open in desktop
Binary file not shown.
Binary file modified ...ARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/TOOLCHAIN_IAR/libublox-odin-w2-driver.a
View file
Open in desktop
Binary file not shown.
135 changes: 68 additions & 67 deletions ...T_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/ublox-odin-w2-drivers/OdinWiFiInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ static void set_wpa_rsn_cipher(
cbWLAN_CipherSuite &rsn_ciphers);

static bool is_valid_AP_channel(cbWLAN_Channel channel);
static cbTARGET_ConfigParams map_odin_config(target_config_params_e parameter);
static unsigned int map_odin_config(target_config_params_e parameter);
static cbTARGET_PowerSaveMode convertPowerSaveAtToIoctl(target_power_save_mode_e powerSaveMode);

// Friend declared C-functions that calls corresponding wi-fi object member function
Expand Down Expand Up @@ -529,7 +529,7 @@ int OdinWiFiInterface::scan(WiFiAccessPoint *res_list, unsigned count)
void OdinWiFiInterface::set_config(void *setting, cb_uint32 value) {
cbTARGET_ConfigParams param;
target_config_params_e configuration = *(target_config_params_e*)setting;
param = map_odin_config(configuration);
param = (cbTARGET_ConfigParams)map_odin_config(configuration);
wlan_set_gParams(param, value);
}

Expand All @@ -542,7 +542,7 @@ void OdinWiFiInterface::wlan_set_gParams(cbTARGET_ConfigParams setting, cb_uint3
unsigned int OdinWiFiInterface::get_config(void *setting) {
cbTARGET_ConfigParams param;
target_config_params_e configuration = *(target_config_params_e*)setting;
param = map_odin_config(configuration);
param = (cbTARGET_ConfigParams)map_odin_config(configuration);
return wlan_get_gParams(param);
}

Expand Down Expand Up @@ -2027,73 +2027,74 @@ static bool is_valid_AP_channel(cbWLAN_Channel channel)
return ok;
}

static cbTARGET_ConfigParams map_odin_config(target_config_params_e parameter)
static unsigned int map_odin_config(target_config_params_e parameter)
{
cbTARGET_ConfigParams config;
unsigned int config;

switch (parameter) {
case ODIN_CFG_SET_POWER_SAVE_MODE: config = cbTARGET_CFG_SET_POWER_SAVE_MODE;
case ODIN_CFG_GET_POWER_SAVE_MODE: config = cbTARGET_CFG_GET_POWER_SAVE_MODE;
case ODIN_CFG_SET_LISTEN_INTERVAL: config = cbTARGET_CFG_SET_LISTEN_INTERVAL;
case ODIN_CFG_GET_LISTEN_INTERVAL: config = cbTARGET_CFG_GET_LISTEN_INTERVAL;
case ODIN_CFG_SET_MIN_SCAN_TIME: config = cbTARGET_CFG_SET_MIN_SCAN_TIME;
case ODIN_CFG_GET_MIN_SCAN_TIME: config = cbTARGET_CFG_GET_MIN_SCAN_TIME;
case ODIN_CFG_SET_MAX_SCAN_TIME: config = cbTARGET_CFG_SET_MAX_SCAN_TIME;
case ODIN_CFG_GET_MAX_SCAN_TIME: config = cbTARGET_CFG_GET_MAX_SCAN_TIME;
case ODIN_CFG_SET_SCAN_TYPE: config = cbTARGET_CFG_SET_SCAN_TYPE;
case ODIN_CFG_GET_SCAN_TYPE: config = cbTARGET_CFG_GET_SCAN_TYPE;
case ODIN_CFG_SET_DTIM_ENABLE: config = cbTARGET_CFG_SET_DTIM_ENABLE;
case ODIN_CFG_GET_DTIM_ENABLE: config = cbTARGET_CFG_GET_DTIM_ENABLE;
case ODIN_CFG_SET_QOS_ENABLE: config = cbTARGET_CFG_SET_QOS_ENABLE;
case ODIN_CFG_GET_QOS_ENABLE: config = cbTARGET_CFG_GET_QOS_ENABLE;
case ODIN_CFG_SET_RTS_THRESHOLD: config = cbTARGET_CFG_SET_RTS_THRESHOLD;
case ODIN_CFG_GET_RTS_THRESHOLD: config = cbTARGET_CFG_GET_RTS_THRESHOLD;
case ODIN_CFG_SET_TX_POWER: config = cbTARGET_CFG_SET_TX_POWER;
case ODIN_CFG_GET_TX_POWER: config = cbTARGET_CFG_GET_TX_POWER;
case ODIN_CFG_SET_MAX_PASSIVE_SCAN_TIME: config = cbTARGET_CFG_SET_MAX_PASSIVE_SCAN_TIME;
case ODIN_CFG_GET_MAX_PASSIVE_SCAN_TIME: config = cbTARGET_CFG_GET_MAX_PASSIVE_SCAN_TIME;
case ODIN_CFG_SET_SCAN_LISTEN_INTERVAL: config = cbTARGET_CFG_SET_SCAN_LISTEN_INTERVAL;
case ODIN_CFG_GET_SCAN_LISTEN_INTERVAL: config = cbTARGET_CFG_GET_SCAN_LISTEN_INTERVAL;
case ODIN_CFG_SET_DOT11_SHORT_RETRY_LIMIT: config = cbTARGET_CFG_SET_DOT11_SHORT_RETRY_LIMIT;
case ODIN_CFG_GET_DOT11_SHORT_RETRY_LIMIT: config = cbTARGET_CFG_GET_DOT11_SHORT_RETRY_LIMIT;
case ODIN_CFG_SET_DOT11_LONG_RETRY_LIMIT: config = cbTARGET_CFG_SET_DOT11_LONG_RETRY_LIMIT;
case ODIN_CFG_GET_DOT11_LONG_RETRY_LIMIT: config = cbTARGET_CFG_GET_DOT11_LONG_RETRY_LIMIT;
case ODIN_CFG_SET_AP_DOT11_SHORT_RETRY_LIMIT: config = cbTARGET_CFG_SET_AP_DOT11_SHORT_RETRY_LIMIT;
case ODIN_CFG_GET_AP_DOT11_SHORT_RETRY_LIMIT: config = cbTARGET_CFG_GET_AP_DOT11_SHORT_RETRY_LIMIT;
case ODIN_CFG_SET_AP_DOT11_LONG_RETRY_LIMIT: config = cbTARGET_CFG_SET_AP_DOT11_LONG_RETRY_LIMIT;
case ODIN_CFG_GET_AP_DOT11_LONG_RETRY_LIMIT: config = cbTARGET_CFG_GET_AP_DOT11_LONG_RETRY_LIMIT;
case ODIN_CFG_SET_REMAIN_ON_CHANNEL: config = cbTARGET_CFG_SET_REMAIN_ON_CHANNEL;
case ODIN_CFG_GET_REMAIN_ON_CHANNEL: config = cbTARGET_CFG_GET_REMAIN_ON_CHANNEL;
case ODIN_CFG_SET_STA_TX_RATE_MASK: config = cbTARGET_CFG_SET_STA_TX_RATE_MASK;
case ODIN_CFG_GET_STA_TX_RATE_MASK: config = cbTARGET_CFG_GET_STA_TX_RATE_MASK;
case ODIN_CFG_SET_RSSI_GOOD: config = cbTARGET_CFG_SET_RSSI_GOOD;
case ODIN_CFG_GET_RSSI_GOOD: config = cbTARGET_CFG_GET_RSSI_GOOD;
case ODIN_CFG_SET_RSSI_BAD: config = cbTARGET_CFG_SET_RSSI_BAD;
case ODIN_CFG_GET_RSSI_BAD: config = cbTARGET_CFG_GET_RSSI_BAD;
case ODIN_CFG_SET_SLEEP_TIMEOUT: config = cbTARGET_CFG_SET_SLEEP_TIMEOUT;
case ODIN_CFG_GET_SLEEP_TIMEOUT: config = cbTARGET_CFG_GET_SLEEP_TIMEOUT;
case ODIN_CFG_SET_GOOD_RSSI_YIELD_TMO: config = cbTARGET_CFG_SET_GOOD_RSSI_YIELD_TMO;
case ODIN_CFG_GET_GOOD_RSSI_YIELD_TMO: config = cbTARGET_CFG_GET_GOOD_RSSI_YIELD_TMO;
case ODIN_CFG_SET_BAD_RSSI_YIELD_TMO: config = cbTARGET_CFG_SET_BAD_RSSI_YIELD_TMO;
case ODIN_CFG_GET_BAD_RSSI_YIELD_TMO: config = cbTARGET_CFG_GET_BAD_RSSI_YIELD_TMO;
case ODIN_CFG_SET_FORCE_WORLD_MODE: config = cbTARGET_CFG_SET_FORCE_WORLD_MODE;
case ODIN_CFG_GET_FORCE_WORLD_MODE: config = cbTARGET_CFG_GET_FORCE_WORLD_MODE;
case ODIN_CFG_GET_TX_PACKET_ACK_TIMEOUT_WD: config = cbTARGET_CFG_SET_TX_PACKET_ACK_TIMEOUT_WD;
case ODIN_CFG_SET_TX_PACKET_ACK_TIMEOUT_WD: config = cbTARGET_CFG_GET_TX_PACKET_ACK_TIMEOUT_WD;
case ODIN_CFG_SET_CTS_PROTECTION: config = cbTARGET_CFG_SET_CTS_PROTECTION;
case ODIN_CFG_GET_CTS_PROTECTION: config = cbTARGET_CFG_GET_CTS_PROTECTION;
case ODIN_CFG_SET_HIDDEN_SSID: config = cbTARGET_CFG_SET_HIDDEN_SSID;
case ODIN_CFG_GET_HIDDEN_SSID: config = cbTARGET_CFG_GET_HIDDEN_SSID;
case ODIN_CFG_SET_AP_STA_INACTIVITY_TIMEOUT: config = cbTARGET_CFG_SET_AP_STA_INACTIVITY_TIMEOUT;
case ODIN_CFG_GET_AP_STA_INACTIVITY_TIMEOUT: config = cbTARGET_CFG_GET_AP_STA_INACTIVITY_TIMEOUT;
case ODIN_CFG_SET_ROAMING_AREA_HYSTERESIS: config = cbTARGET_CFG_SET_ROAMING_AREA_HYSTERESIS;
case ODIN_CFG_GET_ROAMING_AREA_HYSTERESIS: config = cbTARGET_CFG_GET_ROAMING_AREA_HYSTERESIS;
case ODIN_CFG_SET_PMF_STA: config = cbTARGET_CFG_SET_PMF_STA;
case ODIN_CFG_GET_PMF_STA: config = cbTARGET_CFG_GET_PMF_STA;
case ODIN_CFG_SET_FT_MODE: config = cbTARGET_CFG_SET_FT_MODE;
case ODIN_CFG_GET_FT_MODE: config = cbTARGET_CFG_GET_FT_MODE;
default:
MBED_ASSERT(false);
case ODIN_CFG_SET_POWER_SAVE_MODE: config = cbTARGET_CFG_SET_POWER_SAVE_MODE;break;
case ODIN_CFG_GET_POWER_SAVE_MODE: config = cbTARGET_CFG_GET_POWER_SAVE_MODE; break;
case ODIN_CFG_SET_LISTEN_INTERVAL: config = cbTARGET_CFG_SET_LISTEN_INTERVAL; break;
case ODIN_CFG_GET_LISTEN_INTERVAL: config = cbTARGET_CFG_GET_LISTEN_INTERVAL; break;
case ODIN_CFG_SET_MIN_SCAN_TIME: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_MIN_SCAN_TIME; break;
case ODIN_CFG_GET_MIN_SCAN_TIME: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_MIN_SCAN_TIME; break;
case ODIN_CFG_SET_MAX_SCAN_TIME: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_MAX_SCAN_TIME; break;
case ODIN_CFG_GET_MAX_SCAN_TIME: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_MAX_SCAN_TIME; break;
case ODIN_CFG_SET_SCAN_TYPE: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_SCAN_TYPE; break;
case ODIN_CFG_GET_SCAN_TYPE: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_SCAN_TYPE; break;
case ODIN_CFG_SET_DTIM_ENABLE: config = cbTARGET_CFG_SET_DTIM_ENABLE; break;
case ODIN_CFG_GET_DTIM_ENABLE: config = cbTARGET_CFG_GET_DTIM_ENABLE; break;
case ODIN_CFG_SET_QOS_ENABLE: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_QOS_ENABLE; break;
case ODIN_CFG_GET_QOS_ENABLE: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_QOS_ENABLE; break;
case ODIN_CFG_SET_RTS_THRESHOLD: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_RTS_THRESHOLD; break;
case ODIN_CFG_GET_RTS_THRESHOLD: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_RTS_THRESHOLD; break;
case ODIN_CFG_SET_TX_POWER: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_TX_POWER; break;
case ODIN_CFG_GET_TX_POWER: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_TX_POWER; break;
case ODIN_CFG_SET_MAX_PASSIVE_SCAN_TIME: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_MAX_PASSIVE_SCAN_TIME; break;
case ODIN_CFG_GET_MAX_PASSIVE_SCAN_TIME: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_MAX_PASSIVE_SCAN_TIME; break;
case ODIN_CFG_SET_SCAN_LISTEN_INTERVAL: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_SCAN_LISTEN_INTERVAL; break;
case ODIN_CFG_GET_SCAN_LISTEN_INTERVAL: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_SCAN_LISTEN_INTERVAL; break;
case ODIN_CFG_SET_DOT11_SHORT_RETRY_LIMIT: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_DOT11_SHORT_RETRY_LIMIT; break;
case ODIN_CFG_GET_DOT11_SHORT_RETRY_LIMIT: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_DOT11_SHORT_RETRY_LIMIT; break;
case ODIN_CFG_SET_DOT11_LONG_RETRY_LIMIT: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_DOT11_LONG_RETRY_LIMIT; break;
case ODIN_CFG_GET_DOT11_LONG_RETRY_LIMIT: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_DOT11_LONG_RETRY_LIMIT; break;
case ODIN_CFG_SET_AP_DOT11_SHORT_RETRY_LIMIT: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_AP_DOT11_SHORT_RETRY_LIMIT; break;
case ODIN_CFG_GET_AP_DOT11_SHORT_RETRY_LIMIT: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_AP_DOT11_SHORT_RETRY_LIMIT; break;
case ODIN_CFG_SET_AP_DOT11_LONG_RETRY_LIMIT: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_AP_DOT11_LONG_RETRY_LIMIT; break;
case ODIN_CFG_GET_AP_DOT11_LONG_RETRY_LIMIT: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_AP_DOT11_LONG_RETRY_LIMIT; break;
case ODIN_CFG_SET_REMAIN_ON_CHANNEL: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_REMAIN_ON_CHANNEL; break;
case ODIN_CFG_GET_REMAIN_ON_CHANNEL: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_REMAIN_ON_CHANNEL; break;
case ODIN_CFG_SET_STA_TX_RATE_MASK: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_STA_TX_RATE_MASK; break;
case ODIN_CFG_GET_STA_TX_RATE_MASK: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_STA_TX_RATE_MASK; break;
case ODIN_CFG_SET_RSSI_GOOD: config = cbTARGET_CFG_SET_RSSI_GOOD; break;
case ODIN_CFG_GET_RSSI_GOOD: config = cbTARGET_CFG_GET_RSSI_GOOD; break;
case ODIN_CFG_SET_RSSI_BAD: config = cbTARGET_CFG_SET_RSSI_BAD; break;
case ODIN_CFG_GET_RSSI_BAD: config = cbTARGET_CFG_GET_RSSI_BAD; break;
case ODIN_CFG_SET_SLEEP_TIMEOUT: config = cbTARGET_CFG_SET_SLEEP_TIMEOUT; break;
case ODIN_CFG_GET_SLEEP_TIMEOUT: config = cbTARGET_CFG_GET_SLEEP_TIMEOUT; break;
case ODIN_CFG_SET_GOOD_RSSI_YIELD_TMO: config = cbTARGET_CFG_SET_GOOD_RSSI_YIELD_TMO; break;
case ODIN_CFG_GET_GOOD_RSSI_YIELD_TMO: config = cbTARGET_CFG_GET_GOOD_RSSI_YIELD_TMO; break;
case ODIN_CFG_SET_BAD_RSSI_YIELD_TMO: config = cbTARGET_CFG_SET_BAD_RSSI_YIELD_TMO; break;
case ODIN_CFG_GET_BAD_RSSI_YIELD_TMO: config = cbTARGET_CFG_GET_BAD_RSSI_YIELD_TMO; break;
case ODIN_CFG_SET_FORCE_WORLD_MODE: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_FORCE_WORLD_MODE; break;
case ODIN_CFG_GET_FORCE_WORLD_MODE: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_FORCE_WORLD_MODE; break;
case ODIN_CFG_GET_TX_PACKET_ACK_TIMEOUT_WD: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_TX_PACKET_ACK_TIMEOUT_WD; break;;
case ODIN_CFG_SET_TX_PACKET_ACK_TIMEOUT_WD: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_TX_PACKET_ACK_TIMEOUT_WD; break;
case ODIN_CFG_SET_CTS_PROTECTION: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_CTS_PROTECTION; break;
case ODIN_CFG_GET_CTS_PROTECTION: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_CTS_PROTECTION; break;
case ODIN_CFG_SET_HIDDEN_SSID: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_HIDDEN_SSID; break;
case ODIN_CFG_GET_HIDDEN_SSID: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_HIDDEN_SSID; break;
case ODIN_CFG_SET_AP_STA_INACTIVITY_TIMEOUT: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_AP_STA_INACTIVITY_TIMEOUT; break;
case ODIN_CFG_GET_AP_STA_INACTIVITY_TIMEOUT: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_AP_STA_INACTIVITY_TIMEOUT; break;
case ODIN_CFG_SET_ROAMING_AREA_HYSTERESIS: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_ROAMING_AREA_HYSTERESIS; break;
case ODIN_CFG_GET_ROAMING_AREA_HYSTERESIS: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_ROAMING_AREA_HYSTERESIS; break;
case ODIN_CFG_SET_PMF_STA: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_PMF_STA; break;
case ODIN_CFG_GET_PMF_STA: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_PMF_STA; break;
case ODIN_CFG_SET_FT_MODE: config = cbTARGET_CFG_SET_GSETTING + cbTARGET_GSETTING_FT_MODE; break;
case ODIN_CFG_GET_FT_MODE: config = cbTARGET_CFG_GET_GSETTING + cbTARGET_GSETTING_FT_MODE; break;
default:
MBED_ASSERT(false);
break;
}
return config;
}
Expand Down
Loading