search

FarmBot / farmbot_os

The operating system and all related software that runs on FarmBot's Raspberry Pi.
MIT License
1.01k stars 264 forks source link

Add Features #792 and #1132 #1487

Closed jsimmonds2 closed 2 years ago

jsimmonds2 commented 2 years ago

Draft PR for shakedown and beta.

Test code in a future PR.

gabrielburnworth commented 2 years ago

I've made some changes (see https://github.com/jsimmonds2/farmbot_os/compare/Features_792_and_1132...FarmBot:qa/15.1.0) and released it as v15.1.0-rc0 on the alpha channel.

jsimmonds2 commented 2 years ago

@gabrielburnworth Humble apologies ! I totally overlooked the mix format pre-requisite :(

How do I proceed to amend this ? Delete the PR and make a new one ? Update this ? Your advice is welcome.

gabrielburnworth commented 2 years ago

No worries; it's easy to overlook. You may update this PR.

You'll want to merge this into your branch first via the button on the page or git: https://github.com/jsimmonds2/farmbot_os/compare/Features_792_and_1132...FarmBot:qa/15.1.0

Then you can run mix format and commit that as well.

I usually use git, so I would:

git clone https://github.com/jsimmonds2/farmbot_os
cd farmbot_os
git remote add upstream https://github.com/farmbot/farmbot_os
git checkout Features_792_and_1132
git pull upstream qa/15.1.0
git pull upstream qa/boot_job
mix format
git add .
git commit -m 'fix formatting'
git push origin Features_792_and_1132

Let me know if you have any questions. I'm not sure if you have any local changes already, but if you do and have any trouble merging I can merge those branches in after if you prefer.

jsimmonds2 commented 2 years ago

Closed due to being too time-poor to finish things and being overall-code-savvy-poor . . . Best wishes :)