the-raspberry-pi-guy / lcd

This repository contains all of the code for interfacing with a 16x2 Character I2C LCD Display. This accompanies my YouTube tutorial here: https://www.youtube.com/watch?v=fR5XhHYzUK0
186 stars 107 forks source link

Script that pulls info from 3 apis. It also shows the ip of the machine, date and hour #32

Closed jdarias closed 3 years ago

jdarias commented 3 years ago

Hi i think i did it. Any feedback is welcome.

cgomesu commented 3 years ago

@jdarias, could you please be a bit more verbose about

@the-raspberry-pi-guy, at some point in the near future, I'm thinking that would be helpful to write a CONTRIBUTING.md file and add a PR template for contributions like this one. Also, we should probably move all the demos to their own sub-directory (/demos/) instead of storing them in the repo's root directory.

jdarias commented 3 years ago

Sure thing, I created the PR in order to publish the demo I made, demo_iphour.py

the-raspberry-pi-guy commented 3 years ago

Thanks for your hard work on this guys. Is this now in a fit state to merge @cgomesu? Also Carlos, please check your email as I have invited you to be a collaborator on this GitHub in light of all of your help with previous Issues and PRs.

Thanks again to both of you for contributing to the code base.

cgomesu commented 3 years ago

Is this now in a fit state to merge @cgomesu?

It is not. I think @jdarias is new to git and github but that's okay. the changes introduced new issues (e.g., they are now showing commits by other authors; added commits on top of previous ones, instead of amending them, the result being that the author is now trying to merge 52 commits for a single demo file) and failed to fix an important issue mentioned in my first review--namely, the scroll-text.py is still here. see next for my suggestion on how to move forward with this PR.


@jdarias, the current PR cannot be merged to the-raspberry-pi-guy:master branch for the reasons I pointed out before. there are two options moving forward: (a) you can try to rebase your changes once again to fix the commit history or (b) submit a new PR with a clean commit history. the former is much more difficult than the latter, especially if you are new to git, but it can be greatly simplified with access to a git gui, for example.

my recommendation is that you submit a new PR from a clean (and up to date) fork of the current the-raspberry-pi-guy:master branch, as follows:

  1. recreate your fork (or reset your current jdarias:master to sync with the current the-raspberry-pi-guy:master branch) and clone it to a different directory on your local machine. if you are not sure about what you are doing, make sure to create a backup of your current local files to prevent you from losing all your work;
  2. create a new local branch to work on your demo (e.g., git checkout -b demo/iphour will create a new branch called demo/iphour and move you there);
  3. make your changes in the new branch instead of master (you can check your current branch with git branch). two commits would be enough for the changes I've seen here: one for the demo_iphour.py itself and another for the documentation (changes in the README.md file). take a moment to learn about writing commit messages;
  4. when done, push your changes to your fork (remote) in a new demo/iphour branch (git push -u origin demo/iphour);
  5. go to your fork gh webpage > demo/iphour branch and then submit a PR to the-raspberry-pi-guy:master from there;
  6. in the new PR, add a description of the additions/removals, and in your case, make reference to this PR (#32) and explain how you addressed each of the comments I left in my first review that still apply to the new files. (you can reference this PR by typing #32.)
cgomesu commented 3 years ago

Please submit a new PR observing the points mentioned before. Closing this one because the author has been inactive for more than a week.