tm3d
/
owTools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARDUINO as Master
[owTools.git]
/
src
/
main.cpp
diff --git
a/src/main.cpp
b/src/main.cpp
index
b629617
..
c36dd88
100755
(executable)
--- a/
src/main.cpp
+++ b/
src/main.cpp
@@
-412,6
+412,12
@@
int main(int argc, char *argv[]) {
printf("Open /dev/ttyS%i\n",port);
owi->InitAdapter(port);
} else
printf("Open /dev/ttyS%i\n",port);
owi->InitAdapter(port);
} else
+ if(adapter.find("ARDUINO")!=std::string::npos) {
+ owi=new owARDUINOInterface();
+ int port=atoi(adapter.substr(adapter.find("ARDUINO")+7).c_str());
+ printf("Open /dev/ttyS%i\n",port);
+ owi->InitAdapter(port);
+ } else
if(adapter.find("USB")!=std::string::npos) {
owi=new owUSBInterface();
int port=atoi(adapter.substr(adapter.find("USB")+3).c_str());
if(adapter.find("USB")!=std::string::npos) {
owi=new owUSBInterface();
int port=atoi(adapter.substr(adapter.find("USB")+3).c_str());
@@
-439,11
+445,13
@@
int main(int argc, char *argv[]) {
}
}
if (owi==NULL) {
}
}
if (owi==NULL) {
+ printf("No 1-Wiremaster found\n");
return 0;
}
setLogMode();
return 0;
}
setLogMode();
-
+
+
if (getArg("i")=="1") {
interactive(owi);
if (getArg("i")=="1") {
interactive(owi);