Skip to content

Commit eec0451

Browse files
marshalltaylorSFEmarshalltaylorSFE
committed
Testing release version before branch
1 parent 744a026 commit eec0451

File tree

22 files changed

+929
-1191
lines changed

22 files changed

+929
-1191
lines changed

‎IDE_Board_Manager/package_sparkfun_index.json

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,55 @@
199199
],
200200
"toolsDependencies": []
201201
},
202+
{
203+
"name": "SparkFun AVR Boards",
204+
"architecture": "avr",
205+
"version": "1.1.9",
206+
"category": "Contributed",
207+
"url": "https://github.com/sparkfun/Arduino_Boards/raw/LilyProtoBoard/IDE_Board_Manager/sparkfunboards.1.1.9.tar.bz2",
208+
"archiveFileName": "sparkfunboards.1.1.8.tar.bz2",
209+
"checksum": "SHA-256:294E6541434AA567149B9B9F0C5D63329F4E718355E32D9C5BEF4D024AFD9F13",
210+
"size": "1236347",
211+
"help": {
212+
"online": "https://forums.sparkfun.com"
213+
},
214+
"boards": [
215+
{
216+
"name": "RedBoard"
217+
},
218+
{
219+
"name": "MaKey MaKey"
220+
},
221+
{
222+
"name": "Pro Micro"
223+
},
224+
{
225+
"name": "Fio v3"
226+
},
227+
{
228+
"name": "Qduino Mini"
229+
},
230+
{
231+
"name": "Digital Sandbox"
232+
},
233+
{
234+
"name": "Mega Pro"
235+
},
236+
{
237+
"name": "RedBot"
238+
},
239+
{
240+
"name": "Serial 7-segment Display"
241+
},
242+
{
243+
"name": "ATmega128RFA1 Dev Board"
244+
},
245+
{
246+
"name": "LilyPad USB Plus"
247+
}
248+
],
249+
"toolsDependencies": []
250+
},
202251
{
203252
"name": "SparkFun SAMD Boards (dependency: Arduino SAMD Boards 1.6.5)",
204253
"architecture": "samd",

‎IDE_Board_Manager/sparkfunboards.1.1.9.tar.bz2

1.18 MB
Binary file not shown.

‎sparkfun/avr/boards.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,10 +347,10 @@ atmega128rfa1.build.core=arduino:arduino
347347
atmega128rfa1.build.variant=rf128
348348

349349
################################################################################
350-
####################### LilyPad Arduino USB Plus ###############################
350+
############################# LilyPad USB Plus #################################
351351
################################################################################
352352

353-
LilyPadProtoUSB.name=LilyPad Arduino USB Plus
353+
LilyPadProtoUSB.name=LilyPad USB Plus
354354
LilyPadProtoUSB.vid.0=0x1B4F
355355
LilyPadProtoUSB.pid.0=0x0110
356356

@@ -375,7 +375,7 @@ LilyPadProtoUSB.build.mcu=atmega32u4
375375
LilyPadProtoUSB.build.f_cpu=8000000L
376376
LilyPadProtoUSB.build.vid=0x1B4F
377377
LilyPadProtoUSB.build.pid=0x0110
378-
LilyPadProtoUSB.build.usb_product="LilyPad Arduino USB Plus"
378+
LilyPadProtoUSB.build.usb_product="LilyPad USB Plus"
379379
LilyPadProtoUSB.build.board=AVR_LILYPAD_ARDUINO_USB_PLUS_BOARD
380380
LilyPadProtoUSB.build.core=arduino:arduino
381381
LilyPadProtoUSB.build.variant=lilypadusbplus

‎sparkfun/avr/libraries/LilyPadProtoSnapPlus/examples/Buzzer/Buzzer.ino

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
/*
2+
LilyPad ProtoSnap Plus
3+
Buzzer.ino
4+
SparkFun Electronics
5+
https://www.sparkfun.com/products/14346
6+
7+
This is an adaption of the toneMelody example, with only the output pin
8+
changed.
9+
10+
The original code is in the public domain.
11+
12+
http://www.arduino.cc/en/Tutorial/Tone
13+
14+
created 21 Jan 2010
15+
modified 30 Aug 2011
16+
by Tom Igoe
17+
18+
******************************************************************************/
19+
#include "pitches.h"
20+
21+
//Buzzer
22+
#define BZRPIN A3 // Buzzer
23+
24+
// notes in the melody:
25+
int melody[] = {
26+
NOTE_C4, NOTE_G3, NOTE_G3, NOTE_A3, NOTE_G3, 0, NOTE_B3, NOTE_C4
27+
};
28+
29+
// note durations: 4 = quarter note, 8 = eighth note, etc.:
30+
int noteDurations[] = {
31+
4, 8, 8, 4, 4, 4, 4, 4
32+
};
33+
34+
void setup() {
35+
// iterate over the notes of the melody:
36+
for (int thisNote = 0; thisNote < 8; thisNote++) {
37+
38+
// to calculate the note duration, take one second
39+
// divided by the note type.
40+
//e.g. quarter note = 1000 / 4, eighth note = 1000/8, etc.
41+
int noteDuration = 1000 / noteDurations[thisNote];
42+
tone(BZRPIN, melody[thisNote], noteDuration);
43+
44+
// to distinguish the notes, set a minimum time between them.
45+
// the note's duration + 30% seems to work well:
46+
int pauseBetweenNotes = noteDuration * 1.30;
47+
delay(pauseBetweenNotes);
48+
// stop the tone playing:
49+
noTone(BZRPIN);
50+
}
51+
}
52+
53+
void loop() {
54+
// no need to repeat the melody.
55+
}

‎sparkfun/avr/libraries/LilyPadProtoSnapPlus/examples/Buzzer/pitches.h

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
/*************************************************
2+
* Public Constants
3+
*************************************************/
4+
5+
#define NOTE_B0 31
6+
#define NOTE_C1 33
7+
#define NOTE_CS1 35
8+
#define NOTE_D1 37
9+
#define NOTE_DS1 39
10+
#define NOTE_E1 41
11+
#define NOTE_F1 44
12+
#define NOTE_FS1 46
13+
#define NOTE_G1 49
14+
#define NOTE_GS1 52
15+
#define NOTE_A1 55
16+
#define NOTE_AS1 58
17+
#define NOTE_B1 62
18+
#define NOTE_C2 65
19+
#define NOTE_CS2 69
20+
#define NOTE_D2 73
21+
#define NOTE_DS2 78
22+
#define NOTE_E2 82
23+
#define NOTE_F2 87
24+
#define NOTE_FS2 93
25+
#define NOTE_G2 98
26+
#define NOTE_GS2 104
27+
#define NOTE_A2 110
28+
#define NOTE_AS2 117
29+
#define NOTE_B2 123
30+
#define NOTE_C3 131
31+
#define NOTE_CS3 139
32+
#define NOTE_D3 147
33+
#define NOTE_DS3 156
34+
#define NOTE_E3 165
35+
#define NOTE_F3 175
36+
#define NOTE_FS3 185
37+
#define NOTE_G3 196
38+
#define NOTE_GS3 208
39+
#define NOTE_A3 220
40+
#define NOTE_AS3 233
41+
#define NOTE_B3 247
42+
#define NOTE_C4 262
43+
#define NOTE_CS4 277
44+
#define NOTE_D4 294
45+
#define NOTE_DS4 311
46+
#define NOTE_E4 330
47+
#define NOTE_F4 349
48+
#define NOTE_FS4 370
49+
#define NOTE_G4 392
50+
#define NOTE_GS4 415
51+
#define NOTE_A4 440
52+
#define NOTE_AS4 466
53+
#define NOTE_B4 494
54+
#define NOTE_C5 523
55+
#define NOTE_CS5 554
56+
#define NOTE_D5 587
57+
#define NOTE_DS5 622
58+
#define NOTE_E5 659
59+
#define NOTE_F5 698
60+
#define NOTE_FS5 740
61+
#define NOTE_G5 784
62+
#define NOTE_GS5 831
63+
#define NOTE_A5 880
64+
#define NOTE_AS5 932
65+
#define NOTE_B5 988
66+
#define NOTE_C6 1047
67+
#define NOTE_CS6 1109
68+
#define NOTE_D6 1175
69+
#define NOTE_DS6 1245
70+
#define NOTE_E6 1319
71+
#define NOTE_F6 1397
72+
#define NOTE_FS6 1480
73+
#define NOTE_G6 1568
74+
#define NOTE_GS6 1661
75+
#define NOTE_A6 1760
76+
#define NOTE_AS6 1865
77+
#define NOTE_B6 1976
78+
#define NOTE_C7 2093
79+
#define NOTE_CS7 2217
80+
#define NOTE_D7 2349
81+
#define NOTE_DS7 2489
82+
#define NOTE_E7 2637
83+
#define NOTE_F7 2794
84+
#define NOTE_FS7 2960
85+
#define NOTE_G7 3136
86+
#define NOTE_GS7 3322
87+
#define NOTE_A7 3520
88+
#define NOTE_AS7 3729
89+
#define NOTE_B7 3951
90+
#define NOTE_C8 4186
91+
#define NOTE_CS8 4435
92+
#define NOTE_D8 4699
93+
#define NOTE_DS8 4978
94+

‎sparkfun/avr/libraries/LilyPadProtoSnapPlus/examples/Demo/notes.h

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
#ifndef NOTES_H
2+
#define NOTES_H
3+
4+
//Notes as defined by the tone example
5+
6+
#define NOTE_B0 31
7+
#define NOTE_C1 33
8+
#define NOTE_CS1 35
9+
#define NOTE_D1 37
10+
#define NOTE_DS1 39
11+
#define NOTE_E1 41
12+
#define NOTE_F1 44
13+
#define NOTE_FS1 46
14+
#define NOTE_G1 49
15+
#define NOTE_GS1 52
16+
#define NOTE_A1 55
17+
#define NOTE_AS1 58
18+
#define NOTE_B1 62
19+
#define NOTE_C2 65
20+
#define NOTE_CS2 69
21+
#define NOTE_D2 73
22+
#define NOTE_DS2 78
23+
#define NOTE_E2 82
24+
#define NOTE_F2 87
25+
#define NOTE_FS2 93
26+
#define NOTE_G2 98
27+
#define NOTE_GS2 104
28+
#define NOTE_A2 110
29+
#define NOTE_AS2 117
30+
#define NOTE_B2 123
31+
#define NOTE_C3 131
32+
#define NOTE_CS3 139
33+
#define NOTE_D3 147
34+
#define NOTE_DS3 156
35+
#define NOTE_E3 165
36+
#define NOTE_F3 175
37+
#define NOTE_FS3 185
38+
#define NOTE_G3 196
39+
#define NOTE_GS3 208
40+
#define NOTE_A3 220
41+
#define NOTE_AS3 233
42+
#define NOTE_B3 247
43+
#define NOTE_C4 262
44+
#define NOTE_CS4 277
45+
#define NOTE_D4 294
46+
#define NOTE_DS4 311
47+
#define NOTE_E4 330
48+
#define NOTE_F4 349
49+
#define NOTE_FS4 370
50+
#define NOTE_G4 392
51+
#define NOTE_GS4 415
52+
#define NOTE_A4 440
53+
#define NOTE_AS4 466
54+
#define NOTE_B4 494
55+
#define NOTE_C5 523
56+
#define NOTE_CS5 554
57+
#define NOTE_D5 587
58+
#define NOTE_DS5 622
59+
#define NOTE_E5 659
60+
#define NOTE_F5 698
61+
#define NOTE_FS5 740
62+
#define NOTE_G5 784
63+
#define NOTE_GS5 831
64+
#define NOTE_A5 880
65+
#define NOTE_AS5 932
66+
#define NOTE_B5 988
67+
#define NOTE_C6 1047
68+
#define NOTE_CS6 1109
69+
#define NOTE_D6 1175
70+
#define NOTE_DS6 1245
71+
#define NOTE_E6 1319
72+
#define NOTE_F6 1397
73+
#define NOTE_FS6 1480
74+
#define NOTE_G6 1568
75+
#define NOTE_GS6 1661
76+
#define NOTE_A6 1760
77+
#define NOTE_AS6 1865
78+
#define NOTE_B6 1976
79+
#define NOTE_C7 2093
80+
#define NOTE_CS7 2217
81+
#define NOTE_D7 2349
82+
#define NOTE_DS7 2489
83+
#define NOTE_E7 2637
84+
#define NOTE_F7 2794
85+
#define NOTE_FS7 2960
86+
#define NOTE_G7 3136
87+
#define NOTE_GS7 3322
88+
#define NOTE_A7 3520
89+
#define NOTE_AS7 3729
90+
#define NOTE_B7 3951
91+
#define NOTE_C8 4186
92+
#define NOTE_CS8 4435
93+
#define NOTE_D8 4699
94+
#define NOTE_DS8 4978
95+
96+
#endif

‎sparkfun/avr/libraries/LilyPadProtoSnapPlus/examples/Demo/timeKeeper.cpp

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
//**********************************************************************//
2+
//
3+
// MIT License: http://opensource.org/licenses/MIT
4+
//
5+
// Written by: Marshall Taylor
6+
// Changelog (YYYY/MM/DD):
7+
// 2015/6/26: Created
8+
// 2015/10/08: Initial Release
9+
//
10+
//**********************************************************************//
11+
12+
//Includes
13+
#include "timeKeeper.h"
14+
15+
#define MAXTIME 60000
16+
17+
//**********************************************************************//
18+
//
19+
// Time Keeper
20+
// Keeps time in number of milliseconds
21+
//
22+
//**********************************************************************//
23+
TimeKeeper::TimeKeeper( void )
24+
{
25+
timeElapsed = 0;
26+
27+
}
28+
29+
void TimeKeeper::mClear( void )
30+
{
31+
timeElapsed = 0;
32+
33+
}
34+
35+
uint16_t TimeKeeper::mGet( void )
36+
{
37+
return timeElapsed;
38+
}
39+
40+
void TimeKeeper::mIncrement( uint8_t var_Increment )
41+
{
42+
//clamp it.
43+
if( timeElapsed < MAXTIME )
44+
{
45+
timeElapsed += var_Increment;
46+
}
47+
}

0 commit comments

Comments
 (0)