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

Split main.cpp in cloud.cpp #9

Open
wants to merge 7 commits into
base: Cloud_testing
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
82 changes: 77 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,77 @@
logs/**
nvm.dat
OpenSprinkler
wtopts.txt
stns.dat
# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# =========================
# Operating System Files
# =========================

# OSX
# =========================

.DS_Store
.AppleDouble
.LSOverride

# Icon must ends with two \r.
Icon

# Thumbnails
._*

# Files that might appear on external disk
.Spotlight-V100
.Trashes

#Visual Studio files
*.[Oo]bj
*.user
*.aps
*.pch
*.vspscc
*.vssscc
*_i.c
*_p.c
*.ncb
*.suo
*.tlb
*.tlh
*.bak
*.[Cc]ache
*.ilk
*.log
*.sbr
*.sdf
*.pyc
*.xml
*.sln
*.elf
*.bin
*.ino.elf
*.ino.bin
*.cpp.o
*.buildinfo
*.vcxproj
*.vcxproj.filters
x64/Release*/*
x64/Debug*/*
ipch/
obj/*
_vm/*
__vm/
.vs/*
[Bb]in*/
[Dd]ebug*/
[Rr]elease*/
Expand Down
Binary file added Documents/SG_Alarm&Flow_v4.pdf
Binary file not shown.
2 changes: 1 addition & 1 deletion EtherCard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
//
// 2010-05-19 <[email protected]>

#include <EtherCard.h>
#include "EtherCard.h"
#include <stdarg.h>
#include <avr/eeprom.h>

Expand Down
1 change: 1 addition & 0 deletions OpenSprinkler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1195,6 +1195,7 @@ void httpget_callback(byte status, uint16_t off, uint16_t len) {
* The remote controller is assumed to have the same
* password as the main controller
*/

void OpenSprinkler::switch_remotestation(RemoteStationData *data, bool turnon) {
#if defined(ARDUINO)
// construct string
Expand Down
2 changes: 1 addition & 1 deletion mainArduino.ino → SG21.ino
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
* <http://www.gnu.org/licenses/>.
*/

#include <OpenSprinkler.h>
#include "OpenSprinkler.h"

extern OpenSprinkler os;

Expand Down
Loading