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

Added pH and turbidity sensors to ensure safe drinking water. #320 #372

Open
wants to merge 111 commits into
base: develop
Choose a base branch
from

Conversation

aryan040501
Copy link

@aryan040501 aryan040501 commented Jan 8, 2021

Description

Added pH and turbidity checker for issue no #320
added arduino and nodeMCU files and also created a reference script in demo.html which only console.logs the result

Fixes # (issue)
fixes the issue #320

Type of change

Please delete options that are not relevant.

  • New feature (non-breaking change which adds functionality)

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • Any dependent changes have been merged and published in downstream modules

Reviewer: Vinit Shahdeo

@welcome
Copy link

welcome bot commented Jan 8, 2021

Thanks for opening this pull request! 🤗
Wishing you a great Hacktoberfest 2020 🙌 🎉 ⚡️
Are you looking for more beginner-friendly issues? Check out this repo.

Hacktoberfest2020

📢 Spread the word about @vinitshahdeo/Hacktoberfest2020 repo across your social media channels to help get others involved! Give a shoutout to DEV article. Retweet this.

Open Source Love

Check out few other repos below 🚀

PortScanner
SimpleBio
HBD
Map Of India

Show some ❤️

  • Consider leaving a ⭐ here.
  • Check out more beginner-friendly repos here.
  • Follow @vinitshahdeo for more updates.
  • Read my open-source journey here.

Say Hi on Twitter! 👋

Twitter Follow

PS: Please add @vinitshahdeo as a reviewer if you haven't added.

@aryan040501 aryan040501 changed the title Aryaman Added pH and turbidity sensors to ensure safe drinking water. #320 Jan 8, 2021
Copy link
Contributor

@nandikajain nandikajain 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 please send the PR to the develop branch?

@aryan040501 aryan040501 changed the base branch from master to develop January 14, 2021 11:21
Copy link
Author

@aryan040501 aryan040501 left a comment

Choose a reason for hiding this comment

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

I have changed to merge with develop

@aryan040501
Copy link
Author

@nandikajain I don't understand the conflicts!

The above conflicting files were not changed by me, I had only added a sample function in home.html and that was also only printing in the console. I removed that too but still there is conflict showing.

Could you please re-review.

@nandikajain
Copy link
Contributor

@nandikajain I don't understand the conflicts!

The above conflicting files were not changed by me, I had only added a sample function in home.html and that was also only printing in the console. I removed that too but still there is conflict showing.

Could you please re-review.

I do not review the PR's for IoT. I review for the frontend. I will tag the concerned person! Hope that helps. @roypratik

@aryan040501
Copy link
Author

aryan040501 commented Jan 22, 2021

@nandikajain I don't understand the conflicts!
The above conflicting files were not changed by me, I had only added a sample function in home.html and that was also only printing in the console. I removed that too but still there is conflict showing.
Could you please re-review.

I do not review the PR's for IoT. I review for the frontend. I will tag the concerned person! Hope that helps. @roypratik

@nandikajain

Could you please ask the concerned person to review it. I wanted to do multiple PR in SWOC 20!

@nandikajain
Copy link
Contributor

@nandikajain I don't understand the conflicts!
The above conflicting files were not changed by me, I had only added a sample function in home.html and that was also only printing in the console. I removed that too but still there is conflict showing.
Could you please re-review.

I do not review the PR's for IoT. I review for the frontend. I will tag the concerned person! Hope that helps. @roypratik

@nandikajain

Could you please ask the concerned person to review it. I wanted to do multiple PR in SWOC 20!

@roypratik

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet