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

Support for SAMD boards. #7

Merged
merged 1 commit into from
Mar 2, 2021
Merged

Support for SAMD boards. #7

merged 1 commit into from
Mar 2, 2021

Conversation

Spegs21
Copy link
Contributor

@Spegs21 Spegs21 commented Feb 26, 2021

No description provided.

@Spegs21
Copy link
Contributor Author

Spegs21 commented Feb 26, 2021

I fixed the tabs in the JSON file but before I commit those changes how do you to do the versioning? I put v0.1.0 since it's a different arch but this maybe conflict with older releases. I could do v0.3.1-alpha or something but it doesn't seem right to step the version of the AVR boards too.

@Legion2
Copy link
Owner

Legion2 commented Feb 26, 2021

The release process must be reworked to support multiple arch

@Legion2
Copy link
Owner

Legion2 commented Feb 26, 2021

I will try to create a new release workflow using github actions with manual triggers, so we can release the boards individually

adafruit-samd/platform.txt Outdated Show resolved Hide resolved
adafruit-samd/boards.txt Outdated Show resolved Hide resolved
package_Legion2_CorsairLightingProtocolBoards_index.json Outdated Show resolved Hide resolved
@Legion2
Copy link
Owner

Legion2 commented Feb 26, 2021

I created 1e17342 so platforms can be released independently.

@Legion2 Legion2 added the enhancement New feature or request label Feb 26, 2021
@Legion2
Copy link
Owner

Legion2 commented Feb 27, 2021

@Spegs21 you executed the release process, but I don't understand why it failed, it did successfully pushed the commit. https://github.com/Spegs21/CorsairLightingProtocolBoards/runs/1992553204

@Spegs21
Copy link
Contributor Author

Spegs21 commented Feb 27, 2021

@Legion2 stat returned 'missing operand'. This led to an a missing size for the archive and failure for there being an unexpected ',' after the size keyword. I tried to rerun it but it the commit was rejected the second time. The log you're seeing there is from the rerun. It overwrote the reason for the initial failure.

@Legion2
Copy link
Owner

Legion2 commented Feb 27, 2021

Ok I will look into it when I find time for it.

@Legion2
Copy link
Owner

Legion2 commented Feb 28, 2021

@Spegs21 I found the problem, and also some other bugs. Thanks for testing the release process, would you also try the fixed release process? I can't test it in this repo, because it would create a release.

@Spegs21
Copy link
Contributor Author

Spegs21 commented Feb 28, 2021

@Legion2 The workflow appeared to work correctly this time. update-index.mjs still needs updated to support the new arch. I ran it with the provided JSON and it produced this:

            },
            {
                "name": "Corsair Lighting Protocol Boards",
                "architecture": "avr",
                "version": "0.3.0",
                "category": "Contributed",
                "help": {
                    "online": "https://github.com/Legion2/CorsairLightingProtocolBoards"
                },
                "url": "https://github.com/Spegs21/CorsairLightingProtocolBoards/releases/download/samd-0.3.0/CorsairLightingProtocolBoards-samd-0.3.0.zip",
                "archiveFileName": "CorsairLightingProtocolBoards-samd-0.3.0.zip",
                "checksum": "SHA-256:9ad78907df08e5efccdeb721dc0842e7d415a719b835289a31c9206a1bfb3627",
                "size": 2138,
                "boards": [
                    {
                        "name": "CLP SparkFun Pro Micro 5V, 16 MHz"
                    },
                    {
                        "name": "CLP SparkFun Pro Micro 3.3V, 8 MHz"
                    },
                    {
                        "name": "CLP HoodLoader2 16u2"
                    },
                    {
                        "name": "CLP Arduino Leonardo"
                    },
                    {
                        "name": "CLP Adafruit Flora"
                    },
                    {
                        "name": "CLP Adafruit Feather 32u4"
                    },
                    {
                        "name": "CLP Adafruit Circuit Playground Classic"
                    },
                    {
                        "name": "CLP Adafruit ItsyBitsy 32u4 5V 16MHz"
                    },
                    {
                        "name": "CLP Adafruit ItsyBitsy 32u4 3V 8MHz"
                    },
                    {
                        "name": "CLP Adafruit Bluefruit Micro"
                    },
                    {
                        "name": "CLP Adafruit 32u4 Breakout"
                    }
                ],
                "toolsDependencies": []

@Legion2
Copy link
Owner

Legion2 commented Feb 28, 2021

When you create a new arch you have to manually create it, because the script can not find a template to copy. Because in the samd/platform.txt was the wrong name, it copied the wrong template in the index file.

@Spegs21
Copy link
Contributor Author

Spegs21 commented Feb 28, 2021

When you create a new arch you have to manually create it, because the script can not find a template to copy. Because in the samd/platform.txt was the wrong name, it copied the wrong template in the index file.

Yep, just saw that. It did it correctly after I fixed it.

Copy link
Owner

@Legion2 Legion2 left a comment

Choose a reason for hiding this comment

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

Can you update the readme to add the new boards and which additional steps are required to use the new boards.

Also please rebase and squash your commits. Please do not include the release in the PR, because I have to trigger it on this repository, so the release is created in this repository. You can provide the template for the index file in a comment, so I can copy it in the index later.

Copy link
Owner

@Legion2 Legion2 left a comment

Choose a reason for hiding this comment

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

when the two comments are resolved, we can merge this and I will create a new release

samd/platform.txt Outdated Show resolved Hide resolved
package_Legion2_CorsairLightingProtocolBoards_index.json Outdated Show resolved Hide resolved
@Spegs21
Copy link
Contributor Author

Spegs21 commented Mar 1, 2021

Wait a minute while I squash it again.

Fix platform.txt for Adafruit SAMD.

Fix boards.txt.

Added Zero Native. Fixes for JSON, boards, & plat.

Move files to common SAMD dir.

Fix platform.

Update platform.txt

Update README for SAMD boards.

Fixes.
@Spegs21
Copy link
Contributor Author

Spegs21 commented Mar 1, 2021

Should be good to go!

@Legion2 Legion2 merged commit e50c401 into Legion2:master Mar 2, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants