-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Restructure directory layout to better match emerging structure #2266
Conversation
@mbed-bot: TEST HOST_OSES=windows |
/morph test |
LGTM, ready to be merged as far as I'm concerned once the tests pass. A few things to keep in mind:
|
[Build 726] |
Result: FAILUREYour command has finished executing! Here's what you wrote!
Outputmbed Build Number: 543 Build failed! |
Result: FAILUREYour command has finished executing! Here's what you wrote!
Outputmbed Build Number: 542 Test failed! |
13k files changed :-) fingers crossed +1 |
@kjbracey-arm @SeppoTakalo @yogpan01 , please review this PR. There's a comment above from @bogdanm:
This might affect your code. Please have a look. Is there any example you know of that might need an update or a module? |
Looks like the this broke the build for most targets. This error seems to be the most common when building
|
But also forgot to say I like the new layout! :) |
/morph test |
LGTM 👍 |
@mbed-bot: TEST HOST_OSES=windows |
[Build 727] |
Result: FAILUREYour command has finished executing! Here's what you wrote!
Outputmbed Build Number: 544 Test failed! |
I'm still investigating an issue where the test results for the K64F aren't being uploaded correctly, but I can see in Jenkins that all tests for all toolchains for the K64F are passing! |
@geky rebase?? |
@c1728p9, did you mean to add the .mbed file in ecb34ab? This is a generated user file that will cause issues with users update the mbed repo. I'm going to go ahead and remove it, let me know if it was necessary for some reason. |
Nope, that slipped in on accident and should be removed. |
@mbed-bot: TEST HOST_OSES=windows |
[Build 729] |
This new structure looks ok, but I would postpone this until release. |
I'm not able to export a project. I have no error but the targets files are not in the project.
it gave me this:
|
@geky we'll need to update the CI and probably mbed CLI in response to the move of the requirements.txt. Just FYI |
@bridadan mbed CLI now installs requirements so this can be skipped in CI. mbed CLI is also aware of both locations where requirements can be found. |
hal/targets -> targets hal/hal -> targets/hal hal/targets.json -> targets/targets.json
CThunk -> platform/CThunk CallChain -> platform/CallChain Callback -> platform/Callback FunctionPointer -> platform/FunctionPointer SingletonPtr -> platform/SingletonPtr critical -> platform/critical mbed_assert -> platform/mbed_assert mbed_debug -> platform/mbed_debug mbed_error -> platform/mbed_error platform -> platform/platform retargetpp -> platform/retargetpp toolchain -> platform/toolchain mbed_interface -> drivers/mbed_interface semihost_api -> drivers/semihost_api AnalogIn -> drivers/AnalogIn AnalogOut -> drivers/AnalogOut BusIn -> drivers/BusIn BusInOut -> drivers/BusInOut BusOut -> drivers/BusOut CAN -> drivers/CAN CircularBuffer -> drivers/CircularBuffer DigitalIn -> drivers/DigitalIn DigitalInOut -> drivers/DigitalInOut DigitalOut -> drivers/DigitalOut DirHandle -> drivers/DirHandle Ethernet -> drivers/Ethernet FileBase -> drivers/FileBase FileHandle -> drivers/FileHandle FileLike -> drivers/FileLike FilePath -> drivers/FilePath FileSystemLike -> drivers/FileSystemLike I2C -> drivers/I2C I2CSlave -> drivers/I2CSlave InterruptIn -> drivers/InterruptIn InterruptManager -> drivers/InterruptManager LocalFileSystem -> drivers/LocalFileSystem LowPowerTicker -> drivers/LowPowerTicker LowPowerTimeout -> drivers/LowPowerTimeout LowPowerTimer -> drivers/LowPowerTimer PortIn -> drivers/PortIn PortInOut -> drivers/PortInOut PortOut -> drivers/PortOut PwmOut -> drivers/PwmOut RawSerial -> drivers/RawSerial SPI -> drivers/SPI SPISlave -> drivers/SPISlave Serial -> drivers/Serial SerialBase -> drivers/SerialBase Stream -> drivers/Stream Ticker -> drivers/Ticker Timeout -> drivers/Timeout Timer -> drivers/Timer TimerEvent -> drivers/TimerEvent Transaction -> drivers/Transaction can_helper -> drivers/can_helper rtc_time -> drivers/rtc_time wait_api -> drivers/wait_api
time.h brings in struct timeval lwip defines custom struct timeval resolved through disabling lwip's struct timeval
MBED_HAL /hal/hal x MBED_API /hal/api x MBED_COMMON /hal/common x MBED_TARGETS /hal/targets -> /targets MBED_DRIVERS + /drivers MBED_PLATFORM + /platform
/targets/hal -> /hal
core.stdio-convert-newlines -> platform.stdio-convert-newlines core.stdio-baud-rate -> platform.stdio-baud-rate
The platform/driver header files can not be correctly namespaced due to header flattening in tools/build_api.py.
To prevent file name conflicts prefix the files drivers.h and platform.h with mbed_.
…and simplified template since people seemed to not understand all that was expected.
previous dependencies FileBase.h -> PlatformMutex.h -> mbed_platform.h SingletonPtr.h -> PlatformMutex.h -> mbed_platform.h -> stddef.h now FileBase.h -> mbed_platform.h SingletonPtr.h -> stddef.h
completed by #2878 |
…..fb7413b fb7413b Merge branch 'release_internal' into release_external a9f6e88 Merge branch 'master' into release_internal c536960 DHCPv6 Server feature update 01e7e82 Merge pull request ARMmbed#2314 from ARMmbed/update_from_mbedos c906c43 Fixed typo: 'lenght' in ns_crc.h 2bd0558 Wi-sun border router DHCPv6 server address alocation update 63e4680 Allow buffer_dyn to handle more data (ARMmbed#2311) 9b82abf Copy IE unicast channel function from WS info instead of FHSS configu… (ARMmbed#2310) 18247d5 Wi-sun RPL memory soft and hard limit update c8560db Updated RPL default memory sof and hard limit to 2/4 from 1/2. 05aa54c Update MPL parameters to follow Specification f728d55 Support for handle CRC error which will automatically change a channel. 6b6f535 Corrected EUI-64 address bit flip on supplicant 015f3fe Corrected bitfield definition 7717ef8 Improved initial EAPOL-key send stop logic on supplicant 4185734 Improved EAPOL key update retry logic 8bda176 Wi-sun boot fix 6283dfd DIO advertisment fix 1acec7c Aro Registation and Dao update 6cde17a Iotthd 3963 2 (ARMmbed#2301) b9187da Randomize fixed channel when making new parent selection 34d0339 Wi-sun address registartion update 5b30559 Allow unicast TX to overlap with MC (ARMmbed#2298) d40b1c7 MAC: Updated calling FHSS TX done (ARMmbed#2295) aeb93a1 Add support for bbr configuration that removes default route from DIO 9b941af Use default UC channel function in discovery, fixed BC schedule (ARMmbed#2284) d65fcc6 Fix Wi-SUN network name comparison (ARMmbed#2294) f085132 Made parent set size configuraple in RPL fd11ffa Added HAVE_WS flag to FHSS api (ARMmbed#2296) 4f27500 Implemented optimal packet size test api (ARMmbed#2292) 87ee16a Call channel change after filtered out packet d196ffc Refactor Wi-SUN BBR stop function 35970d7 Revert "Disabled temporarily tx slot check for testing purposes (ARMmbed#2287)" (ARMmbed#2289) 8cc0ff5 Disabled temporarily tx slot check for testing purposes (ARMmbed#2287) e306dc5 Removed extra ";" 5642a4f Free TX failed list when FHSS deleted (ARMmbed#2285) 9fcf718 Updated FHSS optimal packet length to 300 bytes (ARMmbed#2282) 427743f ETX and Source route validation update 7b6bcca Added TX/RX bytes in PHY statistics (ARMmbed#2281) a043f8d Wi-sun FHSS Management update 2ff90e6 Configure TXRX slot length using given datarate (ARMmbed#2275) a126cb7 ETX sampling rule update d5cf8d5 Clean ARMC6/GCC compiler warnings (ARMmbed#2278) 807632d DHCP server freed next free allocated id fd6ce04 Thread Child ml16 update clear old address queue's and registered address. 99e6efa Neighbour remove operation update 5cd094c Corrected GTK update initial EAPOL-key trickle timer 7606ee8 Wi-sun NS Aro registration blacklisting update e3e5a00 Timed parent selection timer trigger update 7144121 RPL DIO Multicast message update 588f202 Wi-Sun RPL bootstrap update 20289f6 Added periodic RPL version number increase d8dd18d Added ignoring of incoming security messages and improved EAP-TLS startup 7350634 Corrected initial EAPOL-key trickle retries ac33518 Wi-sun ETX and proping update 11c486f Implemented unregistering FHSS from MAC. FHSS deleted in ifdown call. (ARMmbed#2266) eabca17 Wi-Sun Border router DHCPV server SLAAC mode enabled by default. 1d6ce9c DHCPv6 Server feature update 46aa460 Fixed unit test's. c65292e Mac enhanced ACK pending update 11a1e1d Store TX start channel and black list if TX failed (ARMmbed#2261) 0494606 Adapatation layer unicast list entry free update 4481e86 Updated trace level to info. c9e3d8e Interface down update 1f77ad6 Updated trace levels (ARMmbed#2258) 1d82fd5 Wi-sun BBR route update fix 33c48eb Removed NUD messages from registered children ec2ea92 Added RX and TX active times in PHY statistics (ARMmbed#2255) 49686cc Wi-sun certification test setup update 1090430 Trickle API update and Wi-SUN config sol state timeout update 38df576 Wi-sun advertisment consistent update 81740b8 Wi-sun bootstarp update nad balck list trace level update 6919ba1 Wi-sun New key index activate. 0aead93 Wi-sun Probe functionality revert operation 4ff02f9 Stop sending normal ACK if neighbour is Unknown. c387fda NS Probe limiter accept only 2 probe at 16 seconds period. a58c71b Trace level updates (ARMmbed#2247) 6867dd7 Suplicant EAP-TLS timeout is not incremented from retries 1f1c2a2 Test purpose change. 1b99fe1 Added ETX to rpl_possible_better_candidate 3441594 RPL parent candidate list update 96ffe92 Adaptation layer to support multiple simultaneous unicast transmissions (ARMmbed#2243) 45f8519 On stop (ifdown) stores frame counters regardless of threshold 5c2fc55 Corrected frame counter handling on re-discovery 9307416 Added check to prevent installing new GTK to used index using GKH 385ae14 WS bootstrap: print MAC address 2b1dfb9 Slaac address can be recreated after root stop 74ff3cc Merge branch 'release_internal' into release_external 66bfd98 Fixed trace printing warnings. 21d9c24 DHCP server address allocated pointer init fix. e659a01 Fixed compile warning for may uninitialized usage. cee8502 Fixed trace printing warnings. bc9f07b DHCP server address allocated pointer init fix. e3fddad Fixed compile warning for may uninitialized usage. bf909d2 Modified bbr restart mechanism when dodagid was lost git-subtree-dir: features/nanostack/sal-stack-nanostack git-subtree-split: fb7413b
…..fb7413b fb7413b Merge branch 'release_internal' into release_external a9f6e88 Merge branch 'master' into release_internal c536960 DHCPv6 Server feature update 01e7e82 Merge pull request ARMmbed#2314 from ARMmbed/update_from_mbedos c906c43 Fixed typo: 'lenght' in ns_crc.h 2bd0558 Wi-sun border router DHCPv6 server address alocation update 63e4680 Allow buffer_dyn to handle more data (ARMmbed#2311) 9b82abf Copy IE unicast channel function from WS info instead of FHSS configu… (ARMmbed#2310) 18247d5 Wi-sun RPL memory soft and hard limit update c8560db Updated RPL default memory sof and hard limit to 2/4 from 1/2. 05aa54c Update MPL parameters to follow Specification f728d55 Support for handle CRC error which will automatically change a channel. 6b6f535 Corrected EUI-64 address bit flip on supplicant 015f3fe Corrected bitfield definition 7717ef8 Improved initial EAPOL-key send stop logic on supplicant 4185734 Improved EAPOL key update retry logic 8bda176 Wi-sun boot fix 6283dfd DIO advertisment fix 1acec7c Aro Registation and Dao update 6cde17a Iotthd 3963 2 (ARMmbed#2301) b9187da Randomize fixed channel when making new parent selection 34d0339 Wi-sun address registartion update 5b30559 Allow unicast TX to overlap with MC (ARMmbed#2298) d40b1c7 MAC: Updated calling FHSS TX done (ARMmbed#2295) aeb93a1 Add support for bbr configuration that removes default route from DIO 9b941af Use default UC channel function in discovery, fixed BC schedule (ARMmbed#2284) d65fcc6 Fix Wi-SUN network name comparison (ARMmbed#2294) f085132 Made parent set size configuraple in RPL fd11ffa Added HAVE_WS flag to FHSS api (ARMmbed#2296) 4f27500 Implemented optimal packet size test api (ARMmbed#2292) 87ee16a Call channel change after filtered out packet d196ffc Refactor Wi-SUN BBR stop function 35970d7 Revert "Disabled temporarily tx slot check for testing purposes (ARMmbed#2287)" (ARMmbed#2289) 8cc0ff5 Disabled temporarily tx slot check for testing purposes (ARMmbed#2287) e306dc5 Removed extra ";" 5642a4f Free TX failed list when FHSS deleted (ARMmbed#2285) 9fcf718 Updated FHSS optimal packet length to 300 bytes (ARMmbed#2282) 427743f ETX and Source route validation update 7b6bcca Added TX/RX bytes in PHY statistics (ARMmbed#2281) a043f8d Wi-sun FHSS Management update 2ff90e6 Configure TXRX slot length using given datarate (ARMmbed#2275) a126cb7 ETX sampling rule update d5cf8d5 Clean ARMC6/GCC compiler warnings (ARMmbed#2278) 807632d DHCP server freed next free allocated id fd6ce04 Thread Child ml16 update clear old address queue's and registered address. 99e6efa Neighbour remove operation update 5cd094c Corrected GTK update initial EAPOL-key trickle timer 7606ee8 Wi-sun NS Aro registration blacklisting update e3e5a00 Timed parent selection timer trigger update 7144121 RPL DIO Multicast message update 588f202 Wi-Sun RPL bootstrap update 20289f6 Added periodic RPL version number increase d8dd18d Added ignoring of incoming security messages and improved EAP-TLS startup 7350634 Corrected initial EAPOL-key trickle retries ac33518 Wi-sun ETX and proping update 11c486f Implemented unregistering FHSS from MAC. FHSS deleted in ifdown call. (ARMmbed#2266) eabca17 Wi-Sun Border router DHCPV server SLAAC mode enabled by default. 1d6ce9c DHCPv6 Server feature update 46aa460 Fixed unit test's. c65292e Mac enhanced ACK pending update 11a1e1d Store TX start channel and black list if TX failed (ARMmbed#2261) 0494606 Adapatation layer unicast list entry free update 4481e86 Updated trace level to info. c9e3d8e Interface down update 1f77ad6 Updated trace levels (ARMmbed#2258) 1d82fd5 Wi-sun BBR route update fix 33c48eb Removed NUD messages from registered children ec2ea92 Added RX and TX active times in PHY statistics (ARMmbed#2255) 49686cc Wi-sun certification test setup update 1090430 Trickle API update and Wi-SUN config sol state timeout update 38df576 Wi-sun advertisment consistent update 81740b8 Wi-sun bootstarp update nad balck list trace level update 6919ba1 Wi-sun New key index activate. 0aead93 Wi-sun Probe functionality revert operation 4ff02f9 Stop sending normal ACK if neighbour is Unknown. c387fda NS Probe limiter accept only 2 probe at 16 seconds period. a58c71b Trace level updates (ARMmbed#2247) 6867dd7 Suplicant EAP-TLS timeout is not incremented from retries 1f1c2a2 Test purpose change. 1b99fe1 Added ETX to rpl_possible_better_candidate 3441594 RPL parent candidate list update 96ffe92 Adaptation layer to support multiple simultaneous unicast transmissions (ARMmbed#2243) 45f8519 On stop (ifdown) stores frame counters regardless of threshold 5c2fc55 Corrected frame counter handling on re-discovery 9307416 Added check to prevent installing new GTK to used index using GKH 385ae14 WS bootstrap: print MAC address 2b1dfb9 Slaac address can be recreated after root stop 74ff3cc Merge branch 'release_internal' into release_external 66bfd98 Fixed trace printing warnings. 21d9c24 DHCP server address allocated pointer init fix. e659a01 Fixed compile warning for may uninitialized usage. cee8502 Fixed trace printing warnings. bc9f07b DHCP server address allocated pointer init fix. e3fddad Fixed compile warning for may uninitialized usage. bf909d2 Modified bbr restart mechanism when dodagid was lost git-subtree-dir: features/nanostack/sal-stack-nanostack git-subtree-split: fb7413b
…..fb7413b fb7413b Merge branch 'release_internal' into release_external a9f6e88 Merge branch 'master' into release_internal c536960 DHCPv6 Server feature update 01e7e82 Merge pull request ARMmbed#2314 from ARMmbed/update_from_mbedos c906c43 Fixed typo: 'lenght' in ns_crc.h 2bd0558 Wi-sun border router DHCPv6 server address alocation update 63e4680 Allow buffer_dyn to handle more data (ARMmbed#2311) 9b82abf Copy IE unicast channel function from WS info instead of FHSS configu… (ARMmbed#2310) 18247d5 Wi-sun RPL memory soft and hard limit update c8560db Updated RPL default memory sof and hard limit to 2/4 from 1/2. 05aa54c Update MPL parameters to follow Specification f728d55 Support for handle CRC error which will automatically change a channel. 6b6f535 Corrected EUI-64 address bit flip on supplicant 015f3fe Corrected bitfield definition 7717ef8 Improved initial EAPOL-key send stop logic on supplicant 4185734 Improved EAPOL key update retry logic 8bda176 Wi-sun boot fix 6283dfd DIO advertisment fix 1acec7c Aro Registation and Dao update 6cde17a Iotthd 3963 2 (ARMmbed#2301) b9187da Randomize fixed channel when making new parent selection 34d0339 Wi-sun address registartion update 5b30559 Allow unicast TX to overlap with MC (ARMmbed#2298) d40b1c7 MAC: Updated calling FHSS TX done (ARMmbed#2295) aeb93a1 Add support for bbr configuration that removes default route from DIO 9b941af Use default UC channel function in discovery, fixed BC schedule (ARMmbed#2284) d65fcc6 Fix Wi-SUN network name comparison (ARMmbed#2294) f085132 Made parent set size configuraple in RPL fd11ffa Added HAVE_WS flag to FHSS api (ARMmbed#2296) 4f27500 Implemented optimal packet size test api (ARMmbed#2292) 87ee16a Call channel change after filtered out packet d196ffc Refactor Wi-SUN BBR stop function 35970d7 Revert "Disabled temporarily tx slot check for testing purposes (ARMmbed#2287)" (ARMmbed#2289) 8cc0ff5 Disabled temporarily tx slot check for testing purposes (ARMmbed#2287) e306dc5 Removed extra ";" 5642a4f Free TX failed list when FHSS deleted (ARMmbed#2285) 9fcf718 Updated FHSS optimal packet length to 300 bytes (ARMmbed#2282) 427743f ETX and Source route validation update 7b6bcca Added TX/RX bytes in PHY statistics (ARMmbed#2281) a043f8d Wi-sun FHSS Management update 2ff90e6 Configure TXRX slot length using given datarate (ARMmbed#2275) a126cb7 ETX sampling rule update d5cf8d5 Clean ARMC6/GCC compiler warnings (ARMmbed#2278) 807632d DHCP server freed next free allocated id fd6ce04 Thread Child ml16 update clear old address queue's and registered address. 99e6efa Neighbour remove operation update 5cd094c Corrected GTK update initial EAPOL-key trickle timer 7606ee8 Wi-sun NS Aro registration blacklisting update e3e5a00 Timed parent selection timer trigger update 7144121 RPL DIO Multicast message update 588f202 Wi-Sun RPL bootstrap update 20289f6 Added periodic RPL version number increase d8dd18d Added ignoring of incoming security messages and improved EAP-TLS startup 7350634 Corrected initial EAPOL-key trickle retries ac33518 Wi-sun ETX and proping update 11c486f Implemented unregistering FHSS from MAC. FHSS deleted in ifdown call. (ARMmbed#2266) eabca17 Wi-Sun Border router DHCPV server SLAAC mode enabled by default. 1d6ce9c DHCPv6 Server feature update 46aa460 Fixed unit test's. c65292e Mac enhanced ACK pending update 11a1e1d Store TX start channel and black list if TX failed (ARMmbed#2261) 0494606 Adapatation layer unicast list entry free update 4481e86 Updated trace level to info. c9e3d8e Interface down update 1f77ad6 Updated trace levels (ARMmbed#2258) 1d82fd5 Wi-sun BBR route update fix 33c48eb Removed NUD messages from registered children ec2ea92 Added RX and TX active times in PHY statistics (ARMmbed#2255) 49686cc Wi-sun certification test setup update 1090430 Trickle API update and Wi-SUN config sol state timeout update 38df576 Wi-sun advertisment consistent update 81740b8 Wi-sun bootstarp update nad balck list trace level update 6919ba1 Wi-sun New key index activate. 0aead93 Wi-sun Probe functionality revert operation 4ff02f9 Stop sending normal ACK if neighbour is Unknown. c387fda NS Probe limiter accept only 2 probe at 16 seconds period. a58c71b Trace level updates (ARMmbed#2247) 6867dd7 Suplicant EAP-TLS timeout is not incremented from retries 1f1c2a2 Test purpose change. 1b99fe1 Added ETX to rpl_possible_better_candidate 3441594 RPL parent candidate list update 96ffe92 Adaptation layer to support multiple simultaneous unicast transmissions (ARMmbed#2243) 45f8519 On stop (ifdown) stores frame counters regardless of threshold 5c2fc55 Corrected frame counter handling on re-discovery 9307416 Added check to prevent installing new GTK to used index using GKH 385ae14 WS bootstrap: print MAC address 2b1dfb9 Slaac address can be recreated after root stop 74ff3cc Merge branch 'release_internal' into release_external 66bfd98 Fixed trace printing warnings. 21d9c24 DHCP server address allocated pointer init fix. e659a01 Fixed compile warning for may uninitialized usage. cee8502 Fixed trace printing warnings. bc9f07b DHCP server address allocated pointer init fix. e3fddad Fixed compile warning for may uninitialized usage. bf909d2 Modified bbr restart mechanism when dodagid was lost git-subtree-dir: features/nanostack/sal-stack-nanostack git-subtree-split: fb7413b
This diff is annoyingly large, it may be better to look at the repo overview:
https://github.com/geky/mbed/tree/restructure-hal
Target layout:
Directory moves:
The mbed.h file has been moved to the top-level directory to act as a single entry point:
cc @sg-, @bogdanm, @0xc0170, @bridadan, @c1728p9