Skip to content

Commit bf98153

Browse files
committed
Resolved merge conflict, updated compiled Aurora.hex.
2 parents 845f2e4 + 5c8322b commit bf98153

File tree

4 files changed

+8657
-8429
lines changed

4 files changed

+8657
-8429
lines changed

Aurora.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<AdditionalIncludeDirectories>C:\Program Files (x86)\Arduino\hardware\teensy\cores\teensy3;C:\Program Files (x86)\Arduino\hardware\teensy\cores\teensy3\utils;C:\Program Files (x86)\Arduino\hardware\teensy\cores\teensy3\avr;C:\Users\Jason\Documents\Arduino\aurora-github\Aurora;C:\Users\Jason\Documents\Arduino\libraries\FastLED;C:\Users\Jason\Documents\Arduino\libraries\FastLED\utility;C:\Program Files (x86)\Arduino\libraries\IRremote;C:\Program Files (x86)\Arduino\libraries\IRremote\utility;C:\Program Files (x86)\Arduino\libraries\SPI;C:\Program Files (x86)\Arduino\libraries\SPI\utility;C:\Program Files (x86)\Arduino\libraries\SD;C:\Program Files (x86)\Arduino\libraries\SD\utility;C:\Program Files (x86)\Arduino\libraries\Wire;C:\Program Files (x86)\Arduino\libraries\Wire\utility;C:\Program Files (x86)\Arduino\libraries\Time;C:\Program Files (x86)\Arduino\libraries\Time\utility;C:\Program Files (x86)\Arduino\libraries\DS1307RTC;C:\Program Files (x86)\Arduino\libraries\DS1307RTC\utility;C:\Users\Jason\Documents\Arduino\libraries\aJson;C:\Users\Jason\Documents\Arduino\libraries\aJson\utility;C:\Users\Jason\Documents\Arduino\libraries\SmartMatrix;C:\Users\Jason\Documents\Arduino\libraries\SmartMatrix\utility;C:\Program Files (x86)\Arduino\libraries;C:\Program Files (x86)\Arduino\hardware\teensy\libraries;C:\Program Files (x86)\Visual Micro\Visual Micro for Arduino\Micro Platforms\default\debuggers;C:\Users\Jason\Documents\Arduino\libraries;C:\Program Files (x86)\Arduino\hardware\tools\arm-none-eabi\arm-none-eabi\include;C:\Program Files (x86)\Arduino\hardware\tools\arm-none-eabi\arm-none-eabi\include;C:\Program Files (x86)\Arduino\hardware\tools\arm-none-eabi\lib\gcc\arm-none-eabi\4.7.2\include;C:\Program Files (x86)\Arduino\hardware\tools\arm-none-eabi\lib\gcc\arm-none-eabi\4.7.2\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
4848
<ForcedIncludeFiles>C:\Users\Jason\Documents\Arduino\aurora-github\Aurora\Visual Micro\.Aurora.vsarduino.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
4949
<IgnoreStandardIncludePath>true</IgnoreStandardIncludePath>
50-
<PreprocessorDefinitions>ARDUINO=106;ARDUINO_MAIN;__AVR__;__avr__;F_CPU=48000000;USB_SERIAL;LAYOUT_US_ENGLISH;__cplusplus;GCC_VERSION=40301;ARDUINO_ARCH_AVR;ARDUINO_AVR_TEENSY31;__MK20DX256__;TEENSYDUINO=120;%(PreprocessorDefinitions)</PreprocessorDefinitions>
50+
<PreprocessorDefinitions>ARDUINO=106;ARDUINO_MAIN;__AVR__;__avr__;F_CPU=96000000;USB_SERIAL;LAYOUT_US_ENGLISH;__cplusplus;GCC_VERSION=40702;ARDUINO_ARCH_AVR;ARDUINO_AVR_TEENSY31;__MK20DX256__;TEENSYDUINO=120;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5151
</ClCompile>
5252
<Link>
5353
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -169,6 +169,7 @@
169169
</ClInclude>
170170
<ClInclude Include="StreamingMode.h" />
171171
<ClInclude Include="Vector.h" />
172+
<ClInclude Include="Visual Micro\.Aurora.vsarduino.h" />
172173
</ItemGroup>
173174
<ItemGroup>
174175
<Text Include="LICENSE.txt" />

README.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,18 @@ Demo Video
1919

2020
[![Aurora Demo Video](http://img.youtube.com/vi/dRn1rFWGPWk/0.jpg)](http://www.youtube.com/watch?v=dRn1rFWGPWk)
2121

22+
Installation
23+
------------
24+
See [Installation](https://github.com/pixelmatix/aurora/wiki/Installation) in the [Aurora Wiki] for instructions on how to load the pre-compiled Aurora program onto the Teensy 3.1
25+
26+
See [Compiling](https://github.com/pixelmatix/aurora/wiki/Compiling) in the [Aurora Wiki] for instructions on how setup the Arduino IDE and all the libraries that are needed to compile Aurora.
27+
28+
2229
More Information
2330
----------------
2431

25-
* [Aurora Project] on GitHub for source code
2632
* [Aurora Wiki] on GitHub for documentation
33+
* [Aurora Project] on GitHub for source code
2734
* [Aurora Issue Tracker] on GitHub for reporting issues
2835
* [SmartMatrix User Community] on Google+ to ask questions, share your work, ideas, etc
2936

@@ -96,4 +103,4 @@ Thanks to these fine game companies for allowing us to use and distribute their
96103
[Tiny Barbarian]:http://www.tinybarbarian.com/
97104
[StarQuail Games]:http://www.starquail.com/
98105
[Chasm]:http://chasmgame.com/
99-
[Discord Games]:http://discordgames.com/
106+
[Discord Games]:http://discordgames.com/

Visual Micro/.Aurora.vsarduino.h

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
/*
2+
Editor: http://www.visualmicro.com
3+
visual micro and the arduino ide ignore this code during compilation. this code is automatically maintained by visualmicro, manual changes to this file will be overwritten
4+
the contents of the Visual Micro sketch sub folder can be deleted prior to publishing a project
5+
all non-arduino files created by visual micro and all visual studio project or solution files can be freely deleted and are not required to compile a sketch (do not delete your own code!).
6+
note: debugger breakpoints are stored in '.sln' or '.asln' files, knowledge of last uploaded breakpoints is stored in the upload.vmps.xml file. Both files are required to continue a previous debug session without needing to compile and upload again
7+
8+
Hardware: Teensy 3.1, Platform=avr, Package=teensy
9+
*/
10+
11+
#ifndef _VSARDUINO_H_
12+
#define _VSARDUINO_H_
13+
#define ARDUINO 106
14+
#define ARDUINO_MAIN
15+
#define __AVR__
16+
#define __avr__
17+
#define F_CPU 96000000
18+
#define USB_SERIAL
19+
#define LAYOUT_US_ENGLISH
20+
#define __cplusplus
21+
#define GCC_VERSION 40702
22+
#define ARDUINO_ARCH_AVR
23+
#define ARDUINO_AVR_TEENSY31
24+
#define __MK20DX256__
25+
#define TEENSYDUINO 120
26+
#define __extension__
27+
#define __attribute__(x)
28+
typedef void *__builtin_va_list;
29+
30+
#define __extension__
31+
#define __ATTR_PURE__
32+
#define __ATTR_CONST__
33+
#define __inline__
34+
#define __asm__
35+
#define __volatile__
36+
37+
#define NEW_H
38+
//#undef F
39+
//extern char F(const char*);
40+
41+
42+
extern int ffs (int __val) __ATTR_CONST__;
43+
extern int ffsl (long __val) __ATTR_CONST__;
44+
extern int ffsll (long long __val) __ATTR_CONST__;
45+
extern void *memccpy(void *, const void *, int, size_t);
46+
extern void *memchr(const void *, int, size_t) __ATTR_PURE__;
47+
extern int memcmp(const void *, const void *, size_t) __ATTR_PURE__;
48+
extern void *memcpy(void *, const void *, size_t);
49+
extern void *memmem(const void *, size_t, const void *, size_t) __ATTR_PURE__;
50+
extern void *memmove(void *, const void *, size_t);
51+
extern void *memrchr(const void *, int, size_t) __ATTR_PURE__;
52+
extern void *memset(void *, int, size_t);
53+
extern char *strcat(char *, const char *);
54+
extern char *strchr(const char *, int) __ATTR_PURE__;
55+
extern char *strchrnul(const char *, int) __ATTR_PURE__;
56+
extern int strcmp(const char *, const char *) __ATTR_PURE__;
57+
extern char *strcpy(char *, const char *);
58+
extern int strcasecmp(const char *, const char *) __ATTR_PURE__;
59+
extern char *strcasestr(const char *, const char *) __ATTR_PURE__;
60+
extern size_t strcspn(const char *__s, const char *__reject) __ATTR_PURE__;
61+
extern char *strdup(const char *s1);
62+
extern size_t strlcat(char *, const char *, size_t);
63+
extern size_t strlcpy(char *, const char *, size_t);
64+
extern size_t strlen(const char *) __ATTR_PURE__;
65+
extern char *strlwr(char *);
66+
extern char *strncat(char *, const char *, size_t);
67+
extern int strncmp(const char *, const char *, size_t) __ATTR_PURE__;
68+
extern char *strncpy(char *, const char *, size_t);
69+
extern int strncasecmp(const char *, const char *, size_t) __ATTR_PURE__;
70+
extern size_t strnlen(const char *, size_t) __ATTR_PURE__;
71+
extern char *strpbrk(const char *__s, const char *__accept) __ATTR_PURE__;
72+
extern char *strrchr(const char *, int) __ATTR_PURE__;
73+
extern char *strrev(char *);
74+
extern char *strsep(char **, const char *);
75+
extern size_t strspn(const char *__s, const char *__accept) __ATTR_PURE__;
76+
extern char *strstr(const char *, const char *) __ATTR_PURE__;
77+
extern char *strtok(char *, const char *);
78+
extern char *strtok_r(char *, const char *, char **);
79+
extern char *strupr(char *);
80+
81+
#include <arduino.h>
82+
#undef F
83+
#define F(string_literal) ((const PROGMEM char *)(string_literal))
84+
#undef cli
85+
#define cli()
86+
#define pgm_read_byte(address_short)
87+
#define pgm_read_word(address_short)
88+
#define pgm_read_word2(address_short)
89+
#define digitalPinToPort(P)
90+
#define digitalPinToBitMask(P)
91+
#define digitalPinToTimer(P)
92+
#define analogInPinToBit(P)
93+
#define portOutputRegister(P)
94+
#define portInputRegister(P)
95+
#define portModeRegister(P)
96+
#include <Aurora.ino>
97+
#include <Animations.h>
98+
#include <Attractor.h>
99+
#include <Aurora.h>
100+
#include <BitmapPlayer.h>
101+
#include <Bitmaps.h>
102+
#include <Boid.h>
103+
#include <ClockDigitalShort.h>
104+
#include <ClockDisplay.h>
105+
#include <ClockText.h>
106+
#include <Drawable.h>
107+
#include <Effects.h>
108+
#include <GifPlayer.h>
109+
#include <Hardware.h>
110+
#include <IrCodes.h>
111+
#include <Logo.h>
112+
#include <Menu.h>
113+
#include <MenuItem.h>
114+
#include <MessagePlayer.h>
115+
#include <PatternAnalogClock.h>
116+
#include <PatternAttract.h>
117+
#include <PatternBitmap.h>
118+
#include <PatternBounce.h>
119+
#include <PatternEffects.h>
120+
#include <PatternElectricMandala.h>
121+
#include <PatternFire.h>
122+
#include <PatternFlock.h>
123+
#include <PatternFlowField.h>
124+
#include <PatternInfinity.h>
125+
#include <PatternInvaders.h>
126+
#include <PatternLife.h>
127+
#include <PatternMaze.h>
128+
#include <PatternMunch.h>
129+
#include <PatternNoiseSmearing.h>
130+
#include <PatternPendulumWave.h>
131+
#include <PatternPlasma.h>
132+
#include <PatternPulse.h>
133+
#include <PatternRainbowSmoke.h>
134+
#include <PatternSimplexNoise.h>
135+
#include <PatternSnake.h>
136+
#include <PatternSpark.h>
137+
#include <PatternSpin.h>
138+
#include <PatternSpiral.h>
139+
#include <PatternSwirl.h>
140+
#include <PatternWave.h>
141+
#include <Patterns.h>
142+
#include <Playlist.h>
143+
#include <Runnable.h>
144+
#include <Settings.h>
145+
#include <SettingsAutoplayDuration.h>
146+
#include <SettingsBackgroundBrightness.h>
147+
#include <SettingsBrightness.h>
148+
#include <SettingsClock24Hour.h>
149+
#include <SettingsClockColor.h>
150+
#include <SettingsMenuColor.h>
151+
#include <SettingsMoveClock.h>
152+
#include <SettingsSetTime.h>
153+
#include <StreamingMode.h>
154+
#include <Vector.h>
155+
#endif

0 commit comments

Comments
 (0)