Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 27e6e8c

Browse filesBrowse files
committed
Merge remote-tracking branch 'arduino/master'
2 parents d457332 + f56b982 commit 27e6e8c
Copy full SHA for 27e6e8c

File tree

Expand file treeCollapse file tree

1 file changed

+8
-14
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+8
-14
lines changed

‎libraries/Esplora/examples/EsploraTable/EsploraTable.ino

Copy file name to clipboardExpand all lines: libraries/Esplora/examples/EsploraTable/EsploraTable.ino
+8-14Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
/*
22
Esplora Table
33
4-
Acts like a keyboard that prints some of its sensors'
4+
Acts like a keyboard that prints sensor
55
data in a table-like text, row by row.
6-
It is a sort of "data-logger".
76
8-
At startup, it does nothing. It just waits for you to open a
9-
spreadsheet (e.g. Google Drive spreadsheet) so it can put its
10-
data. Then, by pressing Switch 1, it starts printing the table
7+
At startup, it does nothing. It waits for you to open a
8+
spreadsheet (e.g. Google Drive spreadsheet) so it can write
9+
data. By pressing Switch 1, it starts printing the table
1110
headers and the first row of data. It waits a bit, then it
1211
will print another row, and so on.
1312
14-
The amount of time between each row is given by the slider.
13+
The amount of time between each row is determined by the slider.
1514
If put to full left, the sketch will wait 10 seconds; at
1615
full right position, it will wait 5 minutes. An intermediate
1716
position will make the sketch wait for some time in-between.
@@ -175,17 +174,12 @@ void logAndPrint() {
175174
}
176175

177176
/**
178-
* Similar to delay(), but allows to do something else
179-
* in the meanwhile. In particular, it calls waitLoop().
177+
* Similar to delay(), but allows the program to do something else
178+
* in the meanwhile. In particular, it calls checkSwitchPress().
180179
* Note 1: it may wait longer than the specified amount, not less;
181180
* Note 2: beware of data synchronization issues, e.g. if the
182-
* whileWaiting() function alters some variables used by the
181+
* activeDelay() function alters some variables used by the
183182
* caller of this function.
184-
*
185-
* I discovered by chance that there's an ongoing discussion about
186-
* adding yield() in the Arduino API:
187-
* http://comments.gmane.org/gmane.comp.hardware.arduino.devel/1381
188-
* The purpose is the same, but for now I'm using this implementation.
189183
*/
190184
void activeDelay(unsigned long amount) {
191185
unsigned long at = millis() + amount;

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.