Skip to content

Feature emac merge test #6635

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

Closed
wants to merge 1,243 commits into from

Conversation

kjbracey
Copy link
Contributor

@kjbracey kjbracey commented Apr 13, 2018

Description

This is a dummy test merge - operation was actually performed as a rebase, and will be pushed as such. This contains the same final tree contents as my current proposed rebase, and hopefully gitk will show a semi-legible diff for the bits touched in the merge commit.

Actual rebased feature-emac is at https://github.com/kjbracey-arm/mbed-os/commits/feature-emac - when this passes CI, I will force push that to feature-emac.

Pull request type

[ ] Fix
[X] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

cmonr and others added 30 commits March 20, 2018 14:06
STM32 LPTICKER : optimize RTC wake up timer init
dir seek fixed - dptr was not updated before checking
littlefs: Fix issue updating dir struct when extended dir chain
- Only internal changes, no functionality changes
- Some minor improvements to LoRaWanStack
… instead of a boolean

Removed the while loop checking the return value from set_next_channel
(GitHub Issue Lora-net/LoRaMac-node#357)

The new return values are:

LORAWAN_STATUS_OK                    : A channel has been found.
LORAWAN_STATUS_NO_FREE_CHANNEL_FOUND : No free channel has been found (AS923 and KR920 regions)
LORAWAN_STATUS_DUTYCYCLE_RESTRICTED  : No channel found due to the duty-cycle or JoinReq back-off restrictions. Trial must be delayed.
LORAWAN_STATUS_NO_CHANNEL_FOUND      : No channel has been found. Re-enabled the default channels.
This issue is only present for a device in class c mode, which
has perform unconfirmed uplinks.

Lora-net/LoRaMac-node#327
Store the rx slot temporarily. When in class C, this variable will be changed
in function OpenContinuousRx2Window.
1. Do not stop the 2nd window timer, as it is not running.
2. Wait for the OnAckTimeout event, before setting MacDone
3. Process for class c also the 2nd window timeout part, as we do
   not have a 2nd window timer.
This is especially important for class c devices.
In the DevStatusAns format, the protocol requires RFU(7:6) value = 0
This API can be used to runtime change device class.

Please note that only class A and C are supported at the moment.
Trying to set class B will return LORAWAN_STATUS_UNSUPPORTED.

Fix set_device_class documentation

fix documentation
- Do not put radio into sleep when message is received in class c mode
- Experimental feature for acknowledging confirmed downlink messages
Since our timers are now already using events, we no longer need to
defer timer callback calls.
- This is internal change, no functionality has been changed
- LoRaWanInterface cleaned up and code moved to LoRaMacStack
- Compliance code in LoRaMacStack moved to EOF
- Green tea tests have been run manually
- Doxygen updated accordingly

LoRA: reorder class members
Cruz Monrreal and others added 5 commits April 12, 2018 18:38
CM3DS Maintenance Pull Request: TRNG support (3/4)
PR template: fix tick definition
This is a dummy test merge - operation was actually performed as a
rebase, and will be pushed as such. This contains the same final
tree contents as my current proposed rebase, and hopefully gitk
will show a semi-legible diff for the bits touched in the merge
commit.
@kjbracey
Copy link
Contributor Author

/morph build

@mbed-ci
Copy link

mbed-ci commented Apr 13, 2018

Build : SUCCESS

Build number : 1746
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6635/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Apr 14, 2018

@mbed-ci
Copy link

mbed-ci commented Apr 14, 2018

@kjbracey
Copy link
Contributor Author

/morph build

@mbed-ci
Copy link

mbed-ci commented Apr 16, 2018

Build : SUCCESS

Build number : 1753
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6635/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mikaleppanen
Copy link

I'll add review comments here rather than trying to find the correct files.

One finding:

"EMACInterface.cpp": missing "_mac_address" initialization here:

/* Interface implementation */
EMACInterface::EMACInterface(EMAC &emac, OnboardNetworkStack &stack) :
_emac(emac),
_stack(stack),
_interface(NULL),
_dhcp(true),
_ip_address(),
_netmask(),
_gateway()
{
}

@kjbracey
Copy link
Contributor Author

Hmm, don't think _mac_address needs initialisation - it's just an output buffer for the get_mac_address method.

Although checking that highlights that _netmask, _ip_address and _gateway are doing dual duty as output buffers for the get calls and storage buffers for set_network->connect. I guess that's always been the case, but a little weird.

@mbed-ci
Copy link

mbed-ci commented Apr 16, 2018

@mbed-ci
Copy link

mbed-ci commented Apr 16, 2018

@kjbracey
Copy link
Contributor Author

/morph export-build

@mbed-ci
Copy link

mbed-ci commented Apr 17, 2018

@kjbracey
Copy link
Contributor Author

kjbracey commented Apr 18, 2018

Okay, I'm pushing this tree to feature-emac as a rebase.

That rebase also squashes together a couple of minor fixups, reducing the branch length from 40 to 31 commits.

Original branch: 646efbd
Rebased partially-squashed branch: 597d3cb

@kjbracey kjbracey closed this Apr 18, 2018
@sg- sg- removed the do not merge label Apr 18, 2018
@kjbracey
Copy link
Contributor Author

Unpleasant GitHub feature - having closed without asking GitHub to do the merge, the test results appear to have vanished.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.