Skip to content

Commit a123ab1

Browse files
alvieboyalvieboy
committed
Merge pull request #6 from GadgetFactory/work-0200
Latest changes from Jack
2 parents 1c34d80 + eda0f54 commit a123ab1

File tree

18 files changed

+1452
-189
lines changed

18 files changed

+1452
-189
lines changed

‎app/src/processing/app/Editor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ public class Editor extends JFrame implements RunnerListener {
156156

157157

158158
public Editor(Base ibase, String path, int[] location) {
159-
super("Arduino");
159+
super("ZAP");
160160
this.base = ibase;
161161

162162
Base.setIcon(this);
@@ -2237,7 +2237,7 @@ protected boolean handleOpenInternal(String path) {
22372237
// Set the title of the window to "sketch_070752a - Processing 0126"
22382238
setTitle(
22392239
I18n.format(
2240-
_("{0} | Arduino {1}"),
2240+
_("{0} | ZAP {1}"),
22412241
sketch.getName(),
22422242
Base.VERSION_NAME
22432243
)

‎build/build.xml

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0"?>
2-
<project name="Arduino" default="build">
2+
<project name="ZAP" default="build">
33
<!--echo message="os.name = ${os.name}" /-->
44
<!--echo message="os.arch = ${os.arch}" /-->
55
<!--echo message="os.version = ${os.version}" /-->
@@ -124,8 +124,8 @@
124124
<tokenfilter>
125125
<linetokenizer includeDelims="false" />
126126
<!-- grab the thing from the first line that's 4 digits -->
127-
<containsregex pattern="ARDUINO (.*) " />
128-
<replaceregex pattern="ARDUINO ([^ ]*).*" replace="\1" />
127+
<containsregex pattern="ZAP (.*) " />
128+
<replaceregex pattern="ZAP ([^ ]*).*" replace="\1" />
129129
</tokenfilter>
130130
<tokenfilter>
131131
<stringtokenizer suppressdelims="true" />
@@ -717,7 +717,7 @@
717717

718718
<target name="windows-run" depends="windows-build"
719719
description="Run windows version">
720-
<exec executable="windows/work/arduino.exe"
720+
<exec executable="windows/work/zap.exe"
721721
dir="windows/work" spawn="true"/>
722722
</target>
723723

@@ -776,23 +776,23 @@
776776
excludes="java/**" />
777777
-->
778778

779-
<zip destfile="windows/arduino-${version}-${platform}.zip" level="9">
779+
<zip destfile="windows/zap-${version}-${platform}.zip" level="9">
780780
<zipfileset dir="windows/work"
781-
prefix="arduino-${version}" />
781+
prefix="zap-${version}" />
782782
</zip>
783783

784-
<zip destfile="windows/arduino-${version}-${platform}-expert.zip" level="9">
784+
<zip destfile="windows/zap-${version}-${platform}-expert.zip" level="9">
785785
<zipfileset dir="windows/work"
786-
prefix="arduino-${version}"
786+
prefix="zap-${version}"
787787
excludes="java/**" />
788788
</zip>
789789

790790
<echo>
791791
=======================================================
792792
Arduino for Windows was built. Grab the archive from
793793

794-
windows/arduino-${version}-${platform}.zip
795-
windows/arduino-${version}-${platform}-expert.zip
794+
windows/zap-${version}-${platform}.zip
795+
windows/zap-${version}-${platform}-expert.zip
796796
=======================================================
797797
</echo>
798798
</target>
@@ -808,9 +808,9 @@
808808
addproperty="version"
809809
defaultvalue="${revision}" />
810810

811-
<tar compression="gzip" destfile="arduino-${version}-src.tar.gz">
811+
<tar compression="gzip" destfile="zap-${version}-src.tar.gz">
812812
<tarfileset dir="../"
813-
prefix="arduino-${version}"
813+
prefix="zap-${version}"
814814
excludes="**/*.tgz,
815815
**/*.bz2,
816816
**/build/macosx/,

‎build/shared/revisions.txt

+12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11

2+
ZAP 1.5.2 BETA - 2013.05.31
3+
4+
[zpuino]
5+
* Added Hyperion variants for LogicStart and Arcade MegaWing board types
6+
* Added bootloader functionality that associates bit files with each board type
7+
* Libraries moved to ZPUino hardware type
8+
* Experimental ZPUino 2.0 plugin added
9+
10+
[avr8]
11+
* Libraries moved to AVR8 hardware type
12+
* Added AVR8 hardware type from previous AVR8 only plugin
13+
214
ARDUINO 1.5.2 BETA - 2013.02.06
315

416
[ide]

‎build/windows/launcher/config.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<dontWrapJar>true</dontWrapJar>
33
<headerType>gui</headerType>
44
<jar>lib</jar>
5-
<outfile>arduino.exe</outfile>
5+
<outfile>zap.exe</outfile>
66
<errTitle></errTitle>
77
<cmdLine></cmdLine>
88
<chdir>.</chdir>

‎hardware/papilio/avr8/cores/arduino/Arduino.h

+1
Original file line numberDiff line numberDiff line change
@@ -211,5 +211,6 @@ long map(long, long, long, long, long);
211211
#endif
212212

213213
#include "pins_arduino.h"
214+
#include "pins_papilio.h"
214215

215216
#endif

‎hardware/papilio/avr8/cores/arduino/pins_papilio.c

-172
Original file line numberDiff line numberDiff line change
@@ -1,172 +0,0 @@
1-
/*
2-
pins_arduino.h - Pin definition functions for Arduino
3-
Part of Arduino - http://www.arduino.cc/
4-
5-
Copyright (c) 2007 David A. Mellis
6-
7-
This library is free software; you can redistribute it and/or
8-
modify it under the terms of the GNU Lesser General Public
9-
License as published by the Free Software Foundation; either
10-
version 2.1 of the License, or (at your option) any later version.
11-
12-
This library is distributed in the hope that it will be useful,
13-
but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15-
Lesser General Public License for more details.
16-
17-
You should have received a copy of the GNU Lesser General
18-
Public License along with this library; if not, write to the
19-
Free Software Foundation, Inc., 59 Temple Place, Suite 330,
20-
Boston, MA 02111-1307 USA
21-
22-
$Id: wiring.h 249 2007-02-03 16:52:51Z mellis $
23-
*/
24-
25-
//****************** Special definitions for the Papilio Platform **************************
26-
//Papilio Pin Swaps
27-
#define PWM0_LOC *(byte *) 0x1000
28-
#define PWM1A_LOC *(byte *) 0x1001
29-
#define PWM1B_LOC *(byte *) 0x1002
30-
#define PWM2_LOC *(byte *) 0x1003
31-
#define SPI1_mosi_LOC *(byte *) 0x1004
32-
#define SPI1_miso_LOC *(byte *) 0x1005
33-
#define SPI1_sck_LOC *(byte *) 0x1006
34-
#define SPI1_cs_LOC *(byte *) 0x1007
35-
36-
//Papilio Stepper Core definitions
37-
#define SM1_LOC *(byte *) 0x2000
38-
#define SM1CONTROL_L *(byte *) 0x2001
39-
#define SM1CONTROL_H *(byte *) 0x2002
40-
#define SM1TIMEBASE_L *(byte *) 0x2003
41-
#define SM1TIMEBASE_H *(byte *) 0x2004
42-
#define SM1PERIOD_L *(byte *) 0x2005
43-
#define SM1PERIOD_H *(byte *) 0x2006
44-
#define SM1STEPCNT_L *(byte *) 0x2007
45-
#define SM1STEPCNT_H *(byte *) 0x2008
46-
#define SM1STEPS_L *(byte *) 0x2009
47-
#define SM1STEPS_H *(byte *) 0x2010
48-
49-
//Papilio Button/LED Core definitions
50-
#define BL1_LOC *(byte *) 0x3000
51-
#define BL1CONTROL_L *(byte *) 0x3001
52-
#define BL1CONTROL_H *(byte *) 0x3002
53-
54-
//Papilio Wing Slots
55-
#define NO_SLOT 0
56-
#define AL 1
57-
#define AH 2
58-
#define BL 3
59-
#define BH 4
60-
#define CL 5
61-
#define CH 6
62-
63-
64-
//Papilio One Pin definitions
65-
//Wing 1 Column A
66-
#define A0 0
67-
#define A1 1
68-
#define A2 2
69-
#define A3 3
70-
#define A4 4
71-
#define A5 5
72-
#define A6 6
73-
#define A7 7
74-
#define A8 8
75-
#define A9 9
76-
#define A10 10
77-
#define A11 11
78-
#define A12 12
79-
#define A13 13
80-
#define A14 14
81-
#define A15 15
82-
83-
//Wing 1 Column B
84-
#define B0 16 //This doesn't work for some reason!
85-
#define B1 17
86-
#define B2 18
87-
#define B3 19
88-
#define B4 20
89-
#define B5 21
90-
#define B6 22
91-
#define B7 23
92-
#define B8 24
93-
#define B9 25
94-
#define B10 26
95-
#define B11 27
96-
#define B12 28
97-
#define B13 29
98-
#define B14 30
99-
#define B15 31
100-
101-
//Wing 2 Column C
102-
#define C0 32
103-
#define C1 33
104-
#define C2 34
105-
#define C3 35
106-
#define C4 36
107-
#define C5 37
108-
#define C6 38
109-
#define C7 39
110-
#define C8 40
111-
#define C9 41
112-
#define C10 42
113-
#define C11 43
114-
#define C12 44
115-
#define C13 45
116-
#define C14 46
117-
#define C15 47
118-
119-
// ******** Define AH/AL syntax
120-
//Wing 1 Column A
121-
#define AL0 0
122-
#define AL1 1
123-
#define AL2 2
124-
#define AL3 3
125-
#define AL4 4
126-
#define AL5 5
127-
#define AL6 6
128-
#define AL7 7
129-
#define AH0 8
130-
#define AH1 9
131-
#define AH2 10
132-
#define AH3 11
133-
#define AH4 12
134-
#define AH5 13
135-
#define AH6 14
136-
#define AH7 15
137-
138-
//Wing 1 Column B
139-
#define BL0 16 //This doesn't work for some reason!
140-
#define BL1 17
141-
#define BL2 18
142-
#define BL3 19
143-
#define BL4 20
144-
#define BL5 21
145-
#define BL6 22
146-
#define BL7 23
147-
#define BH0 24
148-
#define BH1 25
149-
#define BH2 26
150-
#define BH3 27
151-
#define BH4 28
152-
#define BH5 29
153-
#define BH6 30
154-
#define BH7 31
155-
156-
//Wing 2 Column C
157-
#define CL0 32
158-
#define CL1 33
159-
#define CL2 34
160-
#define CL3 35
161-
#define CL4 36
162-
#define CL5 37
163-
#define CL6 38
164-
#define CL7 39
165-
#define CH0 40
166-
#define CH1 41
167-
#define CH2 42
168-
#define CH3 43
169-
#define CH4 44
170-
#define CH5 45
171-
#define CH6 46
172-
#define CH7 47

0 commit comments

Comments
 (0)