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

Update pin names #2135

Merged
merged 17 commits into from
Oct 12, 2020
Merged

Update pin names #2135

merged 17 commits into from
Oct 12, 2020

Conversation

CodeWithSouma
Copy link
Member

Update pin names, Fix #2133

Changed all instances of

ID1/2/3/4 -> LA1/2/3/4
SEN -> RES
AN8 -> VOL
CNTR -> FRQ
W1/2 -> SI1/2

@bessman
Copy link
Contributor

bessman commented Oct 6, 2020

You have a lot of false matches for the SEN -> RES pin change. Revert all changes related to SENSOR and SEND.

Copy link
Collaborator

@CloudyPadmal CloudyPadmal left a comment

Choose a reason for hiding this comment

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

Did you just find and replaced the letters?

Copy link
Contributor

@bessman bessman left a comment

Choose a reason for hiding this comment

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

Revert all binary files (jpegs and pngs).

Copy link
Collaborator

@CloudyPadmal CloudyPadmal left a comment

Choose a reason for hiding this comment

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

  1. Revert the *.png images back
  2. Squash the commits into one (https://github.com/fossasia/pslab-android#how-to-git-squash)

@CloudyPadmal CloudyPadmal added the Enhancement Improvement to an existing feature label Oct 7, 2020
@CodeWithSouma
Copy link
Member Author

  1. Revert the *.png images back
  2. Squash the commits into one (https://github.com/fossasia/pslab-android#how-to-git-squash)

sir please check it. I refactor the code as you want.

Copy link
Contributor

@bessman bessman left a comment

Choose a reason for hiding this comment

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

When reverting the PNGs you also reverted W1->SI1 and W2->SI2. Please reapply that part.

You appear to have applied your squash on top of the existing commits instead of replacing them. After a successful squash, the pull request should contain only one commit. Please try again.

@CodeWithSouma
Copy link
Member Author

When reverting the PNGs you also reverted W1->SI1 and W2->SI2. Please reapply that part.

You appear to have applied your squash on top of the existing commits instead of replacing them. After a successful squash, the pull request should contain only one commit. Please try again.

can you give me some easy trick to refactor w1 to s1 and w2 to s2.

@CodeWithSouma CodeWithSouma requested a review from bessman October 7, 2020 16:03
@bessman
Copy link
Contributor

bessman commented Oct 7, 2020

can you give me some easy trick to refactor w1 to s1 and w2 to s2.

grep for W1/2 and change to SI1/2 where applicable.

@CloudyPadmal
Copy link
Collaborator

Hello @CodeWithSouma , any update on this PR?

@CodeWithSouma
Copy link
Member Author

@bessman @CloudyPadmal
Sir please checkout my PR. I also applied squash it works locally but when i push the code in remote it not work please help me how to squash all commit into one.

Copy link
Contributor

@bessman bessman left a comment

Choose a reason for hiding this comment

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

Looks good to me. Don't worry about squashing, we can do that when we merge.

@CloudyPadmal CloudyPadmal merged commit 85fbd86 into fossasia:development Oct 12, 2020
@CloudyPadmal
Copy link
Collaborator

@CodeWithSouma once you squashed, the git history changes in local. So you have to make a force push.

@CodeWithSouma CodeWithSouma deleted the update-pin branch October 17, 2020 13:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement Improvement to an existing feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update pin names
3 participants