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
Open
Changes from 1 commit
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
34500c3
added demo link
vinitshahdeo Feb 19, 2020
3ade805
changed the footer code-snippet
vinitshahdeo Feb 19, 2020
2fb7313
improved the footer code-snippet
vinitshahdeo Feb 19, 2020
74e14dc
updated the code-snippet at footer, missing braces
vinitshahdeo Feb 20, 2020
7a716f4
fixed grammatical typo
vinitshahdeo Feb 22, 2020
c299e79
Create weekly-digest.yml
vinitshahdeo Feb 24, 2020
904ade7
Create auto_assign.yml
vinitshahdeo Feb 24, 2020
7ae578b
Format 904ade7
Feb 24, 2020
c15e42f
Added FAQs and resources
PragatiVerma18 Feb 27, 2020
e5564e6
fixed markdown
PragatiVerma18 Feb 27, 2020
78bfcaa
Merge pull request #22 from PragatiVerma18/feature/documentation
vinitshahdeo Feb 27, 2020
b92a972
beautified README.md
vinitshahdeo Feb 27, 2020
66ac761
made the ques italics
vinitshahdeo Feb 27, 2020
6a42090
changed heading style
vinitshahdeo Feb 27, 2020
bd9009c
changed heading style for issues section
vinitshahdeo Feb 27, 2020
4fbc4d4
added mentor's list
vinitshahdeo Feb 27, 2020
0f8c088
Added gssoc logo
vinitshahdeo Feb 27, 2020
26cd921
Merge pull request #23 from vinitshahdeo/feature/documentation
vinitshahdeo Feb 27, 2020
e533864
added closed PR badge + changed section name
vinitshahdeo Feb 27, 2020
6b202d0
added branching rules
vinitshahdeo Feb 27, 2020
685481c
renamed important resources to useful resources
vinitshahdeo Feb 27, 2020
5588d77
added hall of fame
vinitshahdeo Feb 27, 2020
95ad515
added admin pic
vinitshahdeo Feb 27, 2020
a07944d
added admin info
vinitshahdeo Feb 27, 2020
94e8580
added link to admin's pic
vinitshahdeo Feb 27, 2020
0efb0ce
added missing mentor's info
vinitshahdeo Feb 27, 2020
2def85b
Merge pull request #24 from vinitshahdeo/feature/documentation
vinitshahdeo Feb 27, 2020
f17453d
added new mentor's name
vinitshahdeo Feb 28, 2020
3f44799
added link to resources for node.js
vinitshahdeo Feb 28, 2020
177bf01
Merge pull request #28 from vinitshahdeo/feature/documentation
vinitshahdeo Feb 28, 2020
0c72177
added gssoc labels
vinitshahdeo Mar 2, 2020
f527e36
added gssoc label
vinitshahdeo Mar 2, 2020
42d5e87
added first-timers-only issues link
vinitshahdeo Mar 2, 2020
13064cc
Merge pull request #79 from vinitshahdeo/feature/documentation
vinitshahdeo Mar 2, 2020
11923d0
Added open source programs
vinitshahdeo Mar 2, 2020
4584ed9
changed the link to JWOC
vinitshahdeo Mar 2, 2020
142a6a4
Merge pull request #88 from vinitshahdeo/feature/documentation
vinitshahdeo Mar 2, 2020
506a94d
added first-timers friendly badge
vinitshahdeo Mar 3, 2020
7a84c1e
added new mentor's details
vinitshahdeo Mar 7, 2020
64e53f2
Format 7a84c1e
Mar 7, 2020
61f714f
fixed italics issue in FAQs section
vinitshahdeo Mar 7, 2020
3108c24
Format 61f714f
Mar 7, 2020
0c2a1c3
fixed font weight issue
vinitshahdeo Mar 7, 2020
d1e9c19
Format 0c2a1c3
Mar 7, 2020
0cc49ee
removed extra *
vinitshahdeo Mar 7, 2020
e645f24
added rgsoc snippet
vinitshahdeo Mar 7, 2020
9c519fa
Format e645f24
Mar 7, 2020
cc3e742
Format #134
Mar 7, 2020
327c842
Format #134
Mar 7, 2020
546ca41
fixed issues in .md rendering
vinitshahdeo Mar 7, 2020
a11411a
added a snippet for rgsoc
vinitshahdeo Mar 7, 2020
75db82e
added info+logo for RGSOC
vinitshahdeo Mar 7, 2020
7994fe4
added link to tweet
vinitshahdeo Mar 7, 2020
4120feb
Merge pull request #140 from vinitshahdeo/docs/rgsoc-1
vinitshahdeo Mar 7, 2020
6cd2c9e
added link to RGSoC issue
vinitshahdeo Mar 7, 2020
d1562e1
added rgsoc logo
vinitshahdeo Mar 8, 2020
a7aca67
added rgsoc logo
vinitshahdeo Mar 8, 2020
c23264f
added link to rgsoc issue
vinitshahdeo Mar 8, 2020
68bdd1f
added links to hall of fame badge
Mar 15, 2020
2ce60dd
updated COVID-19 precautions
vinitshahdeo Mar 21, 2020
42402e5
added a note on COVID-19
vinitshahdeo Mar 21, 2020
721ba91
added "Avoid Handshakes, Do Namastey" note
vinitshahdeo Mar 21, 2020
e2df897
Update
goyalmuskan Mar 22, 2020
c66c1b5
Update
goyalmuskan Mar 22, 2020
1924365
Merge pull request #210 from goyalmuskan/readme
vinitshahdeo Mar 22, 2020
7832b88
added a code-snippet for COVID-19
vinitshahdeo Mar 24, 2020
4cb12cb
added emojis
vinitshahdeo Mar 24, 2020
8326405
prettified the COVID-19 section
vinitshahdeo Mar 24, 2020
c3e9b56
added link to linkedin
vinitshahdeo Mar 24, 2020
1554a82
added coivd-19 webapp link
vinitshahdeo Mar 31, 2020
a19d055
updated the COVID-19 Tracker Link
vinitshahdeo Apr 18, 2020
07b63b9
added a new mentor for documentation
vinitshahdeo May 18, 2020
769f5ad
added code helpers badge
vinitshahdeo May 20, 2020
d0c596c
Add new mentor for UI/UX
divyabhushan May 23, 2020
d42e116
Added new mentor details
goyalmuskan May 25, 2020
73a0b13
Merge pull request #272 from goyalmuskan/readme
vinitshahdeo May 25, 2020
2336d5d
Git workflow steps to take before creating a PR
divyabhushan May 27, 2020
e3903a6
minor fix in COVID-19 section
vinitshahdeo May 31, 2020
a72bbc5
:tada: part of Student Code In now
vinitshahdeo Jun 7, 2020
01fa835
Added a section for articles on GSSoC.
Kashish121 Jun 9, 2020
ad64b0e
Merge pull request #317 from Kashish121/master
vinitshahdeo Jun 9, 2020
b377822
rgsoc_teams details added
ishika1727 Jun 16, 2020
d410680
rgsoc_teams updated
ishika1727 Jun 16, 2020
95b34cc
rgsoc_teams updated list
ishika1727 Jun 16, 2020
9d93a01
rgsoc_teams list
ishika1727 Jun 16, 2020
8fcefe4
rgsoc_teams indentation
ishika1727 Jun 16, 2020
7cca0bd
Merge pull request #319 from ishika1727/feature/rgsoc_teams
vinitshahdeo Jun 16, 2020
5082f50
added list of other projects
vinitshahdeo Jun 28, 2020
2897fa5
added link to other projects
vinitshahdeo Jun 28, 2020
5e4dcd7
PPT for roadmap
vinitshahdeo Jul 1, 2020
a48db41
added leapcode label
vinitshahdeo Jul 3, 2020
2a5ee1b
:pencil: Add Backend Session PPT in PDF
ArpitKotecha Jul 7, 2020
7648754
IoT_Session_1
roypratik Jul 16, 2020
e461577
Added mentor for IoT
vinitshahdeo Jul 16, 2020
9d99ce2
Merge branch 'master' of https://github.com/vinitshahdeo/Water-Monito…
roypratik Jul 16, 2020
4722704
IoT_Session_2
roypratik Jul 19, 2020
9afa0ac
added new React mentors
vinitshahdeo Aug 25, 2020
7d21d7d
Update README.md
harshita19244 Aug 28, 2020
30e4c63
Wireframes added
nandikajain Aug 29, 2020
8007650
Hacktober Logo Added
nandikajain Sep 13, 2020
7521e42
Hacktoberfest update
nandikajain Sep 13, 2020
4eb9493
Merge pull request #334 from vinitshahdeo/feature/hacktoberfest
vinitshahdeo Sep 13, 2020
dc36631
updated comments
vinitshahdeo Sep 25, 2020
09cb2f9
fixed typo
vinitshahdeo Sep 25, 2020
c77089c
updated issue label
vinitshahdeo Sep 25, 2020
fcc8847
updated PR welcome comment
vinitshahdeo Sep 25, 2020
2d65d41
fixes in Readme
nandikajain Oct 11, 2020
4bd6852
added SWoC to the list of open-source programs
vinitshahdeo Dec 27, 2020
0fc9802
Update demo.html
aryan040501 Dec 28, 2020
b207a15
added pH and turbidity checker
aryan040501 Jan 8, 2021
2e81874
reverted to original
aryan040501 Jan 16, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
reverted to original
  • Loading branch information
aryan040501 committed Jan 16, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 2e81874f85a0d0beeec7f6690a51ea570e2971af
30 changes: 3 additions & 27 deletions src/demo.html
Original file line number Diff line number Diff line change
@@ -38,32 +38,8 @@ <h1>Water Tanks</h1>
<script src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
<script type="text/javascript" src="lib/createWaterBall-jquery.js"></script>
<script>

//phcheck
pHlevelCheck(5, 6);
pHlevelCheck(7, 4);
pHlevelCheck(8, 5.1 );
pHlevelCheck(7, 0.8);

//function to check ph and turbidity
function pHlevelCheck(pH, turbidity){
if((pH<6.5||pH>7.5) && turbidity>50){
console.log("Unsafe to Drink");
}
else if((pH>6.5&&pH<7.5) && (turbidity>20 && turbidity<50)){
console.log("Safe limit to Drink");
}
else if((pH>6.5&&pH<7.5) && (turbidity<20)){
console.log("Healthy Water");
}
else{
console.log("unable to check");
}
}


$(".demo").createWaterBall({
targetRange: 100
targetRange: 90
});

var loadingEle = $(".loading");
@@ -84,8 +60,8 @@ <h1>Water Tanks</h1>
targetRange: 70
});
setTimeout(function() {
$(".loading").createWaterBall("updateRange", 60);
}, 0);
$(".loading").createWaterBall("updateRange", 80);
}, 1000);
$(".waterBall1").createWaterBall({
csv_config: {
width: $(".waterBall1").width(),
4 changes: 0 additions & 4 deletions src/lib/createWaterBall-jquery.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@





(function($){

function drawSin(xOffset,color1,color2){