Skip to content

first merge #1

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.

Sign up for GitHub

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

Open
sfuhrer wants to merge 3 commits into
base: master
Choose a base branch
from
Open

first merge #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
715a368
Add files via upload
sfuhrer Mar 21, 2018
47ed42b
Delete water_system_v0_2.ino
sfuhrer Mar 21, 2018
788bd28
Merge branch 'master' into develop
sfuhrer Mar 21, 2018
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
4 changes: 0 additions & 4 deletions water_system_v0_2/water_system_v0_2.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@

//blalballlabaslbfds

//test2

#include <Wire.h>
#include <Adafruit_MotorShield.h>
#include "utility/Adafruit_MS_PWMServoDriver.h"
Expand Down Expand Up @@ -34,8 +32,6 @@ int moistureSensorPin = A0; // select the input pin for the sensor

void setup() {

int a = 0;

Serial.begin(9600);

setTime(16,16,0,7,7,17); // set time to Saturday 8:29:00am Jan 1 2017
Expand Down