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

Add suport for CMake to get ChibiOS from GitHub #72

Merged
merged 2 commits into from
Jan 25, 2017
Merged

Add suport for CMake to get ChibiOS from GitHub #72

merged 2 commits into from
Jan 25, 2017

Conversation

josesimoes
Copy link
Member

  • insted of SVN as it was doing before

Signed-off-by: José Simões jose.simoes@eclo.solutions

@josesimoes
Add suport for CMake get ChibiOS from GitHub
437aa36 
- insted of SVN as it was doing

Signed-off-by: José Simões <jose.simoes@eclo.solutions>
@josesimoes josesimoes changed the title Add suport for CMake get ChibiOS from GitHub Add suport for CMake to get ChibiOS from GitHub Jan 20, 2017
@josesimoes josesimoes requested a review from cw2 January 20, 2017 11:44
@cw2
Copy link
Contributor

cw2 commented Jan 23, 2017

Please resolve CMake/Modules/FindCHIBIOS.cmake conflict.

@josesimoes
Copy link
Member Author

Conflict solved.

@cw2 cw2 merged commit 0bc7e32 into nanoframework:dev-cmake-build Jan 25, 2017
@cw2
Copy link
Contributor

cw2 commented Jan 25, 2017

Please prefer rebase to back-merge.

@josesimoes
Copy link
Member Author

josesimoes commented Jan 25, 2017 •
edited
Loading

Please prefer rebase to back-merge.

Could you please point me to a GitHub help or article to illustrate what you are asking?

@cw2
Copy link
Contributor

cw2 commented Jan 25, 2017

For example https://help.github.com/articles/using-git-rebase-on-the-command-line/, but much better explanation is https://www.atlassian.com/git/tutorials/merging-vs-rebasing.

The key difference is the existence of the merge commit - if there was a change in dev-cmake-build after your commit, you can either merge dev-cmake-build into your feature branch (creating a merge commit and bringing all the history with it), or you can rebase - which means re-applying your changes to the actual state of dev-cmake-build (git does that automatically for you).

@cw2
Copy link
Contributor

cw2 commented Jan 25, 2017

(it is safe to rebase pull request branch - it would cause problems only if it was shared with other people who were actually working on their copies in parallel)

josesimoes referenced this pull request in Eclo/nf-interpreter Jan 25, 2017
@josesimoes
Add suport for CMake get ChibiOS from GitHub (#72)
deb08a8 
- instead of SVN as it was doing

Signed-off-by: José Simões <jose.simoes@eclo.solutions>
@josesimoes josesimoes deleted the cmake-chibios-from-github branch January 26, 2017 23:54
josesimoes pushed a commit that referenced this pull request Nov 11, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
8f54947 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Nov 11, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
42682ee 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Nov 11, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
c946839 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Nov 11, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
633d761 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Nov 11, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
c075ae4 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Nov 11, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
25c213c 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Nov 11, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
57d5e41 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Nov 14, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
144669d 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Nov 20, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
42e44fa 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Nov 27, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
c7015aa 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Dec 3, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
9a61064 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Dec 5, 2019
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
2d66403 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Jan 7, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
c5257dd 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Jan 17, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
6dcdb4e 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Jan 29, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
47d140b 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Feb 7, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
b7e9fc7 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Feb 10, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
a26fcc6 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Feb 11, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
7d2ee22 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Feb 12, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
e01ab86 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Feb 13, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
a00100d 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Feb 25, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
2aef8d9 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Feb 28, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
c89919c 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Mar 9, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
e909a17 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Mar 21, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
cb2803c 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Apr 15, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
0d0a3f7 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Apr 29, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
95d6bb9 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Apr 29, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
3e8493a 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Apr 29, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
a225212 
Related work items: #72
josesimoes pushed a commit that referenced this pull request May 2, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
6291cc0 
Related work items: #72
josesimoes pushed a commit that referenced this pull request May 4, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
08538d8 
Related work items: #72
josesimoes pushed a commit that referenced this pull request May 5, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
09562b6 
Related work items: #72
josesimoes pushed a commit that referenced this pull request May 11, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
224f818 
Related work items: #72
josesimoes pushed a commit that referenced this pull request May 19, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
9a91998 
Related work items: #72
josesimoes pushed a commit that referenced this pull request Jun 5, 2020
@antoniofagundes @josesimoes
Add default GPIOs (both F4 and F7)
07ee0b2 
Related work items: #72
josesimoes added a commit that referenced this pull request Jun 5, 2020
@josesimoes @sjmneves
@antoniofagundes @networkfusion
Add ORGPAL3 target (#1654)
343c3b8 
* Add new boards

- 429 building and running booter and CLR
- MAC disabled

* Fix I2C config

* Fix alternate for RMII pin

* Fix SPI assignments

- SPI1 and SPI2 are the correct ones.

* Add support for STDBY processing and exit on CLR

* Correct pin to remain on booter

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Implement workaround on silicon bug when wakeup from STDBY

- Also decrease timeouts on USB connect disconnect sequence.

* Fix block storage config

- Was missing the config block.
- Add config block to block storage arrays.
- Adjust linker file accordingly.
- Rename linker files and update reference in target CMake.
- Update CLR address in booter check.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Temporary fix to overcome PHY reset signal

* Update ChibiOS build options

- Following #1177.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Upda Block storage to new structure

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Fix SD Card detect

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Fix FAT FS definitions and configs

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Final tweaks on USB MSD config

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Update storage implementation for target board

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Update FatFS config

* Clean up main for file system inits

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Add storage working threads and config

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Add define for activity heart beat

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Update ChibiOS config files for F469

* Update F469 board to ChibiOS 19.1

* Update UART configs

* Update F769 board to ChibiOS 19.1

- Added necessary config files

* Fix clock config

* Linker file adjustments

* Update lwIPand other network configs

* Fix GPIO def

* adjust sntp config

* Add missing define for platform RNG

* Fix board voltage

* Turn OFF SD Card on both boards

* Turn on bkp RAM on both boards

* Fix booter code for F769

- Was checking the wrong GPIO to remain on booter.
- Decrease USB timeout.
- Add missing call to BlockStorage init.
- Replace pal set/clear with toggle for blinking the LED.

* Work on CLR main for F769

- Add threads for SD card and USB MSD.
- Decrease USB sleep time on reboot.

* Update config for ext memory and disable for F7

* Fix GPIO config for UART pins

* Fix ethernet F4

* Disable COM7 in F4

* Improve async continuations

* Enable COM ports on F7

* Add wake up processing for F7

* Enable UART7 on F4 board

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Initial work adding SPIFFS to STM32

- Add code from Cube package.
- Add SPIFFS HAL.
- Update STM32 Windows.Storage implementation to add support for SPIFFS.
- Rework STM32 Windows.Storage implementation to work without FatFS.
- Update CMakes as required.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Initial work adding SPIFFS to STM32

- Add code from Cube package.
- Add SPIFFS HAL.
- Update STM32 Windows.Storage implementation to add support for SPIFFS.
- Rework STM32 Windows.Storage implementation to work without FatFS.
- Update CMakes as required.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Update SD Card detect mapping in storage configuration

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Fix I2C2 DMA assigment

- Close BUG 67.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Fixes on GPIO defs for QSPI on F4 and F7 boards

* Add SPIFFS implementation for F4 and F7 boards

* Work on QSPI to use STM HAL calls to init QSPI clocks and pripheral

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Work on SPIFFS hal init

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Change spiffs max file name to 256

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Rework STM32 Windows.Storage

- Add support for SPIFFS.
- Separate code to allow compiling for FatFS and SPIFFS as separate options.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Rework StorageFile for spiffs

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Remove magic number from spiffs config

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Fix HAL SPIFFS after bad merge

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Revert SPIFFS config for object name lenght to 32

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Fix external memory for F7 board

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Fix STM Cube package

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Sync mcu config F7 with F4

* Enable UART7 config for F7 board

* Update ADC config for F7 board

* Turn off unnused peripherals

* Add extra cleaning to F7 wakeup sources

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Work on F7 and F4 resources

- Enable I2C3 for F7
- Enable ADC3 for F4 and F7

* Remove bad double quotes on include for SPIFFS

- Was failing the CMake config if SPIFFS option was OFF.

* Turn off SPIFFS for F7 board

- Turn off HAL QSPI.
- QSPI STM Cube driver is not working as it is now.

* Adjust CLR region size for MinRelSize build (F4)

* Update CLR region size for RELEASE build (F7)

* Add default GPIOs (both F4 and F7)

Related work items: #72

* Change serial flash to W25Q128

- Update names, size configs, chip IDs and timmings.

* Fix GPIO initial set

- Both boards.
- Requested by Zan.

* Enable SD Card in storage config (both F4 and F7)

* Add target name and platform defines to both F4 and F7

* Update both targets config files

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Add target config for DAC

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Enable DAC on PA4 for both boards

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Update mbedTLS options on both boards

- Following nf-interpreter develop branch.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Update serial baud rate on both boards

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Fix build with mbedTLS option ON

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Add network default config to F4 and F7 boards

- Following #1422.

* Fix GPIO config for SPI flash CS pin

* Fix initial test code for SPIFFS

* Enable SPIFFS storage for F7 board

* Add define for long running operations hook in SPIFFS config

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Rework F7 SPIFFS to work with AT25SF081

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Update F7 SPIFFS config to AT25SL641

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Enable SDMMC1 on F7

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Fix SPI flash PN and IDs

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Fix overalpping DMA with SD card and SPI1

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Remove bad instruction to force cache read

- Causing hard fault.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Replace hack for watchdog reset

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Merged PR 2: Add DMA capable read and write buffers for SPIFFS operation

Add DMA capable read and write buffers for SPIFFS operation

* Replace flash storage from SPI to QSPI chip

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Revert wrong changes in STM32F769 targets

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Revert changes with wrong merge

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Revert merge changes

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Revert from merge

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Remove wrong boards

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Work CD-CI

- Add OrgPal board to build targets.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Add ORGPAL board to README

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Add ORGPAL_PALTHREE board folder

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Work CD-CI

- Remove CAN from build options.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Remove 1-Wire from build options and features table

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Merge from upstream/develop

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Add dependencies for ORGPAL build

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Enable support for System.Text

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Work CD-CI

- Add ForceUpload variable to bintray template to allow publishing images on branches other than develop.
- Set ForceUpload  in ORGPAL target.

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Gererate DFU file for ORGPAL_PALTHREE

* Generate DFU file for OrgPal3 board (#1533)

* Add GetTargetCapabilities for OrgPal3
* Add DFU package to CMakeLists for OrgPal3 board

* Add required header for GetTargetCapabilities

* Remove duplicated line from CMakeLists.txt

* Remove unused dependency from ChibiOS FatFS

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Update FatFS config file to R014

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Work CD-CI

- Rename ChibiOS nF HAL overlay defines as they were conflicting with the official community ones.
*** REQUIRES UPDATE ON THE NF OPTIONS ON ALL STM32 TARGETS ***
***NO_CI***

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Update ORGPAL3 HAL options

Signed-off-by: José Simões <jose.simoes@eclo.solutions>

* Add CRC init to boot files

Signed-off-by: josesimoes <jose.simoes@eclo.solutions>

* Update SPI configuration

Signed-off-by: josesimoes <jose.simoes@eclo.solutions>

* Fix SPI index in call to config macro

* Update README from upstream develop

Signed-off-by: josesimoes <jose.simoes@eclo.solutions>

* Fix Azure pipelines entry

Signed-off-by: josesimoes <jose.simoes@eclo.solutions>

* Fix managed helpers for ORGPAL_PALTHREE

Signed-off-by: josesimoes <jose.simoes@eclo.solutions>

Co-authored-by: sjmneves <sergio.neves@eclo.solutions>
Co-authored-by: Antonio Fagundes <antonio.fagundes@eclo.solutions>
Co-authored-by: Robin Jones <networkfusion@users.noreply.github.com>
nfbot pushed a commit that referenced this pull request Aug 13, 2022
@AdrianSoundy
Merge pull request #72 from nanoframework/nfbot/clang-format-fix/5fee…
22465b1 
…d8c4-45e7-428f-a014-a99f4b066fd0

Code style fixes for nanoframework/nf-interpreter PR#2409
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cw2 cw2 cw2 approved these changes

Assignees
No one assigned
Labels
Area: Infrastructure-and-Organization Type: enhancement
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@josesimoes @cw2