diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java index 007d60e50..dc4cafe40 100644 --- a/app/src/processing/app/Base.java +++ b/app/src/processing/app/Base.java @@ -41,8 +41,8 @@ import processing.core.*; * files and images, etc) that comes from that. */ public class Base { - static final int REVISION = 165; - static String VERSION_NAME = "0165"; + static final int REVISION = 17; + static String VERSION_NAME = "0017"; static HashMap platformNames = new HashMap(); static { diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java index 8b9922de1..70b249db9 100644 --- a/app/src/processing/app/Editor.java +++ b/app/src/processing/app/Editor.java @@ -140,7 +140,7 @@ public class Editor extends JFrame implements RunnerListener { public Editor(Base ibase, String path, int[] location) { - super("Processing"); + super("Arduino"); this.base = ibase; Base.setIcon(this); @@ -834,8 +834,8 @@ public class Editor extends JFrame implements RunnerListener { item.setAccelerator(KeyStroke.getKeyStroke('T', modifiers)); menu.add(item); - menu.add(createToolMenuItem("processing.app.tools.CreateFont")); - menu.add(createToolMenuItem("processing.app.tools.ColorSelector")); + //menu.add(createToolMenuItem("processing.app.tools.CreateFont")); + //menu.add(createToolMenuItem("processing.app.tools.ColorSelector")); menu.add(createToolMenuItem("processing.app.tools.Archiver")); menu.add(createToolMenuItem("processing.app.tools.FixEncoding")); @@ -2005,7 +2005,7 @@ public class Editor extends JFrame implements RunnerListener { } header.rebuild(); // Set the title of the window to "sketch_070752a - Processing 0126" - setTitle(sketch.getName() + " | Processing " + Base.VERSION_NAME); + setTitle(sketch.getName() + " | Arduino " + Base.VERSION_NAME); // Disable untitled setting from previous document, if any untitled = false; diff --git a/build/macosx/dist/Processing.app/Contents/Info.plist b/build/macosx/dist/Arduino.app/Contents/Info.plist similarity index 98% rename from build/macosx/dist/Processing.app/Contents/Info.plist rename to build/macosx/dist/Arduino.app/Contents/Info.plist index c7ac50f8e..763492b93 100755 --- a/build/macosx/dist/Processing.app/Contents/Info.plist +++ b/build/macosx/dist/Arduino.app/Contents/Info.plist @@ -3,7 +3,7 @@ CFBundleName - Processing + Arduino CFBundleGetInfoString @@ -28,7 +28,7 @@ CFBundleIconFile processing.icns CFBundleIdentifier - org.processing.app + cc.arduino.Arduino CFBundleDocumentTypes diff --git a/build/macosx/dist/Processing.app/Contents/MacOS/JavaApplicationStub b/build/macosx/dist/Arduino.app/Contents/MacOS/JavaApplicationStub similarity index 100% rename from build/macosx/dist/Processing.app/Contents/MacOS/JavaApplicationStub rename to build/macosx/dist/Arduino.app/Contents/MacOS/JavaApplicationStub diff --git a/build/macosx/dist/Processing.app/Contents/PkgInfo b/build/macosx/dist/Arduino.app/Contents/PkgInfo similarity index 100% rename from build/macosx/dist/Processing.app/Contents/PkgInfo rename to build/macosx/dist/Arduino.app/Contents/PkgInfo diff --git a/build/macosx/dist/Processing.app/Contents/Resources/Java/libquaqua.jnilib b/build/macosx/dist/Arduino.app/Contents/Resources/Java/libquaqua.jnilib similarity index 100% rename from build/macosx/dist/Processing.app/Contents/Resources/Java/libquaqua.jnilib rename to build/macosx/dist/Arduino.app/Contents/Resources/Java/libquaqua.jnilib diff --git a/build/macosx/dist/Processing.app/Contents/Resources/Java/libquaqua64.jnilib b/build/macosx/dist/Arduino.app/Contents/Resources/Java/libquaqua64.jnilib similarity index 100% rename from build/macosx/dist/Processing.app/Contents/Resources/Java/libquaqua64.jnilib rename to build/macosx/dist/Arduino.app/Contents/Resources/Java/libquaqua64.jnilib diff --git a/build/macosx/dist/Processing.app/Contents/Resources/Java/librxtxSerial.jnilib b/build/macosx/dist/Arduino.app/Contents/Resources/Java/librxtxSerial.jnilib similarity index 100% rename from build/macosx/dist/Processing.app/Contents/Resources/Java/librxtxSerial.jnilib rename to build/macosx/dist/Arduino.app/Contents/Resources/Java/librxtxSerial.jnilib diff --git a/build/macosx/dist/Processing.app/Contents/Resources/Java/quaqua.jar b/build/macosx/dist/Arduino.app/Contents/Resources/Java/quaqua.jar similarity index 100% rename from build/macosx/dist/Processing.app/Contents/Resources/Java/quaqua.jar rename to build/macosx/dist/Arduino.app/Contents/Resources/Java/quaqua.jar diff --git a/build/macosx/dist/Processing.app/Contents/Resources/pde.icns b/build/macosx/dist/Arduino.app/Contents/Resources/pde.icns similarity index 100% rename from build/macosx/dist/Processing.app/Contents/Resources/pde.icns rename to build/macosx/dist/Arduino.app/Contents/Resources/pde.icns diff --git a/build/macosx/dist/Arduino.app/Contents/Resources/processing.icns b/build/macosx/dist/Arduino.app/Contents/Resources/processing.icns new file mode 100755 index 000000000..177675d22 Binary files /dev/null and b/build/macosx/dist/Arduino.app/Contents/Resources/processing.icns differ diff --git a/build/macosx/dist/Processing.app/Contents/Resources/processing.icns b/build/macosx/dist/Processing.app/Contents/Resources/processing.icns deleted file mode 100755 index 66f605274..000000000 Binary files a/build/macosx/dist/Processing.app/Contents/Resources/processing.icns and /dev/null differ diff --git a/build/macosx/make.sh b/build/macosx/make.sh index a22efbe79..8d47cce17 100755 --- a/build/macosx/make.sh +++ b/build/macosx/make.sh @@ -3,7 +3,7 @@ ### -- SETUP WORK DIR ------------------------------------------- -RESOURCES=`pwd`/work/Processing.app/Contents/Resources/Java +RESOURCES=`pwd`/work/Arduino.app/Contents/Resources/Java #echo $RESOURCES #exit @@ -17,12 +17,12 @@ else mkdir work # to have a copy of this guy around for messing with - echo Copying Processing.app... - #cp -a dist/Processing.app work/ # #@$(* bsd switches - #/sw/bin/cp -a dist/Processing.app work/ - cp -pRX dist/Processing.app work/ + echo Copying Arduino.app... + #cp -a dist/Arduino.app work/ # #@$(* bsd switches + #/sw/bin/cp -a dist/Arduino.app work/ + cp -pRX dist/Arduino.app work/ # cvs doesn't seem to want to honor the +x bit - chmod +x work/Processing.app/Contents/MacOS/JavaApplicationStub + chmod +x work/Arduino.app/Contents/MacOS/JavaApplicationStub cp -rX ../shared/lib "$RESOURCES/" cp -rX ../shared/libraries "$RESOURCES/" @@ -118,8 +118,8 @@ zip -0rq "$RESOURCES/pde.jar" . cd ../.. # get updated core.jar and pde.jar; also antlr.jar and others -#mkdir -p work/Processing.app/Contents/Resources/Java/ -#cp work/lib/*.jar work/Processing.app/Contents/Resources/Java/ +#mkdir -p work/Arduino.app/Contents/Resources/Java/ +#cp work/lib/*.jar work/Arduino.app/Contents/Resources/Java/ echo diff --git a/build/macosx/run.sh b/build/macosx/run.sh index 3a844d90e..1c5fab57c 100755 --- a/build/macosx/run.sh +++ b/build/macosx/run.sh @@ -9,4 +9,4 @@ #cd work && java -Dapple.laf.useScreenMenuBar=true -Dapple.awt.showGrowBox=false processing.app.Base # starting with work on release 0120, run directly from the .app -cd work && ./Processing.app/Contents/MacOS/JavaApplicationStub +cd work && ./Arduino.app/Contents/MacOS/JavaApplicationStub diff --git a/build/shared/lib/about.jpg b/build/shared/lib/about.jpg index 205ff374c..08be8990a 100755 Binary files a/build/shared/lib/about.jpg and b/build/shared/lib/about.jpg differ diff --git a/build/shared/lib/keywords.txt b/build/shared/lib/keywords.txt index b2ed52bd0..16220c87a 100644 --- a/build/shared/lib/keywords.txt +++ b/build/shared/lib/keywords.txt @@ -1,627 +1,168 @@ -# LITERAL2 specifies constants +# LITERAL1 specifies constants -ADD LITERAL2 -ALIGN_CENTER LITERAL2 -ALIGN_LEFT LITERAL2 -ALIGN_RIGHT LITERAL2 -ALPHA LITERAL2 -ALPHA_MASK LITERAL2 -ALT LITERAL2 -AMBIENT LITERAL2 -ARROW LITERAL2 -ARGB LITERAL2 -BACKSPACE LITERAL2 -BASELINE LITERAL2 -BEVEL LITERAL2 -BLEND LITERAL2 -BLUE_MASK LITERAL2 -BLUR LITERAL2 -BOTTOM LITERAL2 -BURN LITERAL2 -CENTER LITERAL2 -CHATTER LITERAL2 -CODED LITERAL2 -COMPLAINT LITERAL2 -COMPOSITE LITERAL2 -COMPONENT LITERAL2 -CONCAVE_POLYGON LITERAL2 -CONTROL LITERAL2 -CONVEX_POLYGON LITERAL2 -CORNER LITERAL2 -CORNERS LITERAL2 -CLOSE LITERAL2 -CMYK LITERAL2 -CODED LITERAL2 -COMPLAINT LITERAL2 -CONTROL LITERAL2 -CORNER LITERAL2 -CORNERS LITERAL2 -CROSS LITERAL2 -CUSTOM LITERAL2 -DARKEST LITERAL2 -DEGREES LITERAL2 -DEG_TO_RAD LITERAL2 -DELETE LITERAL2 -DIAMETER LITERAL2 -DIFFERENCE LITERAL2 -DIFFUSE LITERAL2 -DILATE LITERAL2 -DIRECTIONAL LITERAL2 -DISABLE_ACCURATE_TEXTURES LITERAL2 -DISABLE_DEPTH_SORT LITERAL2 -DISABLE_NATIVE_FONTS LITERAL2 -DISABLE_OPENGL_ERROR_REPORT LITERAL2 -DISABLE_TEXT_SMOOTH LITERAL2 -DISABLED LITERAL2 -DODGE LITERAL2 -DOWN LITERAL2 -DXF LITERAL2 -ENABLE_ACCURATE_TEXTURES LITERAL2 -ENABLE_DEPTH_SORT LITERAL2 -ENABLE_NATIVE_FONTS LITERAL2 -DISABLE_OPENGL_2X_SMOOTH LITERAL2 -ENABLE_OPENGL_4X_SMOOTH LITERAL2 -ENABLE_OPENGL_ERROR_REPORT LITERAL2 -ENTER LITERAL2 -EPSILON LITERAL2 -ERODE LITERAL2 -ESC LITERAL2 -EXCLUSION LITERAL2 -GIF LITERAL2 -GRAY LITERAL2 -GREEN_MASK LITERAL2 -GROUP LITERAL2 -HALF LITERAL2 -HALF_PI LITERAL2 -HAND LITERAL2 -HARD_LIGHT LITERAL2 -HINT_COUNT LITERAL2 -HSB LITERAL2 -IMAGE LITERAL2 -INVERT LITERAL2 -JAVA2D LITERAL2 -JPEG LITERAL2 -LEFT LITERAL2 -LIGHTEST LITERAL2 -LINES LITERAL2 -LINUX LITERAL2 -MACOSX LITERAL2 -MAX_FLOAT LITERAL2 -MAX_INT LITERAL2 -MITER LITERAL2 -MODEL LITERAL2 -MOVE LITERAL2 -MULTIPLY LITERAL2 -NORMAL LITERAL2 -NO_DEPTH_TEST LITERAL2 -NTSC LITERAL2 -ONE LITERAL2 -OPAQUE LITERAL2 -OPEN LITERAL2 -OPENGL LITERAL2 -ORTHOGRAPHIC LITERAL2 -OVERLAY LITERAL2 -PAL LITERAL2 -P2D LITERAL2 -P3D LITERAL2 -PERSPECTIVE LITERAL2 -PI LITERAL2 -PIXEL_CENTER LITERAL2 -POINT LITERAL2 -POINTS LITERAL2 -POSTERIZE LITERAL2 -PROBLEM LITERAL2 -PROJECT LITERAL2 -QUAD_STRIP LITERAL2 -QUADS LITERAL2 -QUARTER_PI LITERAL2 -RAD_TO_DEG LITERAL2 -RADIUS LITERAL2 -RADIANS LITERAL2 -RED_MASK LITERAL2 -REPLACE LITERAL2 -RETURN LITERAL2 -RGB LITERAL2 -RIGHT LITERAL2 -ROUND LITERAL2 -SCREEN LITERAL2 -SECAM LITERAL2 -SHIFT LITERAL2 -SPECULAR LITERAL2 -SOFT_LIGHT LITERAL2 -SQUARE LITERAL2 -SUBTRACT LITERAL2 -SVIDEO LITERAL2 -TAB LITERAL2 -TARGA LITERAL2 -TEXT LITERAL2 -TFF LITERAL2 -THIRD_PI LITERAL2 -THRESHOLD LITERAL2 -TIFF LITERAL2 -TOP LITERAL2 -TRIANGLE_FAN LITERAL2 -TRIANGLES LITERAL2 -TRIANGLE_STRIP LITERAL2 -TUNER LITERAL2 -TWO LITERAL2 -TWO_PI LITERAL2 -UP LITERAL2 -WAIT LITERAL2 -WHITESPACE LITERAL2 +HIGH LITERAL1 Constants +LOW LITERAL1 Constants +INPUT LITERAL1 Constants +OUTPUT LITERAL1 Constants +SERIAL LITERAL1 +DISPLAY LITERAL1 +DEC LITERAL1 Serial_Print +BIN LITERAL1 Serial_Print +HEX LITERAL1 Serial_Print +OCT LITERAL1 Serial_Print +BYTE LITERAL1 Serial_Print +PI LITERAL1 +HALF_PI LITERAL1 +TWO_PI LITERAL1 +LSBFIRST LITERAL1 ShiftOut +MSBFIRST LITERAL1 ShiftOut +CHANGE LITERAL1 AttachInterrupt +FALLING LITERAL1 AttachInterrupt +RISING LITERAL1 AttachInterrupt +DEFAULT LITERAL1 AnalogReference +EXTERNAL LITERAL1 AnalogReference +INTERAL LITERAL1 AnalogReference +# KEYWORD1 specifies datatypes and C/C++ keywords -# KEYWORD1 specifies datatypes and keywords - -ArrayList KEYWORD1 -Boolean KEYWORD1 -Byte KEYWORD1 -Character KEYWORD1 -Class KEYWORD1 -Double KEYWORD1 -Float KEYWORD1 -Integer KEYWORD1 -HashMap KEYWORD1 -String KEYWORD1 -StringBuffer KEYWORD1 -Thread KEYWORD1 -abstract KEYWORD1 -assert KEYWORD1 -boolean KEYWORD1 -break KEYWORD1 -byte KEYWORD1 -catch KEYWORD1 -char KEYWORD1 -class KEYWORD1 -continue KEYWORD1 -default KEYWORD1 -do KEYWORD1 -double KEYWORD1 -else KEYWORD1 -enum KEYWORD1 -extends KEYWORD1 -false KEYWORD1 -final KEYWORD1 -finally KEYWORD1 -for KEYWORD1 -float KEYWORD1 -if KEYWORD1 -implements KEYWORD1 -import KEYWORD1 -instanceof KEYWORD1 -int KEYWORD1 -interface KEYWORD1 -long KEYWORD1 -native KEYWORD1 -new KEYWORD1 +boolean KEYWORD1 BooleanVariables +byte KEYWORD1 Byte +case KEYWORD1 SwitchCase +char KEYWORD1 Char +class KEYWORD1 +default KEYWORD1 SwitchCase +do KEYWORD1 DoWhile +double KEYWORD1 Double +else KEYWORD1 Else +false KEYWORD1 Constants +float KEYWORD1 Float +for KEYWORD1 For +if KEYWORD1 If +int KEYWORD1 Int +long KEYWORD1 Long +new KEYWORD1 null KEYWORD1 -package KEYWORD1 -private KEYWORD1 +private KEYWORD1 protected KEYWORD1 public KEYWORD1 -return KEYWORD1 -short KEYWORD1 -static KEYWORD1 -strictfp KEYWORD1 -super KEYWORD1 -switch KEYWORD1 -synchronized KEYWORD1 +return KEYWORD1 Return +short KEYWORD1 +signed KEYWORD1 +static KEYWORD1 Static +switch KEYWORD1 SwitchCase this KEYWORD1 throw KEYWORD1 -throws KEYWORD1 -transient KEYWORD1 -true KEYWORD1 try KEYWORD1 -void KEYWORD1 -volatile KEYWORD1 -while KEYWORD1 +true KEYWORD1 +unsigned KEYWORD1 +void KEYWORD1 Void +while KEYWORD1 While +word KEYWORD1 Word -# Depricated API +# operators aren't highlighted, but may have documentation -arraycopy KEYWORD2 arraycopy_ -openStream KEYWORD2 openStream_ ++= IncrementCompound ++ Arithmetic +[] arrayaccess += assign +& BitwiseAnd +| BitwiseAnd +, +// Comments +?: +{} Braces +-- Increment +/ Arithmetic +/* Comments +. dot +== +< greaterthan +<= greaterthanorequalto +++ Increment +!= inequality +<< Bitshift +< lessthan +<= lessthanorequalto +&& Boolean +! Boolean +|| Boolean +- Arithmetic +% Modulo +* Arithmetic +() parentheses +>> Bitshift +; SemiColon +-= IncrementCompound +# these are datatypes, but we've also defined functions to cast to them + +boolean KEYWORD2 boolean_ +byte KEYWORD2 byte_ +char KEYWORD2 char_ +float KEYWORD2 float_ +int KEYWORD2 int_ +long KEYWORD2 long_ +word KEYWORD2 word_ # KEYWORD2 specifies methods and functions -cache KEYWORD2 +abs KEYWORD2 Abs +acos KEYWORD2 ACos +asin KEYWORD2 ASin +atan KEYWORD2 ATan +atan2 KEYWORD2 ATan2 +ceil KEYWORD2 Ceil +constrain KEYWORD2 Constrain +cos KEYWORD2 Cos +degrees KEYWORD2 +exp KEYWORD2 Exp +floor KEYWORD2 Floor +log KEYWORD2 Log +map KEYWORD2 Map +max KEYWORD2 Max +min KEYWORD2 Min +radians KEYWORD2 +random KEYWORD2 Random +randomSeed KEYWORD2 RandomSeed +round KEYWORD2 +sin KEYWORD2 Sin +sq KEYWORD2 Sq +sqrt KEYWORD2 Sqrt +tan KEYWORD2 Tan +bitRead KEYWORD2 BitRead +bitWrite KEYWORD2 BitWrite +bitSet KEYWORD2 BitSet +bitClear KEYWORD2 BitClear +bit KEYWORD2 Bit +highByte KEYWORD2 HighByte +lowByte KEYWORD2 LowByte -# THE TEXT ABOVE IS HAND-WRITTEN AND FOUND IN THE FILE "keywords_base.txt" -# THE TEXT BELOW IS AUTO-GENERATED +analogReference KEYWORD2 AnalogReference +analogRead KEYWORD2 AnalogRead +analogWrite KEYWORD2 AnalogWrite +attachInterrupt KEYWORD2 AttachInterrupt +detachInterrupt KEYWORD2 DetachInterrupt +delay KEYWORD2 Delay +delayMicroseconds KEYWORD2 DelayMicroseconds +digitalWrite KEYWORD2 DigitalWrite +digitalRead KEYWORD2 DigitalRead +interrupts KEYWORD2 +millis KEYWORD2 Millis +micros KEYWORD2 Micros +noInterrupts KEYWORD2 +pinMode KEYWORD2 PinMode +pulseIn KEYWORD2 PulseIn +shiftOut KEYWORD2 ShiftOut +Serial KEYWORD3 +Serial KEYWORD2 +begin KEYWORD2 Serial_Begin +read KEYWORD2 Serial_Read +print KEYWORD2 Serial_Print +println KEYWORD2 Serial_Println +available KEYWORD2 Serial_Available +flush KEYWORD2 Serial_Flush -abs KEYWORD2 abs_ -acos KEYWORD2 acos_ -+= addassign -+ addition -alpha KEYWORD2 alpha_ -ambient KEYWORD2 ambient_ -ambientLight KEYWORD2 ambientLight_ -append KEYWORD2 append_ -applyMatrix KEYWORD2 applyMatrix_ -arc KEYWORD2 arc_ -Array KEYWORD1 Array -[] arrayaccess -arrayCopy KEYWORD2 arrayCopy_ -ArrayList KEYWORD1 ArrayList -asin KEYWORD2 asin_ -= assign -atan KEYWORD2 atan_ -atan2 KEYWORD2 atan2_ -background KEYWORD2 background_ -beginCamera KEYWORD2 beginCamera_ -beginRaw KEYWORD2 beginRaw_ -beginRecord KEYWORD2 beginRecord_ -beginShape KEYWORD2 beginShape_ -bezier KEYWORD2 bezier_ -bezierDetail KEYWORD2 bezierDetail_ -bezierPoint KEYWORD2 bezierPoint_ -bezierTangent KEYWORD2 bezierTangent_ -bezierVertex KEYWORD2 bezierVertex_ -binary KEYWORD2 binary_ -binary KEYWORD2 bitwiseAND_ -| bitwiseOR -blend KEYWORD2 blend_ -blendColor KEYWORD2 blendColor_ -blue KEYWORD2 blue_ -boolean KEYWORD1 boolean -boolean KEYWORD2 boolean_ -box KEYWORD2 box_ -break KEYWORD1 break -brightness KEYWORD2 brightness_ -byte KEYWORD1 byte -byte KEYWORD2 byte_ -camera KEYWORD2 camera_ -case KEYWORD1 case -ceil KEYWORD2 ceil_ -char KEYWORD1 char -char KEYWORD2 char_ -char KEYWORD2 class_ -color KEYWORD2 color_ -color KEYWORD1 color_datatype -colorMode KEYWORD2 colorMode_ -, comma -// comment -concat KEYWORD2 concat_ -?: KEYWORD1 conditional_ -constrain KEYWORD2 constrain_ -continue KEYWORD1 continue -copy KEYWORD2 copy_ -cos KEYWORD2 cos_ -createFont KEYWORD2 createFont_ -createGraphics KEYWORD2 createGraphics_ -createImage KEYWORD2 createImage_ -createInput KEYWORD2 createInput_ -createOutput KEYWORD2 createOutput_ -createReader KEYWORD2 createReader_ -createWriter KEYWORD2 createWriter_ -{} curlybraces -cursor KEYWORD2 cursor_ -curve KEYWORD2 curve_ -curveDetail KEYWORD2 curveDetail_ -curvePoint KEYWORD2 curvePoint_ -curveTangent KEYWORD2 curveTangent_ -curveTightness KEYWORD2 curveTightness_ -curveVertex KEYWORD2 curveVertex_ -day KEYWORD2 day_ --- decrement -default KEYWORD1 default -degrees KEYWORD2 degrees_ -delay KEYWORD2 delay_ -directionalLight KEYWORD2 directionalLight_ -dist KEYWORD2 dist_ -/ divide -/= divideassign -/** doccomment -. dot -double KEYWORD1 double -draw KEYWORD3 draw_ -ellipse KEYWORD2 ellipse_ -ellipseMode KEYWORD2 ellipseMode_ -else KEYWORD1 else -emissive KEYWORD2 emissive_ -endCamera KEYWORD2 endCamera_ -endRaw KEYWORD2 endRaw_ -endRecord KEYWORD2 endRecord_ -endShape KEYWORD2 endShape_ -== equality -exit KEYWORD2 exit_ -exp KEYWORD2 exp_ -expand KEYWORD2 expand_ -extends KEYWORD1 extends -false KEYWORD1 false -fill KEYWORD2 fill_ -filter KEYWORD2 filter_ -final KEYWORD1 final -float KEYWORD1 float -float KEYWORD2 float_ -floor KEYWORD2 floor_ -focused LITERAL2 focused -for KEYWORD1 for_ -frameCount LITERAL2 frameCount -frameRate KEYWORD2 frameRate_ -frameRate LITERAL2 frameRate -frustum KEYWORD2 frustum_ -get KEYWORD2 get_ -< greaterthan -<= greaterthanorequalto -green KEYWORD2 green_ -HALF_PI LITERAL2 HALF_PI -HashMap KEYWORD1 HashMap -height LITERAL2 height -hex KEYWORD2 hex_ -hint KEYWORD2 hint_ -hour KEYWORD2 hour_ -hue KEYWORD2 hue_ -if KEYWORD1 if_ -image KEYWORD2 image_ -imageMode KEYWORD2 imageMode_ -implements KEYWORD1 implements -import KEYWORD1 import -++ increment -!= inequality -int KEYWORD1 int -int KEYWORD2 int_ -join KEYWORD2 join_ -key LITERAL2 key -keyCode LITERAL2 keyCode -keyPressed KEYWORD2 keyPressed_ -keyPressed LITERAL2 keyPressed -keyReleased KEYWORD2 keyReleased_ -keyTyped KEYWORD2 keyTyped_ -<< leftshift -lerp KEYWORD2 lerp_ -lerpColor KEYWORD2 lerpColor_ -< lessthan -<= lessthanorequalto -lightFalloff KEYWORD2 lightFalloff_ -lights KEYWORD2 lights_ -lightSpecular KEYWORD2 lightSpecular_ -line KEYWORD2 line_ -link KEYWORD2 link_ -loadBytes KEYWORD2 loadBytes_ -loadFont KEYWORD2 loadFont_ -loadImage KEYWORD2 loadImage_ -loadPixels KEYWORD2 loadPixels_ -loadShape KEYWORD2 loadShape_ -loadStrings KEYWORD2 loadStrings_ -log KEYWORD2 log_ -&& logicalAND -! logicalNOT -|| logicalOR -long KEYWORD1 long -loop KEYWORD2 loop_ -mag KEYWORD2 mag_ -map KEYWORD2 map_ -match KEYWORD2 match_ -matchAll KEYWORD2 matchAll_ -max KEYWORD2 max_ -millis KEYWORD2 millis_ -min KEYWORD2 min_ -- minus -minute KEYWORD2 minute_ -modelX KEYWORD2 modelX_ -modelY KEYWORD2 modelY_ -modelZ KEYWORD2 modelZ_ -% modulo -month KEYWORD2 month_ -mouseButton LITERAL2 mouseButton -mouseClicked KEYWORD2 mouseClicked_ -mouseDragged KEYWORD2 mouseDragged_ -mouseMoved KEYWORD2 mouseMoved_ -mousePressed KEYWORD2 mousePressed_ -mousePressed LITERAL2 mousePressed -mouseReleased KEYWORD2 mouseReleased_ -mouseX LITERAL2 mouseX -mouseY LITERAL2 mouseY -/* multilinecomment -* multiply -*= multiplyassign -new KEYWORD1 new -nf KEYWORD2 nf_ -nfc KEYWORD2 nfc_ -nfp KEYWORD2 nfp_ -nfs KEYWORD2 nfs_ -noCursor KEYWORD2 noCursor_ -noFill KEYWORD2 noFill_ -noise KEYWORD2 noise_ -noiseDetail KEYWORD2 noiseDetail_ -noiseSeed KEYWORD2 noiseSeed_ -noLights KEYWORD2 noLights_ -noLoop KEYWORD2 noLoop_ -norm KEYWORD2 norm_ -normal KEYWORD2 normal_ -noSmooth KEYWORD2 noSmooth_ -noStroke KEYWORD2 noStroke_ -noTint KEYWORD2 noTint_ -null KEYWORD1 null -Object KEYWORD1 Object -online LITERAL2 online -open KEYWORD2 open_ -ortho KEYWORD2 ortho_ -param KEYWORD2 param_ -() parentheses -perspective KEYWORD2 perspective_ -PFont KEYWORD1 PFont -list KEYWORD2 PFont_list_ -PGraphics KEYWORD1 PGraphics -beginDraw KEYWORD2 PGraphics_beginDraw_ -endDraw KEYWORD2 PGraphics_endDraw_ -PI LITERAL2 PI -PImage KEYWORD1 PImage -alpha KEYWORD2 PImage_alpha_ -blend KEYWORD2 PImage_blend_ -copy KEYWORD2 PImage_copy_ -filter KEYWORD2 PImage_filter_ -get KEYWORD2 PImage_get_ -height LITERAL2 PImage_height -loadPixels KEYWORD2 PImage_loadPixels_ -mask KEYWORD2 PImage_mask_ -pixels LITERAL2 PImage_pixels -resize KEYWORD2 PImage_resize_ -save KEYWORD2 PImage_save_ -set KEYWORD2 PImage_set_ -updatePixels KEYWORD2 PImage_updatePixels_ -width LITERAL2 PImage_width -pixels LITERAL2 pixels -pmouseX LITERAL2 pmouseX -pmouseY LITERAL2 pmouseY -point KEYWORD2 point_ -point KEYWORD2 pointLight_ -popMatrix KEYWORD2 popMatrix_ -popStyle KEYWORD3 popStyle_ -pow KEYWORD2 pow_ -print KEYWORD2 print_ -printCamera KEYWORD2 printCamera_ -println KEYWORD2 println_ -printMatrix KEYWORD2 printMatrix_ -printProjection KEYWORD2 printProjection_ -PrintWriter KEYWORD1 PrintWriter -close KEYWORD2 PrintWriter_close_ -flush KEYWORD2 PrintWriter_flush_ -print KEYWORD2 PrintWriter_print_ -println KEYWORD2 PrintWriter_println_ -private KEYWORD1 private -PShape KEYWORD1 PShape -disableStyle KEYWORD2 PShape_disableStyle_ -enableStyle KEYWORD2 PShape_enableStyle_ -getChild KEYWORD2 PShape_getChild_ -getHeight KEYWORD2 PShape_getHeight_ -getWidth KEYWORD2 PShape_getWidth_ -isVisible KEYWORD2 PShape_isVisible_ -resetMatrix KEYWORD2 PShape_resetMatrix_ -rotate KEYWORD2 PShape_rotate_ -rotateX KEYWORD2 PShape_rotateX_ -rotateY KEYWORD2 PShape_rotateY_ -rotateZ KEYWORD2 PShape_rotateZ_ -scale KEYWORD2 PShape_scale_ -setVisible KEYWORD2 PShape_setVisible_ -translate KEYWORD2 PShape_translate_ -public KEYWORD1 public -pushMatrix KEYWORD2 pushMatrix_ -pushStyle KEYWORD3 pushStyle_ -PVector KEYWORD1 PVector -add KEYWORD2 PVector_add_ -angleBetween KEYWORD2 PVector_angleBetween_ -array KEYWORD2 PVector_array_ -copy KEYWORD2 PVector_copy_ -cross KEYWORD2 PVector_cross_ -dist KEYWORD2 PVector_dist_ -div KEYWORD2 PVector_div_ -dot KEYWORD2 PVector_dot_ -get KEYWORD2 PVector_get_ -limit KEYWORD2 PVector_limit_ -mag KEYWORD2 PVector_mag_ -mult KEYWORD2 PVector_mult_ -normalize KEYWORD2 PVector_normalize_ -set KEYWORD2 PVector_set_ -sub KEYWORD2 PVector_sub_ -quad KEYWORD2 quad_ -radians KEYWORD2 radians_ -random KEYWORD2 random_ -randomSeed KEYWORD2 randomSeed_ -rect KEYWORD2 rect_ -rectMode KEYWORD2 rectMode_ -red KEYWORD2 red_ -redraw KEYWORD2 redraw_ -requestImage KEYWORD2 requestImage_ -resetMatrix KEYWORD2 resetMatrix_ -return KEYWORD1 return -reverse KEYWORD2 reverse_ -<< rightshift -rotate KEYWORD2 rotate_ -rotateX KEYWORD2 rotateX_ -rotateY KEYWORD2 rotateY_ -rotateZ KEYWORD2 rotateZ_ -round KEYWORD2 round_ -saturation KEYWORD2 saturation_ -save KEYWORD2 save_ -saveBytes KEYWORD2 saveBytes_ -saveFrame KEYWORD2 saveFrame_ -saveStream KEYWORD2 saveStream_ -saveStrings KEYWORD2 saveStrings_ -scale KEYWORD2 scale_ -screen LITERAL2 screen -screenX KEYWORD2 screenX_ -screenY KEYWORD2 screenY_ -screenZ KEYWORD2 screenZ_ -second KEYWORD2 second_ -selectFolder KEYWORD2 selectFolder_ -selectInput KEYWORD2 selectInput_ -selectOutput KEYWORD2 selectOutput_ -; semicolon -set KEYWORD2 set_ -setup KEYWORD3 setup_ -shape KEYWORD2 shape_ -shapeMode KEYWORD2 shapeMode_ -shininess KEYWORD2 shininess_ -shorten KEYWORD2 shorten_ -sin KEYWORD2 sin_ -size KEYWORD2 size_ -smooth KEYWORD2 smooth_ -sort KEYWORD2 sort_ -specular KEYWORD2 specular_ -sphere KEYWORD2 sphere_ -sphereDetail KEYWORD2 sphereDetail_ -splice KEYWORD2 splice_ -split KEYWORD2 split_ -splitTokens KEYWORD2 splitTokens_ -spotLight KEYWORD2 spotLight_ -sq KEYWORD2 sq_ -sqrt KEYWORD2 sqrt_ -static KEYWORD1 static -status KEYWORD2 status_ -str KEYWORD2 str_ -String KEYWORD1 String -charAt KEYWORD2 String_charAt_ -equals KEYWORD2 String_equals_ -indexOf KEYWORD2 String_indexOf_ -length KEYWORD2 String_length_ -substring KEYWORD2 String_substring_ -toLowerCase KEYWORD2 String_toLowerCase_ -toUpperCase KEYWORD2 String_toUpperCase_ -stroke KEYWORD2 stroke_ -strokeCap KEYWORD2 strokeCap_ -strokeJoin KEYWORD2 strokeJoin_ -strokeWeight KEYWORD2 strokeWeight_ -subset KEYWORD2 subset_ --= subtractassign -super KEYWORD1 super -switch KEYWORD2 switch_ -tan KEYWORD2 tan_ -text KEYWORD2 text_ -textAlign KEYWORD2 textAlign_ -textAscent KEYWORD2 textAscent_ -textDescent KEYWORD2 textDescent_ -textFont KEYWORD2 textFont_ -textLeading KEYWORD2 textLeading_ -textMode KEYWORD2 textMode_ -textSize KEYWORD2 textSize_ -texture KEYWORD2 texture_ -textureMode KEYWORD2 textureMode_ -textWidth KEYWORD2 textWidth_ -this KEYWORD1 this -tint KEYWORD2 tint_ -translate KEYWORD2 translate_ -triangle KEYWORD2 triangle_ -trim KEYWORD2 trim_ -true KEYWORD1 true -TWO_PI LITERAL2 TWO_PI -unbinary KEYWORD2 unbinary_ -unhex KEYWORD2 unhex_ -updatePixels KEYWORD2 updatePixels_ -vertex KEYWORD2 vertex_ -void KEYWORD1 void -while KEYWORD1 while_ -width LITERAL2 width -XMLElement KEYWORD1 XMLElement -getChild KEYWORD2 XMLElement_getChild_ -getChildCount KEYWORD2 XMLElement_getChildCount_ -getChildren KEYWORD2 XMLElement_getChildren_ -getContent KEYWORD2 XMLElement_getContent_ -getFloatAttribute KEYWORD2 XMLElement_getFloatAttribute_ -getIntAttribute KEYWORD2 XMLElement_getIntAttribute_ -getName KEYWORD2 XMLElement_getName_ -getStringAttribute KEYWORD2 XMLElement_getStringAttribute_ -year KEYWORD2 year_ +setup KEYWORD3 Setup +loop KEYWORD3 Loop \ No newline at end of file diff --git a/build/shared/lib/preferences.txt b/build/shared/lib/preferences.txt index c8fa1f840..0e6e556d8 100755 --- a/build/shared/lib/preferences.txt +++ b/build/shared/lib/preferences.txt @@ -213,3 +213,14 @@ run.present.stop.color = #cccccc run.present.exclusive = false # use this by default to hide the menu bar and dock on osx run.present.exclusive.macosx = true + +# ARDUINO PREFERENCES +board = atmega328 + +upload.using = bootloader + +serial.port=COM1 +serial.databits=8 +serial.stopbits=1 +serial.parity=N +serial.debug_rate=9600 \ No newline at end of file