-
Notifications
You must be signed in to change notification settings - Fork 510
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.
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
[rtl872x] Implement WiFi.selectAntenna #2651
Merged
Merged
Changes from 2 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -67,14 +67,14 @@ int selectAntenna(radio_antenna_type antenna) { | |
#if HAL_PLATFORM_RADIO_ANTENNA_INTERNAL | ||
case RADIO_ANT_INTERNAL: { | ||
CHECK(selectInternalAntenna()); | ||
LOG(TRACE, "Using internal BLE antenna"); | ||
LOG(TRACE, "Using internal antenna"); | ||
break; | ||
} | ||
#endif | ||
#if HAL_PLATFORM_RADIO_ANTENNA_EXTERNAL | ||
case RADIO_ANT_EXTERNAL: { | ||
CHECK(selectExtenalAntenna()); | ||
LOG(TRACE, "Using external BLE antenna"); | ||
LOG(TRACE, "Using external antenna"); | ||
break; | ||
} | ||
#endif | ||
|
@@ -122,4 +122,18 @@ int selectRadioAntenna(radio_antenna_type antenna) { | |
return SYSTEM_ERROR_NONE; | ||
} | ||
|
||
int getRadioAntenna(radio_antenna_type * antenna) { | ||
if (!antenna) { | ||
return SYSTEM_ERROR_INVALID_ARGUMENT; | ||
} | ||
uint8_t dctAntenna = 0xff; | ||
CHECK(dct_read_app_data_copy(DCT_RADIO_ANTENNA_OFFSET, &dctAntenna, sizeof(dctAntenna))); | ||
if ((radio_antenna_type)dctAntenna <= RADIO_ANT_EXTERNAL) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should we validate the DCT data or just return it if its present? |
||
*antenna = (radio_antenna_type)dctAntenna; | ||
return 0; | ||
} | ||
|
||
return SYSTEM_ERROR_INTERNAL; | ||
} | ||
|
||
} // namespace particle |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -50,4 +50,12 @@ int enableRadioAntenna(); | |
*/ | ||
int selectRadioAntenna(radio_antenna_type antenna); | ||
|
||
/** | ||
* Return the currently configured antenna type from DCT. | ||
* | ||
* @param antenna Currently configured Antenna type. | ||
* @return 0 on success or a negative result code in case of an error. | ||
*/ | ||
int getRadioAntenna(radio_antenna_type * antenna); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit/style: |
||
|
||
} // particle |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd do exactly the same thing as currently done in
initRadioAntenna()
and return default normally unless dct read value is exactly INTERNAL or EXTERNAL and replace that block with getRadioAntenna() so that we don't have duplicate logic.