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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

馃毟 Apply liblvgl when upgrading to PROS 4 #345

Merged
merged 2 commits into from
May 1, 2024

Conversation

mayankpatibandla
Copy link
Contributor

Summary:

Automatically apply liblvgl when upgrading a PROS 3 project to PROS 4, fetch the template if necessary

Motivation:

liblvgl is needed for LLEMU on PROS 4

Test Plan:

  • Create a PROS 3 project
  • Upgrade to PROS 4
  • Ensure that liblvgl is applied
    image

@ayushuk
Copy link
Member

ayushuk commented May 1, 2024

Not sure if I'm missing something but I pulled the latest changes on this branch and lvgl is not part of my project after running the same commands as you, let me know if the commands are wrong.

Screenshot 2024-05-01 at 11 58 34鈥疉M

Copy link
Member

@ayushuk ayushuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see above comment

@mayankpatibandla
Copy link
Contributor Author

Not sure if I'm missing something but I pulled the latest changes on this branch and lvgl is not part of my project after running the same commands as you, let me know if the commands are wrong.

Screenshot 2024-05-01 at 11 58 34鈥疉M

It seems you had an extra hyphen in pros c u --ea, it should be pros c u -ea

Copy link
Member

@ayushuk ayushuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same thing, the EA flag actually triggered EA this time tho

Screenshot 2024-05-01 at 3 58 59鈥疨M

@mayankpatibandla
Copy link
Contributor Author

It seems to work for me, are you sure you're on the correct branch?

On develop:

> pros c reset --force; pros c n test35 v5 3.8.3; cd test35; pros c info; pros c u -ea; pros c info 
Conductor was reset
Updating pros-mainline... Done
PROS 4 is now in early access. Please use the --early-access flag if you would like to use it.
Do you want to use PROS 4 instead? [y/N]: n
Downloading kernel@3.8.3 [####################################] 100%
Extracting kernel@3.8.3 [####################################] 100%
Fetched kernel@3.8.3 from pros-mainline depot
Adding kernel@3.8.3 to registry...Done
Applying kernel@3.8.3 [####################################] 100%
Finished applying kernel@3.8.3 to test35
Downloading okapilib@4.8.0 [####################################] 100%
Extracting okapilib@4.8.0 [####################################] 100%
Fetched okapilib@4.8.0 from pros-mainline depot
Adding okapilib@4.8.0 to registry...Done
Applying okapilib@4.8.0 [####################################] 100%
Finished applying okapilib@4.8.0 to test35
New PROS Project was created:
PROS Project for v5 at: C:\Projects\Robotics\PROS\pros-cli\test35 (test35)
Name      Version    Origin
--------  ---------  -------------
kernel    3.8.3      pros-mainline
okapilib  4.8.0      pros-mainline
Building project...
Creating cold package with libc,libm,libpros,okapilib [OK]
Stripping cold package  [DONE]
Section sizes:
   text    data     bss   total     hex filename
1.34MB  4.36KB  47.66MB  48.99MB 30fcba6 bin/cold.package.elf
Compiled src/main.cpp [OK]
Adding timestamp [OK]
Linking hot project with ./bin/cold.package.elf and libc,libm,libpros,okapilib [OK]
Section sizes:
   text    data     bss   total     hex filename
 1.11KB   4.00B  46.02MB  46.02MB 2e03c72 bin/hot.package.elf
Creating cold package binary for VEX EDR V5 [DONE]
Creating bin/hot.package.bin for VEX EDR V5 [DONE]
PROS Project for v5 at: C:\Projects\Robotics\PROS\pros-cli\test35 (test35)
Name      Version    Origin
--------  ---------  -------------
kernel    3.8.3      pros-mainline
okapilib  4.8.0      pros-mainline
Upgrading kernel
Updating kernel-early-access-mainline... Done
Warning! Upgrading project to PROS 4 will cause breaking changes. Do you still want to upgrade? [y/N]: y
Downloading kernel@4.0.6 [####################################] 100%
Extracting kernel@4.0.6 [####################################] 100%
Fetched kernel@4.0.6 from kernel-early-access-mainline depot
Adding kernel@4.0.6 to registry...Done
Applying kernel@4.0.6 [####################################] 100%
Finished applying kernel@4.0.6 to C:\Projects\Robotics\PROS\pros-cli\test35
Upgrading okapilib
Downloading okapilib@5.0.0 [####################################] 100%
Extracting okapilib@5.0.0 [####################################] 100%
Fetched okapilib@5.0.0 from kernel-early-access-mainline depot
Adding okapilib@5.0.0 to registry...Done
Applying okapilib@5.0.0 [####################################] 100%
Finished applying okapilib@5.0.0 to C:\Projects\Robotics\PROS\pros-cli\test35
PROS Project for v5 at: C:\Projects\Robotics\PROS\pros-cli\test35 (test35)
Name      Version    Origin
--------  ---------  ----------------------------
kernel    4.0.6      kernel-early-access-mainline
okapilib  5.0.0      kernel-early-access-mainline

On enhancement/liblvgl-pros4-upgrade:

> pros c reset --force; pros c n test36 v5 3.8.3; cd test36; pros c info; pros c u -ea; pros c info
Conductor was reset
Updating pros-mainline... Done
PROS 4 is now in early access. Please use the --early-access flag if you would like to use it.
Do you want to use PROS 4 instead? [y/N]: n
Downloading kernel@3.8.3 [####################################] 100%
Extracting kernel@3.8.3 [####################################] 100%
Fetched kernel@3.8.3 from pros-mainline depot
Adding kernel@3.8.3 to registry...Done
Applying kernel@3.8.3 [####################################] 100%
Finished applying kernel@3.8.3 to test36
Downloading okapilib@4.8.0 [####################################] 100%
Extracting okapilib@4.8.0 [####################################] 100%
Fetched okapilib@4.8.0 from pros-mainline depot
Adding okapilib@4.8.0 to registry...Done
Applying okapilib@4.8.0 [####################################] 100%
Finished applying okapilib@4.8.0 to test36
New PROS Project was created:
PROS Project for v5 at: C:\Projects\Robotics\PROS\pros-cli\test36 (test36)
Name      Version    Origin
--------  ---------  -------------
kernel    3.8.3      pros-mainline
okapilib  4.8.0      pros-mainline
Building project...
Creating cold package with libc,libm,libpros,okapilib [OK]
Stripping cold package  [DONE]
Section sizes:
   text    data     bss   total     hex filename
1.34MB  4.36KB  47.66MB  48.99MB 30fcba6 bin/cold.package.elf
Compiled src/main.cpp [OK]
Adding timestamp [OK]
Linking hot project with ./bin/cold.package.elf and libc,libm,libpros,okapilib [OK]
Section sizes:
   text    data     bss   total     hex filename
 1.11KB   4.00B  46.02MB  46.02MB 2e03c72 bin/hot.package.elf
Creating cold package binary for VEX EDR V5 [DONE]
Creating bin/hot.package.bin for VEX EDR V5 [DONE]
PROS Project for v5 at: C:\Projects\Robotics\PROS\pros-cli\test36 (test36)
Name      Version    Origin
--------  ---------  -------------
kernel    3.8.3      pros-mainline
okapilib  4.8.0      pros-mainline
Upgrading kernel
Updating kernel-early-access-mainline... Done
Warning! Upgrading project to PROS 4 will cause breaking changes. Do you still want to upgrade? [y/N]: y
Downloading kernel@4.0.6 [####################################] 100%
Extracting kernel@4.0.6 [####################################] 100%
Fetched kernel@4.0.6 from kernel-early-access-mainline depot
Adding kernel@4.0.6 to registry...Done
Applying kernel@4.0.6 [####################################] 100%
Finished applying kernel@4.0.6 to C:\Projects\Robotics\PROS\pros-cli\test36
Updating kernel-early-access-mainline... Done
Updating pros-mainline... Done
Downloading liblvgl@8.3.6 [####################################] 100%
Extracting liblvgl@8.3.6 [####################################] 100%
Fetched liblvgl@8.3.6 from kernel-early-access-mainline depot
Adding liblvgl@8.3.6 to registry...Done
Applying liblvgl@8.3.6 [####################################] 100%
Finished applying liblvgl@8.3.6 to C:\Projects\Robotics\PROS\pros-cli\test36
Upgrading okapilib
Downloading okapilib@5.0.0 [####################################] 100%
Extracting okapilib@5.0.0 [####################################] 100%
Fetched okapilib@5.0.0 from kernel-early-access-mainline depot
Adding okapilib@5.0.0 to registry...Done
Applying okapilib@5.0.0 [####################################] 100%
Finished applying okapilib@5.0.0 to C:\Projects\Robotics\PROS\pros-cli\test36
PROS Project for v5 at: C:\Projects\Robotics\PROS\pros-cli\test36 (test36)
Name      Version    Origin
--------  ---------  ----------------------------
kernel    4.0.6      kernel-early-access-mainline
liblvgl   8.3.6      kernel-early-access-mainline
okapilib  5.0.0      kernel-early-access-mainline

Copy link
Member

@ayushuk ayushuk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, you're right I forgot I switched branches. LGTM

@mayankpatibandla mayankpatibandla merged commit 022dc57 into develop May 1, 2024
10 checks passed
@mayankpatibandla mayankpatibandla deleted the enhancement/liblvgl-pros4-upgrade branch May 1, 2024 23:24
@ayushuk ayushuk mentioned this pull request May 7, 2024
This was referenced May 17, 2024
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.

None yet

3 participants