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.

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

Corrected NUCLEO_F429ZI f_cpu, added support for Multicast UDP (stm32Ethernet library) #198

Closed
wants to merge 14 commits into from

Conversation

straccio
Copy link
Contributor

Sorry, i'm a noob... i can't understand how to pull only the changes after the merge upstream.

@fpistm
Copy link
Member

fpistm commented Jan 16, 2018

Hi @straccio,
For F_CPU, in fact this not very important. The F_CPU is not really used. SystemCoreClock is well initialized during the SystemClock_Config() --> See 62dd9da
About IGMP, is this changed the behavior of current LWIP Stack config?

Finally about the merge of the upstream.
In fact, in your local repo you should have 2 remotes url ( one on the official repo and one on your fork).
Ex of my local repo:

$ git remote -v
fpistm https://github.com/fpistm/Arduino_Core_STM32.git (fetch)
fpistm https://github.com/fpistm/Arduino_Core_STM32.git (push)
stm32duino https://github.com/stm32duino/Arduino_Core_STM32.git (fetch)
stm32duino https://github.com/stm32duino/Arduino_Core_STM32.git (push)

fpistm is alias on my fork, stm32duino the official repo.

Tips:
To add an alias stm32duino of the official repo on your local repo:

$ git remote add stm32duino https://github.com/stm32duino/Arduino_Core_STM32.git
To rename an alias (ex: origin to straccio):
$ git remote rename origin straccio

So, you should have:

$ git remote -v
stm32duino https://github.com/stm32duino/Arduino_Core_STM32.git (fetch)
stm32duino https://github.com/stm32duino/Arduino_Core_STM32.git (push)
straccio https://github.com/straccio/Arduino_Core_STM32.git (fetch)
straccio https://github.com/straccio/Arduino_Core_STM32.git (push)

Then to align official and fork:
1- fetch the official git repo to have the latest commits:

$ git fetch stm32duino

2- Reset the master branch to the head of stm32duino

$ git checkout -B master stm32duino/master

3- push this master on your fork

$ git push straccio master

Then you could rebase your dev branch on the master

@fpistm fpistm self-assigned this Jan 16, 2018
@fpistm fpistm added the waiting feedback Further information is required label Jan 16, 2018
@lacklustrlabs
Copy link
Contributor

lacklustrlabs commented Jan 17, 2018

The changes in platform.txt, are they suppose to be in there?
I thought that is what you need to change to make this work with the git repository instead of board manager. https://github.com/stm32duino/wiki/wiki/Using-git-repository

BTW those platform.txt changes are better suited for platform.local.txt, I'll see if I can find time to modify the wiki later today.

Edit: Also, try to avoid mixing plain reformatting and white space replacements with your changes. It makes it difficult to review what's actually been modified (stm32fXxx_hal_eth.c)

@fpistm
Copy link
Member

fpistm commented Jan 17, 2018

Change in platform.txt should be ignored.
Path in platform.txt in the git repo allow to use the STM32Tools git repository.
The path in this PR is the one used by the package installed thanks the board manager.

Only this commit should be considered for this PR:
f102466
As @lacklustrlabs mentionned above changes in stm32fXxx_hal_eth.c haev to be ignored.

I think I will remove the lwipopts.h file from the core.
I will do the same update of the STM32Ethernet/LWiP libraries than the STM32FreeRTOS in order to use a
lwipopts_default.h if no lwipopts.h is present at the user sketch level.
See stm32duino/STM32FreeRTOS@55e13ef
--> done. See #207

@fpistm fpistm added abandoned No more work on this and removed waiting feedback Further information is required labels Jan 25, 2018
@fpistm
Copy link
Member

fpistm commented Jan 25, 2018

With #207, this PR is no more required. Update should be done at library side

@fpistm fpistm closed this Jan 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
abandoned No more work on this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants