-
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
IDE Export support for platform VK_RZ_A1H #3632
Conversation
Just a question: Why in the mbed online compiler neither RZ_A1H nor VK_RZ_A1H can be compiled successfuly but if they are compiled offline (after checkout and execution of build.py ) there is no problem? |
please report this as an issue, with detailed description (to be able to reproduce it) |
@@ -1831,7 +1831,8 @@ | |||
"device_has": ["ANALOGIN", "CAN", "ERROR_PATTERN", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SPI", "SPISLAVE", "STDIO_MESSAGES"], | |||
"features": ["LWIP"], | |||
"default_lib": "std", | |||
"release_versions": ["2", "5"] | |||
"release_versions": ["2", "5"], | |||
"device_name": "r7s721000" |
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.
can you align this line and same for ds5_5.py edit?
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.
Be aware of #3601.
Also, be aware that exporter updates will affect the online system at the earliest after a release. |
The files are aligned! but no idea what to do with #3601. For the earlier releases it just won't work! |
Don't worry about it, unless it comes in first. Then I'll tell you what needs to change. It was a note for myself. |
@@ -71,6 +71,7 @@ static const PinMap PinMap_IRQ[] = { | |||
#else | |||
static const PinMap PinMap_IRQ[] = { | |||
{P9_1, IRQ0, 4}, | |||
{P7_8, IRQ1, 8}, |
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.
Is this change related?
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.
should not be
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.
It is forgotten external Interrupt pin, which was missed at the creation of the SDK for that platform.
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.
Could you move it into another PR? We can get both in faster if they are smaller and more targeted.
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 don't know how, if I make another pull request basically the two PR will be the same but with different headlines.
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.
Basically, you pull the other commit into another branch. Due to the history here, this can get a bit complicated e.g.
# Make a new branch
git checkout origin/master -b add-rz-pins
# Move the changes from the first commit onto the branch, without making a commit
git cherry-pick -n aede40f529a7d433000dd84d9535e41e3015b2be
# Remove unrelated changes
git reset HEAD targets/targets.json tools/export/ds5_5.py tools/export/ds5_5_vk_rz_a1h.cproject.tmpl tools/export/ds5_5_vk_rz_a1h.launch.tmpl tools/export/ds5_5_vk_rz_a1h.project.tmpl tools/export/e2studio.py tools/export/e2studio_vk_rz_a1h_cproject.tmpl tools/export/e2studio_vk_rz_a1h_gdbinit.tmpl tools/export/e2studio_vk_rz_a1h_project.tmpl tools/export/iar/iar_definitions.json
# Commit these changes
git commit -m "Add missing pin to VK_RZ_A1H"
Or more simply
git checkout origin/master -b add-rz-pins
# Now manually add the changes (the single line addition)
git add targets/TARGET_RENESAS/TARGET_VK_RZ_A1H/gpio_irq_api.c
git commit -m "Add missing pin to VK_RZ_A1H"
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.
OK. The PR is created #3642
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.
Nicely done!
Now could you remove the change from this change set?
e.g.
# start an interactive rebase
git rebase -i origin/master
# replace 'pick' from in front of 'Export IDE support added' with 'edit'
# revert the file
git reset HEAD^ targets/TARGET_RENESAS/TARGET_VK_RZ_A1H/gpio_irq_api.c
# add the reverted file
git add targets/TARGET_RENESAS/TARGET_VK_RZ_A1H/gpio_irq_api.c
# modify the commit with the changes added
git commit --amend
# finish the rebase.
git rebase --continue
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.
Yeah it's done! sorry for the late response but I always have a hard time when dealing with git
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.
It looks great! Thanks for rebasing and breaking the PR into two!
Hmmmm.... socket timeout on a K64F on the continuous-integration/jenkins/pr-head job... I don't think its related.... |
/morph export-build |
Wow 3 days and still building ... quite a long build ... |
we will restart CI, but first resolve conflicts. Can you? |
Not exactly. I can't find the problem. Everything seems OK when these scripts are processed offline I mean through project.py (The export is working nicely without any complaint) |
You should try to git fetch origin
git rebase origin/master |
Same result: successful build and export. Are you sure it must be origin? Should I try something with libraries, not just the blinky project. |
I assumed that origin would be armmbed/mbed-os. But you should fetch whichever the remote that corresponds to and rebase with the same remote. |
@mbedNoobNinja please rebase to remove conflicts |
We could use a |
Not sure this will help |
The Cam-CI failure is a Java exception related to multi-threaded file access. Not your fault @mbedNoobNinja |
@mbedNoobNinja We prefer a rebase to a merge commit. FYI. |
OK, finally! Now it must be fine. (If you have not changed directories again :D) |
/morph export-build |
Result: SUCCESSYour command has finished executing! Here's what you wrote!
Outputmbed Build Number: 98 All exports and builds passed! |
Ports for Upcoming Targets Fixes and Changes 3432: Target STM USBHOST support ARMmbed/mbed-os#3432 3181: NUCLEO_F207ZG extending PeripheralPins.c: all available alternate functions can be used now ARMmbed/mbed-os#3181 3626: NUCLEO_F412ZG : Add USB Device +Host ARMmbed/mbed-os#3626 3628: Fix warnings ARMmbed/mbed-os#3628 3629: STM32: L0 LL layer ARMmbed/mbed-os#3629 3632: IDE Export support for platform VK_RZ_A1H ARMmbed/mbed-os#3632 3642: Missing IRQ pin fix for platform VK_RZ_A1H ARMmbed/mbed-os#3642 3664: Fix ncs36510 sleep definitions ARMmbed/mbed-os#3664 3655: [STM32F4] Modify folder structure ARMmbed/mbed-os#3655 3657: [STM32L4] Modify folder structure ARMmbed/mbed-os#3657 3658: [STM32F3] Modify folder structure ARMmbed/mbed-os#3658 3685: STM32: I2C: reset state machine ARMmbed/mbed-os#3685 3692: uVisor: Standardize available legacy heap and stack ARMmbed/mbed-os#3692 3621: Fix for #2884, LPC824: export to LPCXpresso, target running with wron ARMmbed/mbed-os#3621 3649: [STM32F7] Modify folder structure ARMmbed/mbed-os#3649 3695: Enforce device_name is valid in targets.json ARMmbed/mbed-os#3695 3723: NCS36510: spi_format function bug fix ARMmbed/mbed-os#3723
IAR, DS5 & e2studio