Skip to content

Commit abfbb9e

Browse files
author
ponty
committed
Merge branch 'provideyourown-master'
2 parents 5415ff1 + 1cb6a4f commit abfbb9e

5 files changed

+26
-12
lines changed

Nanpy/BaseClass.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace nanpy {
2626
if (strcmp(m->getName(), "remove") == 0) {
2727
delete(v[m->getObjectId()]);
2828
v.remove(m->getObjectId());
29-
Serial.println("0");
29+
COMM_SERIAL.println("0");
3030
}
3131
}
3232

Nanpy/ComChannel.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ void readLineFromSerial(char* extbuff) {
142142
char ch = '0';
143143
char* buff = nanpy::ComChannel::read_buffer;
144144
do {
145-
ch = Serial.read();
145+
ch = COMM_SERIAL.read();
146146
if(ch < 255 && ch >= 0) {
147147
buff[i++] = ch;
148148
}
@@ -155,46 +155,46 @@ void readLineFromSerial(char* extbuff) {
155155
};
156156

157157
bool nanpy::ComChannel::available() {
158-
if (Serial.available() > 0)
158+
if (COMM_SERIAL.available() > 0)
159159
return true;
160160
else
161161
return false;
162162
}
163163

164164
void nanpy::ComChannel::connect() {
165-
Serial.begin(BAUDRATE);
165+
COMM_SERIAL.begin(BAUDRATE);
166166
}
167167

168168
void nanpy::ComChannel::println(String& val) {
169-
Serial.println(val);
169+
COMM_SERIAL.println(val);
170170
}
171171

172172
void nanpy::ComChannel::println(const char* val) {
173-
Serial.println(val);
173+
COMM_SERIAL.println(val);
174174
}
175175

176176
void nanpy::ComChannel::println(int val) {
177-
Serial.println(val);
177+
COMM_SERIAL.println(val);
178178
}
179179

180180
void nanpy::ComChannel::println(unsigned int val) {
181-
Serial.println(val);
181+
COMM_SERIAL.println(val);
182182
}
183183

184184
void nanpy::ComChannel::println(float val) {
185-
Serial.println(val);
185+
COMM_SERIAL.println(val);
186186
}
187187

188188
void nanpy::ComChannel::println(double val) {
189-
Serial.println(val);
189+
COMM_SERIAL.println(val);
190190
}
191191

192192
void nanpy::ComChannel::println(long val) {
193-
Serial.println(val);
193+
COMM_SERIAL.println(val);
194194
}
195195

196196
void nanpy::ComChannel::println(unsigned long val) {
197-
Serial.println(val);
197+
COMM_SERIAL.println(val);
198198
}
199199

200200
void nanpy::ComChannel::readLine(char* extbuff) {

Nanpy/MethodDescriptor.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,14 @@ void nanpy::MethodDescriptor::returns(const char* val) {
9494
ComChannel::println(val);
9595
}
9696

97+
void nanpy::MethodDescriptor::returns(char val) {
98+
ComChannel::println(val);
99+
}
100+
101+
void nanpy::MethodDescriptor::returns(unsigned char val) {
102+
ComChannel::println(val);
103+
}
104+
97105
void nanpy::MethodDescriptor::returns(int val) {
98106
ComChannel::println(val);
99107
}

Nanpy/MethodDescriptor.h

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ namespace nanpy {
3030
char* getName();
3131
void returns(String& val);
3232
void returns(const char* val);
33+
void returns(char val);
34+
void returns(unsigned char val);
3335
void returns(int val);
3436
void returns(unsigned int val);
3537
void returns(float val);

Nanpy/cfg_defaults.h

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
// All these settings can be overwritten in cfg.h
66

7+
#ifndef COMM_SERIAL
8+
# define COMM_SERIAL Serial
9+
#endif
10+
711
#ifndef USE_WIFI_CONNECTION
812
# define USE_WIFI_CONNECTION 0
913
#endif

0 commit comments

Comments
 (0)