Skip to content
Closed

energia #1538

Changes from 1 commit
Commits
Show all changes
480 commits
Select commit Hold shift + click to select a range
4c0f32f
Merge branch 'master' of github.com:energia/Energia
robertinant Sep 10, 2012
9283554
Final changes to Tone.cpp
Revisore Sep 10, 2012
09982c4
Change pin mapping
robertinant Sep 15, 2012
f301e52
Fix slave not receiving RX interrupts
robertinant Sep 15, 2012
af3258b
Fix missing define for __MSP430_HAS_T0A3__
robertinant Sep 15, 2012
476dada
Fix pin numbering for Analog and PUSH2
robertinant Sep 18, 2012
725d447
Add more analog pins
robertinant Sep 19, 2012
2f7eb88
Add sources for internal thermometer algorithm
Sep 19, 2012
baef3d5
Add accelerometer pins friendly name
robertinant Sep 20, 2012
1e8591b
Merge branch 'master' of github.com:energia/Energia
robertinant Sep 20, 2012
1950bd3
-Initial write of code that has been compiled successfully
Revisore Sep 20, 2012
ae78ca6
Changed to correct board MCU
Revisore Sep 20, 2012
6ff7406
Add accelerometer enable and NTC enable friendly names and pin defini…
robertinant Sep 20, 2012
e08d56c
Fix analogWrite for ADC10_B
robertinant Sep 22, 2012
59139ab
Example: Reading the Built-In FraunchPad Accelerometer
Sep 23, 2012
a3774d6
Update tools:
robertinant Sep 23, 2012
bee1b76
Add EUSCI B0 SPI support (FraunchPad)
robertinant Sep 24, 2012
f65dc8f
Merge branch 'master' of github.com:energia/Energia
robertinant Sep 24, 2012
32b47a9
Examples adapted to FranchPad
Sep 24, 2012
756634a
Example adapted for FraunchPad
Sep 24, 2012
d2da18e
Debugged delays, digital I/O, and analogWrite functionalities
Revisore Sep 27, 2012
ae0e85c
Created new binary for msp430-gcc that includes the BSL patch for
RickKimball Sep 27, 2012
a2f86ac
HardwareSerial-working with CCS, not with arm-none-eabi
Revisore Oct 3, 2012
ae4a7b1
Issue on incorrect ADC pin and channel resolved
Revisore Oct 3, 2012
b02ab9f
Commented out overloaded version of analogRead
Revisore Oct 3, 2012
56855dd
Add missing realloc work around
robertinant Oct 5, 2012
c4877f2
Fix for issue 114 - Setting new servo value is now atomic
robertinant Oct 6, 2012
201ff18
Rename Timer registers to their proper name.
robertinant Oct 6, 2012
fb0a7c6
Get rid of "Icon\r" file that did not exist
robertinant Oct 7, 2012
b83b74f
Working Tone.cpp
Revisore Oct 8, 2012
3df8ae4
Changed UART buffering to wait for space to open up in buffers, inste…
Revisore Oct 8, 2012
3d20443
Example • Reading the Built-In FraunchPad Thermometer
Oct 8, 2012
7338175
Example • Reading the Built-In FraunchPad Thermometer
Oct 8, 2012
4088121
Updated status sheet and analogRead
Revisore Oct 8, 2012
03a2c87
Add support for StellarPad
robertinant Oct 9, 2012
d5632bb
Update tools
robertinant Oct 9, 2012
9d98b8f
interrupt and pulse changes
Revisore Oct 10, 2012
f1f6444
Fixed tone() and pulseIn()
Revisore Oct 11, 2012
4c901b2
Add -nostartfiles to linker command to accomodate new toolchain
robertinant Oct 22, 2012
abfd93e
Merge https://github.com/energia/Energia into stellarpad
Revisore Oct 23, 2012
99ff8b0
Initial version of Wire, and added functionality to Serial
Revisore Oct 26, 2012
8748d31
selectModule function added to HardwareSerial and Wire
Revisore Oct 26, 2012
48ef7cb
Fixed an added bug to UART, and continued debugging of Wire
Revisore Oct 26, 2012
a982ed1
Update hardware/lm4f/boards.txt
Oct 27, 2012
5d6ed0d
Update hardware/lm4f/boards.txt
Oct 27, 2012
8bb38a4
Merge branch 'stellarpad' of github.com:energia/Energia into stellarpad
robertinant Oct 27, 2012
8bb4310
Update with new link to forum
robertinant Oct 28, 2012
d59008f
Upadate link to forum and website
robertinant Oct 28, 2012
957ff5b
fix pin assignments for GREEN/BLUE_LED
RickKimball Oct 28, 2012
eca818d
Support for cortex-m4f hardware floating point compilation
RickKimball Oct 29, 2012
f6ce227
Add single precision float Print support
RickKimball Oct 29, 2012
e211e77
add back in librxtxSerial64.so
RickKimball Oct 29, 2012
48c1899
add back in librxtxSerial64.so
RickKimball Oct 29, 2012
8fde664
Change upload tool to lm4flash
robertinant Oct 29, 2012
6446bfb
Add lm4flash tool
robertinant Oct 30, 2012
7beb6ab
Fix computation of Sketch size (#119)
robertinant Oct 31, 2012
e3bb6c7
Added 8 LEDs example for FraunchPad
Nov 1, 2012
708cf34
Added 8 LEDs example for FraunchPad
Nov 1, 2012
f59e05d
Debugged majority of I2C master functionality
Revisore Nov 1, 2012
0a292b5
Merge branch 'stellarpad' of https://github.com/energia/Energia into …
Revisore Nov 1, 2012
37b4daf
Resolved issue with start conditions
Revisore Nov 2, 2012
ade7853
Add missing serialEvent()
robertinant Nov 7, 2012
f07e92b
Removed GPIOIntRegister() call
Revisore Nov 7, 2012
5b7ce19
Fixed Wire bugs to allow functionality with Arduino examples
Revisore Nov 8, 2012
a0e5471
Enable interrupt on all pins
robertinant Nov 9, 2012
3968918
Merge branch 'stellarpad' of github.com:energia/Energia
RickKimball Nov 10, 2012
3aca7c3
initial _sbrk() implementation
RickKimball Nov 1, 2012
4642b32
Merge branch 'stellarpad' of github.com:energia/Energia into stellarpad
RickKimball Nov 10, 2012
ee48f0b
tweak compiler options and new/delete
RickKimball Nov 10, 2012
89a0446
Fix for #129 write back to back not working
robertinant Nov 10, 2012
cfad5d3
Fix for #124 wrong bit set in ADC10AE0
robertinant Nov 10, 2012
40fc60c
fix for StringAdditionOperator
RickKimball Nov 10, 2012
e4469cd
fix for StringAdditionOperator
RickKimball Nov 10, 2012
f949b23
add missing WCharacter.h
RickKimball Nov 11, 2012
ba35a46
increase buffer size for larger 32 bit ints
RickKimball Nov 11, 2012
45f38c7
Added pins maps
Nov 11, 2012
5e5eb35
Analog pins Ax instead of AINx
Nov 12, 2012
84d0969
Initial check-in of SPI code
Revisore Nov 12, 2012
c7b8757
Clear the intended interrupt rather than all others
codehero Nov 13, 2012
6bcf567
Merge branch 'stellarpad' of https://github.com/energia/Energia into …
Nov 13, 2012
10c1b0b
Merge pull request #131 from codehero/master
robertinant Nov 13, 2012
6086cff
Moved pics to the Wiki git.
robertinant Nov 14, 2012
0a2fea8
SPI Debugging
Revisore Nov 14, 2012
79d4ba8
Shortened slave select timing for alternate SS pin
Revisore Nov 14, 2012
5289d21
Replaced current startup_gcc.c license with a BSD license.
Revisore Nov 15, 2012
9326c0c
Added EEPROM library
Revisore Nov 15, 2012
22f59d5
Changed Wire default module and trimmed code. Added selectModule() to…
Revisore Nov 16, 2012
3920d1d
Added #include for hw_nvic
Revisore Nov 16, 2012
77a5509
Added include for hw_nvic.h
Revisore Nov 16, 2012
bb47649
Merge branch 'stellarpad' of github.com:energia/Energia into stellarpad
robertinant Nov 17, 2012
84bbc10
Libraries and examples for Energia
Nov 17, 2012
a2c8d12
fix logic related to compiling asm files
RickKimball Nov 18, 2012
140675b
Fix missing compiler define (issue #137)
robertinant Nov 18, 2012
50e255d
Merge pull request #136 from rei-vilo/master
robertinant Nov 18, 2012
1884e9c
Merge branch 'stellarpad' of github.com:energia/Energia into stellarpad
RickKimball Nov 18, 2012
a5c405e
Added safeguards for enabling SPI and Wire both on PB6 and PB7 defaul…
Revisore Nov 20, 2012
59632b5
Added libraries folder along with SPI, EEPROM, and Wire subdirectories
Revisore Nov 20, 2012
786f578
Fixed bugs with PWMWrite()
Revisore Nov 20, 2012
2a3d222
analogWrite should use analog_res on border cases
codehero Nov 21, 2012
0f10b09
Compilation fix for periodPWM variable
Revisore Nov 21, 2012
586ef17
Fix for analogWrite on Wide Timer pins
Revisore Nov 21, 2012
56c4866
Removed Wire and SPI checks in begin()
Revisore Nov 21, 2012
ced37e8
Stellar_Fading_RGB Example
Nov 22, 2012
4b4833c
Merge pull request #142 from energia/Example_for_StellarPad
robertinant Nov 22, 2012
149a48e
Fix for analogWrite on both channels for same timer
Revisore Nov 26, 2012
5299407
Updated Fading RGB Example for StellarPad
Nov 26, 2012
6cca384
Fix use proper predefined macro (issue #137)
robertinant Nov 28, 2012
1978989
Added ROM driverlib functions for analog drivers
Revisore Nov 29, 2012
8f9adb0
Added ROM EEPROM functions
Revisore Nov 29, 2012
4720ceb
Added ROM functions to SPI
Revisore Nov 29, 2012
eed658d
Added ROM functions to Wire
Revisore Nov 29, 2012
493e05e
Added constructors to allow module selection
Revisore Nov 29, 2012
4d2a247
Remove stray .cvsignore
robertinant Nov 30, 2012
0c75da9
Merge branch 'master' into stellarpad
robertinant Nov 30, 2012
8e7dbbe
Add SerialEvent for TimerSerial
robertinant Nov 30, 2012
9861cd4
Merge pull request #139 from codehero/master
robertinant Nov 30, 2012
c6b06fd
Merge branch 'master' of github.com:energia/Energia
robertinant Nov 30, 2012
5f20c99
Merge branch 'master' into stellarpad
robertinant Nov 30, 2012
da58cca
Add -MMD to compiler options to produce .d files
robertinant Dec 2, 2012
bed6fa9
Fix OR IE with RX bit
robertinant Dec 2, 2012
c8c8486
Add SPI examples for StellarPad
robertinant Dec 4, 2012
d26e77c
Add Wire (i2c) examples for StellarPad
robertinant Dec 4, 2012
0ad15f8
Bump version number on about image.
robertinant Dec 4, 2012
ef8a805
Bump version number on about image (jpg)
robertinant Dec 4, 2012
c6446da
Fix rebuild example library menu on arch change
robertinant Dec 4, 2012
f457c76
Remove stale debug code
robertinant Dec 4, 2012
a6247ac
Fix compilation warning
robertinant Dec 4, 2012
b706a16
Add all board flavours
robertinant Dec 4, 2012
e9defc8
Add all board flavours
robertinant Dec 4, 2012
fb70e52
Merge branch 'master' of https://github.com/energia/Energia
robertinant Dec 4, 2012
03b9aae
Merge branch 'master' of github.com:energia/Energia
robertinant Dec 4, 2012
18fba14
One up version
robertinant Dec 4, 2012
120d9ce
Add define for __LM4F120H5QR__
robertinant Dec 5, 2012
8036c90
Make P2.6 and P2.7 default to GPIO
robertinant Dec 5, 2012
d685f42
One up EREVISION
robertinant Dec 6, 2012
40f026b
Fix FraunchPad compilation error
robertinant Dec 6, 2012
9931763
Fix compilation warning for USI
robertinant Dec 6, 2012
0dd9ae2
SysTick reload value fix for delayMicroseconds()
Revisore Dec 12, 2012
22a0b54
Fixed Thermometer_430 constructor
Dec 13, 2012
8ff3b45
Revert "Fixed Thermometer_430 constructor"
Dec 13, 2012
b642506
Fixed thermometer example
Dec 13, 2012
95fb9e9
millis and micros variable size fix
Revisore Dec 13, 2012
95c33da
LCD BoosterPack / Nokia 7110 and LCD 5110 Libraries fro LaunchPad and…
Dec 13, 2012
6ca572b
Fixed Issue #151. Now compiles for uC without ADC
pbrier Dec 13, 2012
1b5d75b
Update ReadMe.md
Sash0k Dec 14, 2012
564d9b5
Merge pull request #161 from Sash0k/patch-1
Dec 14, 2012
3cb2fc3
Update ReadMe.md
Dec 14, 2012
58b7f8e
Updated links and forums
Dec 15, 2012
1332675
Merge pull request #157 from energia/issue_156_Fixed_thermometer_430
Dec 15, 2012
9144946
LaunchPad + StellarPad — Library for Colour LCD Booster Pack by RobG
Dec 15, 2012
0e81912
LaunchPad + StellarPad — Library for Colour LCD Booster Pack by RobG
Dec 15, 2012
36cb21f
Revert "millis and micros variable size fix"
robertinant Dec 17, 2012
84f1407
millis and micros fix
Revisore Dec 19, 2012
28bdcb8
SRAM SPI Library Example
Dec 22, 2012
1d9499c
Revert "SRAM SPI Library Example"
Dec 22, 2012
e938374
Library for Nokia 5110 LCD with hardware SPI
Jan 13, 2013
9b5faf6
Update examples/7.Display/LCD_5110_SPI/LCD_5110_SPI.h
Jan 13, 2013
d3acfee
Update examples/7.Display/LCD_5110_SPI/Examples/LCD_5110_SPI_main/LCD…
Jan 13, 2013
7ce4705
LCD_5110_SPI SPI.select fixed
Jan 14, 2013
05adb08
Fix for issue 164
RickKimball Jan 25, 2013
3fc4a0f
Fix for issue #164
Jan 25, 2013
e32f307
Fix for issue #179
robertinant Feb 3, 2013
33d754b
Fix for issue #177 -lm and -lc link order
robertinant Feb 9, 2013
1f6d78e
Porting SoftwareSerial library to Energia
m000z0rz Feb 9, 2013
b156c7f
Add multi serial and serialEvent
robertinant Feb 11, 2013
2190f63
Removing debug statements
m000z0rz Feb 11, 2013
9840f19
Fix copy/paste error
robertinant Feb 11, 2013
1cecedd
Removing more debug statements
m000z0rz Feb 11, 2013
626ec95
Fix for issue #191
robertinant Feb 11, 2013
d8235e8
BareMinimum Sketch as template
eried Feb 11, 2013
ec2cd08
Search in all opened tabs (files) from Search and Replace dialog
eried Feb 11, 2013
33faae7
Fix checkbox text truncated with dots
robertinant Feb 12, 2013
619b4f6
Change newbie text to match BareMinimum Sketch
robertinant Feb 12, 2013
6842eb4
Find the insertion point inside the setup() function, before the last…
eried Feb 11, 2013
a5cbb5a
Energia icons for the window in all the resolutions
eried Feb 11, 2013
d702a27
Search reference now does not require to perfectly select the whole w…
eried Feb 11, 2013
98a279b
Select the whole line if no valid selection
eried Feb 11, 2013
b4a57cf
Error appear twice in the console when the "select another serial por…
eried Feb 11, 2013
5e7e209
Just a separator in the help menu
eried Feb 11, 2013
b63b63e
Menu scroller for long menus and small change in the import menu (rel…
eried Feb 11, 2013
09c866a
Menu scroller for long menus (required changes to Base.java to count …
eried Feb 11, 2013
440b895
Pointless "localization" of this date format string
eried Feb 11, 2013
9ac6e5e
EOF limits for AutoFormat routine
eried Feb 11, 2013
6c5c4a0
Restore the caret position after undo/redo operations
eried Feb 11, 2013
f3c2c63
'Ugly' hack to slow down the selection of text in the IDE via mouse d…
eried Feb 11, 2013
01d4bd4
No space is required between #include and '<' or '"'
eried Feb 11, 2013
20417c7
Query the preferences just once for the serial port
eried Feb 11, 2013
c625e80
Copy Hex File as Path and Show compilation folder menu items
eried Feb 11, 2013
8a3e45c
Do not show the library folder items or sketchs again
eried Feb 11, 2013
f7096c7
Copy Hex File as Path and Show compilation folder: Sketch functions r…
eried Feb 11, 2013
fd6cd4d
Revert "Fix for Issue #32: Line numbers incorrect in the compiler mes…
robertinant Feb 15, 2013
826be6c
Fixing placement of error messages.
robertinant Feb 15, 2013
003144d
Don't generate prototypes for function that already have them. (Lars…
damellis Jul 19, 2012
305ccc5
Fixing error line numbering. (Paul Stoffregen)
damellis Oct 1, 2012
828eb41
Merge pull request #193 from energia/issue_32_1
robertinant Feb 15, 2013
6a6c0dc
Set the undoLimit (default is 100 changes and since the tracking is p…
eried Feb 11, 2013
808b430
Fix for Energia issue converting directory to 8.3 format
eried Feb 11, 2013
71e5221
Automatically create the libraries folder in the user directory
eried Feb 12, 2013
d999650
Option to open automatically the Serial Monitor after the upload, add…
eried Feb 12, 2013
7072b2b
Font option listbox in Preferences dialog
eried Feb 12, 2013
d88085c
Small optimization in the serial port list routine
eried Feb 12, 2013
5c58ff3
Merge pull request #184 from m000z0rz/softwareserial
robertinant Feb 16, 2013
d14a87f
Merge pull request #160 from energia/issue_151
robertinant Feb 16, 2013
9c3dc14
Fix for #172 replace selectModule -> setModule
robertinant Feb 16, 2013
83de472
Fix for #163 isGraph was commented out.
robertinant Feb 16, 2013
9ce7951
Fix isGraph and isPrintable
robertinant Feb 20, 2013
5501305
Fix for #195
eried Mar 5, 2013
0f80702
Fix for #195
eried Mar 13, 2013
302bafe
Fix for #194
eried Mar 13, 2013
2b71230
Update LCD_5110.cpp
regimantas Mar 17, 2013
5233122
Merge pull request #211 from regimantas/patch-1
Mar 17, 2013
3909ba6
Fix for #221
Apr 5, 2013
2a3a3b8
Fix stop condition when receiving 1 byte with USCI
astuder Apr 14, 2013
0f26c4e
Added upload.maximum_ram_size with values for supported boards
Apr 15, 2013
97d1b04
Added upload.maximum_ram_size with values for supported boards
Apr 16, 2013
acfa78a
Added alternate pin muxing for UART1
Revisore Apr 17, 2013
4521fa4
Update HardwareSerial.cpp
reaper7 Apr 20, 2013
b2302da
Initial checkin of AIR430Boost library
robertinant Apr 29, 2013
9b82dd3
Merge pull request #227 from reaper7/patch-1
robertinant Apr 29, 2013
8372767
Merge pull request #226 from astuder/master
robertinant Apr 29, 2013
3b426f7
Add missing syscalls
robertinant Apr 30, 2013
b2e4d36
Merge branch 'master' of github.com:energia/Energia
robertinant Apr 30, 2013
05e143b
Fix for #234
May 1, 2013
2ddd4ff
Fix I2C endTransmission(false) with USCI
astuder May 3, 2013
f1027fb
Anaren CC110L AIR BosterPack for StellarPad LM4F
May 3, 2013
6e1ac5d
Fix for #237
May 4, 2013
145d733
Updated Offline reference for Energia. Can be used as the basis for …
measley May 6, 2013
8b3c68a
Merge branch 'master' of https://github.com/energia/Energia
May 6, 2013
bd1654b
Functions sub-chapters in red as for Structure and Variables
May 6, 2013
cd2dbba
Fix trackpad freezes when atempting to upload
robertinant May 6, 2013
8effd92
Merge branch 'master' of github.com:energia/Energia
robertinant May 6, 2013
7f73178
Revert "Fix for #237"
robertinant May 6, 2013
2d9d300
Fix syscalls inclusions
robertinant May 6, 2013
0e815b5
Fix mspdebug libusb trackpad freezes when uploading
robertinant May 7, 2013
5495a71
Added documentation for AIR430Boost Library.
measley May 7, 2013
5e74c46
Added documentation for the Serial library.
measley May 7, 2013
0095452
Edited PimMapping.html
saalvarado2 May 8, 2013
5e89e7f
Fixed some errors in the reference section.
measley May 8, 2013
6ea4fee
Updated the Basics section of the examples to reflect tutorials.
measley May 8, 2013
0a0217f
Updated the Strings section of the examples to reflect tutorials.
measley May 8, 2013
5e87329
Updated the Control section of the examples to reflect tutorials.
measley May 9, 2013
31b9e1f
Minor fixes in the reference section.
measley May 9, 2013
37fcb5a
Updated the Communications section of the examples to reflect tutoria…
measley May 9, 2013
5be9a48
Arduino compatible millisecond tracking
astuder May 23, 2013
f3a51cc
Merged [ReadMe.md and readme.txt], made more friendly, rephrased a li…
haneefmubarak Jun 15, 2013
8eeccd3
Added symlink
haneefmubarak Jun 23, 2013
9ec64d5
Merge pull request #251 from haneefmubarak/master
robertinant Jun 23, 2013
6fc3d47
Merge pull request #235 from astuder/i2c-fixes
robertinant Jun 26, 2013
e97d662
Cosmetic changes
robertinant Jun 29, 2013
9030d43
Merge branch 'master' of github.com:energia/Energia
robertinant Jun 29, 2013
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
No space is required between #include and '<' or '"'
  • Loading branch information
eried authored and robertinant committed Feb 14, 2013
commit 01d4bd4c61ff815784cefe91d3b908b566108551
2 changes: 1 addition & 1 deletion app/src/processing/app/preproc/PdePreprocessor.java
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public int writePrefix(String program, String buildPath,
}

//String importRegexp = "(?:^|\\s|;)(import\\s+)(\\S+)(\\s*;)";
String importRegexp = "^\\s*#include\\s+[<\"](\\S+)[\">]";
String importRegexp = "^\\s*#include\\s*[<\"](\\S+)[\">]";
programImports = new ArrayList<String>();

String[][] pieces = PApplet.matchAll(program, importRegexp);
Expand Down