search

jerbzz / pi-eco-indicator

Display at-a-glance data of carbon intensity or Octopus Agile prices on a Pimoroni Blinkt! display or a Pimoroni Inky pHAT display.
BSD 3-Clause "New" or "Revised" License
26 stars 5 forks source link

Added variable for y height scaling #15

Closed Joeboyc2 closed 3 years ago

Joeboyc2 commented 3 years ago

based on the screen being used

jerbzz commented 3 years ago

You've raised this PR using your own code which is not up to date with the repository - see the bottom of the diff where it is trying to remove some recently added code which is unrelated to your change because that recently added code isn't in your local repository.

You should probably delete your pi-eco-indicator folder completely and then use

git clone https://github.com/jerbzz/pi-eco-indicator

which will make sure you get the entire, up-to-date repository.

Then try the PR again :)

Joeboyc2 commented 3 years ago

ah ok, I actually was trying to play it fast and loose with just updating the single file :|

Let me re-base it off of the latest code 2.1.0 and re-raise the pull request to remove any issues

jerbzz commented 3 years ago

Dude, 2.1.0 IS NOT THE LATEST CODE. It is the latest tagged release, aka a snapshot of the code which won't change. https://github.com/jerbzz/pi-eco-indicator/releases/tag/v2.1.0. It says there "5 commits to main since this release" and you can click or tap to see what they are.

The reason for that is I don't put changes into a tagged release version until I'm happy that they are sufficiently tested. It's a different approach to working on a development branch and merging it into main - I'm just more used to working that way.

It says there "5 commits to main since this release" and you can click or tap to see what they are. If you want to raise a PR you'll have to do it by making sure your fork is up to date with main, otherwise you'll be trying to revert whatever changes I made between 2.1.0 and the head of main.