rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-11-29 10:24:12 +01:00
Code Issues Releases Activity
4,538 Commits 7 Branches 93 Tags 2.9 GiB
5af390b5e2
Commit Graph

1035 Commits

Author SHA1 Message Date
Cristian Maglie
2a8c742453 Added Contribution installer, install and remove correctly. 
Tested on linux
 2015-03-27 14:51:09 +01:00
Cristian Maglie
373a625903 GUI for platform installer, first draft 2015-03-27 14:51:09 +01:00
Cristian Maglie
100dd21bd0 Added Contributed Platforms. 
- TargetPackage / TargetPlatform / TargetBoard are now interfaces
- Contributions installed are detected during init time
- Tools must be referenced through "path" property (automatically set
  by the IDE to the contributed tool path)
 2015-03-27 14:51:09 +01:00
Cristian Maglie
0588790f5b Added JARs Bouncy Castle, Jackson, Common-compress 2015-03-27 14:51:08 +01:00
Federico Fissore
155abfe280 MacOSX: Fest is not working well with java7+, needs a cheat 2015-03-26 15:16:44 +01:00
Federico Fissore
aac484e364 MacOSX: working directory for tests is changed 2015-03-26 09:59:40 +01:00
Federico Fissore
36079efccb Added missing license headers 2015-03-25 10:13:42 +01:00
Federico Fissore
6bdfa00e61 Splashscreen: initial message 2015-03-19 12:26:36 +01:00
Federico Fissore
ec1db8ca8a New splashscreen and about images 2015-03-17 10:49:16 +01:00
Federico Fissore
dba808c3dc Instantiating SplashScreenHelper in main() was leaving it null for the tests. Fixed 2015-03-13 11:35:37 +01:00
Federico Fissore
38f868af5b Fixed placement of find & replace dialog 2015-03-13 11:30:42 +01:00
Federico Fissore
b4ff39144c Preferences frame opens on top of active editor 2015-03-13 10:49:16 +01:00
Federico Fissore
2a0bc2bfca Splashscreen 2015-03-13 10:39:18 +01:00
Federico Fissore
e08bd63038 Resetting swing.aatext to the preferred value as soon as preferences are available 2015-03-13 09:43:01 +01:00
Federico Fissore
c946a29aac Nicer fonts 2015-03-12 09:58:32 +01:00
Federico Fissore
c287450d72 Added missing translations 2015-03-10 08:52:42 +01:00
Federico Fissore
39d1dfc999 Added warning for uncertified boards 2015-03-10 08:52:41 +01:00
Federico Fissore
84acf463ec Fix to save as to parent folder is needed by all OSs, not just Mac 2015-03-04 12:15:07 +01:00
Federico Fissore
803a0eebb4 Merge branch 'saveas_to_parent_folder_mac' of https://github.com/delftswa2014/Arduino into delftswa2014-saveas_to_parent_folder_mac 2015-03-04 11:48:29 +01:00
Federico Fissore
e327bb091a MacOSX: better IDE 2015-03-03 15:48:20 +01:00
Federico Fissore
b7b8a35404 NEW button now behaves as clicking File -> New menu entry. Fixes #2685 2015-03-02 10:08:58 +01:00
Ivo van de Grift
58581e2eb1 Added .getParentFile() to saveas for mac. This prevents saving into the sketch itself 2015-02-27 17:35:14 +01:00
Federico Fissore
6d2aa17051 Compound edits weren't part of the undo/redo dance 2015-02-27 15:51:58 +01:00
Federico Fissore
cad74c5f7c An undoable action marks the sketh as modified 2015-02-27 15:51:57 +01:00
Federico Fissore
78f2e87b00 Undo and Redo state update were setting the sketch to modified, even if it was not. Fixes #2653 2015-02-27 15:51:57 +01:00
Cristian Maglie
d1feeb5419 Added a bunch of new languages and updated translations 2015-02-27 15:10:27 +01:00
Geronimo Bareiro
2dbe0059c5 Fix use the correct reference. 
it was used file, wich was a null pointer, use sketchFile instead.
 2015-02-26 03:03:25 -03:00
Federico Fissore
e385f67fce Better error message when opening serial monitor on a busy serial device. Closes #2632 2015-02-23 10:40:47 +01:00
PaulStoffregen
3bd694d78b Update status bar when custom menus change 2015-02-22 03:54:44 -08:00
Cristian Maglie
cf3e9480a5 Merge pull request #2626 from ffissore/hide-cu-devs-on-mac 
Macosx: filter out /dev/cu* ports
 2015-02-13 15:49:27 +01:00
Federico Fissore
5687528325 Fixed bug introduced by #2628 2015-02-13 15:30:43 +01:00
Federico Fissore
a49963d0ad Filter out /dev/cu* ports, can be re-enabled manually adding "serial.ports.showall=true" into preferences.txt file 
Closes #2624
 2015-02-13 10:53:12 +01:00
Federico Fissore
fea3848ee0 Split ports in menu, grouping boards by their protocol 
Closes #2627
 2015-02-11 13:08:20 +01:00
Cristian Maglie
c4cd447283 Updated offline docs 2015-02-08 19:49:27 +01:00
Federico Fissore
7adaba5630 MacOS tests fix: new way of discovering work dir conflicts with tests execution. Fixed. 2015-02-03 17:00:51 +01:00
Federico Fissore
d460982623 Macosx: new appbundler, new macosx builds. Use platform=macosx and platform=oldmacosx 2015-02-02 09:53:56 +01:00
Cristian Maglie
5ff4c9f8dc Temporary disabled DefaultTargetTest under certain conditions 2015-01-14 18:42:19 +01:00
Cristian Maglie
81808d532e Merge branch 'ide-1.5.x-fail-when-no-platform-txt' of https://github.com/ffissore/Arduino into ide-1.5.x 2015-01-14 17:19:11 +01:00
Cristian Maglie
60309fe8b8 Fixed test 2015-01-14 17:18:43 +01:00
Cristian Maglie
244a750bef Merge branch 'wayoda-fix-find-dialog-layout' into ide-1.5.x 2015-01-13 23:30:22 +01:00
Cristian Maglie
17115b0a9b Fixed NPE when import menu are empty 2015-01-13 23:16:53 +01:00
Cristian Maglie
56b9f1cd6f Fixed NPE when currently selected platform is no more installed. 
BaseNoGui.getTargetBoard() now handles null TargetBoard.
Removed unused method Base.getTargetBoard()
 2015-01-13 23:16:53 +01:00
Cristian Maglie
29d2ab72e2 Fixed a bunch of simple warnings in java code 2015-01-13 23:16:50 +01:00
Cristian Maglie
99715d22d9 Removed unused classes Commander.java and Webserver.java 2015-01-13 23:05:36 +01:00
Cristian Maglie
92118494ed Slighlty better layout for Search and Replace dialog. 
See https://github.com/arduino/Arduino/pull/2540#issuecomment-69167281
 2015-01-08 14:41:54 +01:00
Federico Fissore
b16ee6c7b2 Editor: removed duplicated classes DefaultRunHandler, and DefaultPresentHandler in favour of generic BuildHandler 2015-01-08 14:03:38 +01:00
Federico Fissore
980709f6f7 Compiler: missing mandatory key now blocks compilation 2015-01-08 13:57:59 +01:00
Cristian Maglie
18fc1c9f45 Find/Replace dialog, added 10px of padding to match other dialogs 2015-01-07 16:02:12 +01:00
Cristian Maglie
78e098e3d7 Indent pass, no code change 2015-01-07 16:01:37 +01:00
wayoda
858bd455d7 Fix layout for Find-Replace dialog 2015-01-07 15:14:44 +01:00
Cristian Maglie
863cb417a6 Merge pull request #2485 from ffissore/ide-1.5.x-reenable-38400 
Re enable 38400 baud rates
 2015-01-06 17:39:44 +01:00
Cristian Maglie
ab92e42259 Merge branch 'master' into ide-1.5.x 
Conflicts:
	app/src/processing/app/Serial.java
	app/src/processing/app/SerialMonitor.java
 2014-12-23 16:41:38 +01:00
Cristian Maglie
8e0a311e87 SerialMonitor: limit buffering without autoscroll 
When the "autoscroll" checkbox is deselected the buffer may continue
to grow up to twice of the maximum size.

This is a compromise to ensure a better user experience and, at the
same time, reduce the chance to lose data and get "holes" in the
serial stream.

See #2491
 2014-12-23 14:11:45 +01:00
Cristian Maglie
63f5d26ae9 Improved Serial input processing. 
Before this patch every byte received from Serial
invokes a String allocation, not really efficient.

Moreover a InputStreamReader is chained on the serial
InputStream to correctly convert bytes into UTF-8
characters.
 2014-12-23 12:58:41 +01:00
Cristian Maglie
391d3380ee Removed leftover debug print 2014-12-10 11:01:45 +01:00
Cristian Maglie
35848e09a8 Mitigated Serial Monitor resource exhaustion when the connected device sends a lot of data 
Fixes #2233
 2014-12-10 10:37:43 +01:00
Federico Fissore
2f08fe4ecf 38400 baud rate had issues with RXTX and linux. With JSSC, it seems to be working fine again. Fixes #2296 2014-12-04 13:10:01 +01:00
Cristian Maglie
6eef453944 Fixed EditorConsole new-line regression. 
Now EditorConsole starts a newline also when a CR character is read
from command output.
 2014-11-25 15:37:55 +01:00
Cristian Maglie
15f3d1f8e7 Fixed import style in EditorConsole.java 2014-11-25 15:37:54 +01:00
Cristian Maglie
81a562e0ed Updated eclipse project library path 2014-11-25 15:37:54 +01:00
Cristian Maglie
257238c050 IDE: better error handling for upload/burn bootloader 
RunnerException was displayed with an ugly stacktrace, while the
message contained in the exception itself is already quite enough
detailed and clear.
 2014-11-20 14:00:43 +01:00
Cristian Maglie
b0bd52b387 Removed duplicate version fields in Base class 2014-11-18 14:04:14 +01:00
Cristian Maglie
13fd27704f Added unit-test jars into eclipse project class path 2014-11-18 12:31:17 +01:00
Cristian Maglie
7b2ed12ad7 Temporarily disabled I18N test 2014-11-13 16:34:25 +01:00
Claudio Indellicati
98bdc7b587 Moved specialized Platform classes and related resources to the 'arduino-core' project. 2014-11-13 16:34:25 +01:00
Cristian Maglie
d1f4e0370d arduino-core project is now correctly compiled through ant build script 2014-11-13 16:34:24 +01:00
Cristian Maglie
ba8eadeeb5 Split IDE into 2 projects. 
BEWARE: HIGHLY EXPERIMENTAL BRANCH
 2014-11-13 16:34:24 +01:00
Claudio Indellicati
2de206cccd Modified preferences initialization in BaseNoGui. 2014-11-13 16:23:46 +01:00
Claudio Indellicati
1974d77abe Added new command line options. 
--buildpath
--nouploadport
--useprogrammer
 2014-11-13 16:23:46 +01:00
Claudio Indellicati
b2a88ecdd2 Removed inheritance relationship between SketchCodeDocument and SketchCode. 2014-11-13 16:23:46 +01:00
Claudio Indellicati
c2223107b1 Fixed wrong sketch structure check. 2014-11-13 16:23:46 +01:00
Claudio Indellicati
2702ccef0c Added main() and init() methods to BaseNoGui. 
Now the the GUI and the rest of the code should be completely separated.
 2014-11-13 16:23:46 +01:00
Claudio Indellicati
4d3599b2c4 Moved getBuildFolder() and related members/methods from Base to BaseNoGui. 2014-11-13 16:23:46 +01:00
Claudio Indellicati
6d28e12a41 Moved commandline parsing code from Base/BaseNoGui to new CommandlineParser class. 2014-11-13 16:23:45 +01:00
Claudio Indellicati
035e57e909 Moved getDefaultSketchbookFolder() from Base to BaseNoGui and other minor fixes. 2014-11-13 16:23:45 +01:00
Claudio Indellicati
26a8b37d18 Refactored Base.getDefaultSketchbookFolder() method. 2014-11-13 16:23:45 +01:00
Claudio Indellicati
20582630a5 Moved portableSketchbookFolder from Base to BaseNoGui. 2014-11-13 16:23:45 +01:00
Claudio Indellicati
10af59f6fa Moved some code from Base to BaseNoGui into new getSketchbookPath() method. 2014-11-13 16:23:45 +01:00
Claudio Indellicati
443f7a7150 Moved some parameter processing methods from Base to BaseNoGui. 2014-11-13 16:23:45 +01:00
Claudio Indellicati
abe6ff5f32 Moved onBoardOrPortChange() and related members/methods from Base to BaseNoGui. 2014-11-13 16:23:45 +01:00
Claudio Indellicati
8687a78db5 Removed leftover dependency from SketchCodeDocument in SketchData. 2014-11-13 16:23:45 +01:00
Claudio Indellicati
061d1f14b6 Moved the sketch uploading code from Sketch to Compiler. 2014-11-13 16:23:44 +01:00
Claudio Indellicati
998142d16d Moved last showError() method for Base to BaseNoGui. 2014-11-13 16:23:44 +01:00
Claudio Indellicati
83c61376e0 Split UploaderAndMonitorFactory in two distinct classes. 2014-11-13 16:23:44 +01:00
Claudio Indellicati
0919b0e4fe Moved countLines() and loadFile() from Base to BaseNoGui. 2014-11-13 16:23:44 +01:00
Claudio Indellicati
b0d8a504dd Moved isSanitaryName() and sanitizeName() from Sketch to BaseNoGui. 2014-11-13 16:23:44 +01:00
Claudio Indellicati
4b69baadac Removed last dependency from Base in processing.app.Platform. 2014-11-13 16:23:44 +01:00
Claudio Indellicati
36fd0bf344 Moved removeDescendants() and removeDir() from Base to BaseNoGui. 2014-11-13 16:23:44 +01:00
Claudio Indellicati
7c58be397b Fixed wrong sketch structure check in Editor and SketchData. 2014-11-13 16:23:44 +01:00
Claudio Indellicati
612f4c926f Moved discoveryManager from Base to BaseNoGui. 2014-11-13 16:23:43 +01:00
Claudio Indellicati
1c8a4e9f58 Added sketch structure check to the build method of Compile. 2014-11-13 16:23:43 +01:00
Claudio Indellicati
5db851cf9f Moved the sketch structure check code from Editor to SketchData. 2014-11-13 16:23:43 +01:00
Claudio Indellicati
afbbe77752 Moved the sketch building code from Sketch to Compiler. 2014-11-13 16:23:43 +01:00
Claudio Indellicati
b7d1846eb9 Moved some code from Base to BaseNoGui and removed leftover self class references from BaseNoGui. 2014-11-13 16:23:43 +01:00
Claudio Indellicati
f2d92bbd0f Removed dependency from Preferences in a bunch of classes. 2014-11-13 16:23:43 +01:00
Claudio Indellicati
22be22a5a7 Removed self class references from Base. 2014-11-13 16:23:43 +01:00
Claudio Indellicati
b278c19a2a Removed dependency from Base in all Platform classes. 2014-11-13 16:23:43 +01:00
Claudio Indellicati
eb284804f5 Moved showWarning() implementation from Base to BaseNoGui. 2014-11-13 16:23:42 +01:00
Claudio Indellicati
74f59c215a Changed UserNotifier from interface to abstract class. 2014-11-13 16:23:42 +01:00
Claudio Indellicati
bff6f2818b Renamed user notifier classes. 2014-11-13 16:23:42 +01:00
Claudio Indellicati
1c37189599 Removed unused parameter (base). 2014-11-13 16:23:42 +01:00
Claudio Indellicati
bc6b488cf6 Removed leftover references to Base in BaseNoGui. 2014-11-13 16:23:42 +01:00
Claudio Indellicati
d6bd77ec2b Removed dependency from Base in PreferencesData. 2014-11-13 16:23:42 +01:00
Claudio Indellicati
fa0d37dad6 Added notifier interface and classes. 2014-11-13 16:23:42 +01:00
Claudio Indellicati
a43d207e4f Removed dependency from Base in the uploaders. 2014-11-13 16:23:42 +01:00
Claudio Indellicati
1bb2da83c1 Moved some initialization code from Base to BaseNoGui. 2014-11-13 16:23:41 +01:00
Claudio Indellicati
e83462b508 Changed dependency from Preferences to PreferencesData in processing.app.linux.Platform and processing.app.windows.Platform. 2014-11-13 16:23:41 +01:00
Claudio Indellicati
c666274bf9 Moved libraries and importToLibraryTable (and related methods) from Base to BaseNoGui (work in progress). 2014-11-13 16:23:41 +01:00
Claudio Indellicati
64c6fe536c Moved saveFile() from Base to BaseNoGui (work in progress). 2014-11-13 16:23:41 +01:00
Claudio Indellicati
4443911746 Moved getBoardPreferences() and related methods from Base to BaseNoGui (work in progress). 2014-11-13 16:23:41 +01:00
Claudio Indellicati
4c1b187313 Moved platform (and related methods) from Base to BaseNoGui (work in progress). 2014-11-13 16:23:41 +01:00
Claudio Indellicati
7776ffac4f Moved packages, currentDirectory and portableFolder (and related methods) from Base to BaseNoGui (work in progress). 2014-11-13 16:23:41 +01:00
Claudio Indellicati
118826e855 Moved getAvrBasePath() and related methods from Base to BaseNoGui (work in progress). 2014-11-13 16:23:41 +01:00
Claudio Indellicati
057106f1b9 Moved version info to BaseNoGui new class (work in progress). 2014-11-13 16:23:41 +01:00
Cristian Maglie
be96ae3a6a Removed no more used 'core' project 2014-11-13 16:23:40 +01:00
Cristian Maglie
50f89d9665 Refactored OS detection subroutine. 
Moved from Base into a specific utility class OSUtils.
Removed unused platform constants.
 2014-11-13 16:23:40 +01:00
Cristian Maglie
e0f680be5b Drop dependency from processing-core project. 2014-11-13 16:23:40 +01:00
Cristian Maglie
18a8d4d627 Created PApplet and PConstants wrapper classes. 
Also removed unused ColorSelector and CreateFont to reduce wrappers
size to the minimum.
This commit is preparatory for dropping dependency on processing-core.
 2014-11-13 16:22:54 +01:00
Claudio Indellicati
21de7bdea3 Moved some code from Sketch to SketchData. 2014-11-13 16:22:54 +01:00
Claudio Indellicati
b61f2a419f Made Compiler and PdePreprocessor independent from Preferences. 
Created a class PreferencesData to manage all parameters except the ones for the GUI.
Removed GUI parameters management from ParametersMap.
Created ParametersHelper class to help with GUI parameters management.
Used ParametersHelper in Themes.
 2014-11-13 16:22:54 +01:00
Cristian Maglie
54f3f538f2 Applied (a sort of) decorator pattern to SketchCodeDoc. 
SketchCodeDoc renamed to SketchCodeDocument.
Compiler is now independent from SketchCodeDocument.
 2014-11-13 16:18:41 +01:00
Cristian Maglie
bbd3782a9c Reintroduced 'Next Tab' and 'Prev Tab' click actions 2014-11-13 16:18:41 +01:00
Claudio Indellicati
79ab98fef9 Make Compiler independent from Sketch. 
Create a class SketchData to store all relevant data for a sketch
(trying to keep GUI stuff out of the way).

Moved preprocessing code from Sketch to Compiler.
 2014-11-13 16:18:41 +01:00
Claudio Indellicati
e6563cfebf Removed GUI dependencies from SketchCode class. 
Moved GUI fields into a SketchCodeDocument container class.
 2014-11-13 16:18:41 +01:00
Cristian Maglie
af19257fbd Rationalized Preferences and Theme classes. 
Removed a lot of duplicate/unused code. Preferences un-marshalling
is now handled in PreferencesMap class.
 2014-11-13 16:18:40 +01:00
Cristian Maglie
872897d6ad Splitted GUI and Streams in EditorConsole 2014-11-13 16:18:40 +01:00
Cristian Maglie
93562a7800 Refactored and simplified EditorConsole class. 2014-11-13 16:18:40 +01:00
Cristian Maglie
479b974fe1 Refactoring of Theme class 2014-11-13 16:18:40 +01:00
Cristian Maglie
026dd50d87 Removed some warning from Editor class 2014-11-13 16:18:40 +01:00
Cristian Maglie
dd911bc79d Removed some trivial warnings 2014-11-13 16:18:40 +01:00
Cristian Maglie
9bc1824b96 Removed unused Base.getBoardsViaNetwork() and related member. 2014-11-13 16:18:40 +01:00
Matthijs Kooijman
e994c52729 Don't store the extension in SketchCode 
Nobody was using it anymore, except for checking against specific
extensions, which is easily done against the filename itself. This
prepares for some simplification of Sketch.load next.
 2014-11-13 16:18:40 +01:00
Matthijs Kooijman
43dac3a902 Use SketchCode.isExtension in more places 2014-11-13 16:18:40 +01:00
Matthijs Kooijman
af0d8c7f5c Let Sketch.getExtensions() return a List 
This simplifies upcoming changes.
 2014-11-13 16:18:39 +01:00
Matthijs Kooijman
a6013720e5 Explicitely store a layout type for a library 
Previously, the useRecursion and srcFolders were filled on library
creation, based on the existence of the src folder. Now, a layout
variable is set, and the useRecursion() and getSrcFolder() methods
change their return value based on the layout in use.
 2014-11-13 16:18:39 +01:00
Cristian Maglie
9a9fef808c Renamed preferences 'save.verifyUpload' to 'editor.save_on_verify' 2014-11-09 20:44:12 +01:00
Cristian Maglie
9a441d6dae Do not auto-save on verify/upload if sketch is readonly 2014-11-09 20:38:16 +01:00
Fulvio Ieva
5a6af2cf02 add save when verifyng and uploading #1934 2014-11-09 20:34:56 +01:00
Cristian Maglie
52b685a7a5 Merge remote-tracking branch 'ide-1.5.x-avrdude' into ide-1.5.x 2014-11-05 19:49:53 +01:00
Cristian Maglie
b4f2af4f9d Merge remote-tracking branch 'ide-1.5.x-core.a-rebuild' into ide-1.5.x 2014-11-02 11:52:57 +01:00
Matthijs Kooijman
b78339238d Don't recompile core.a if none of the .o files changed 
Before, core.a would be rebuilt on every build, even when none of the
core .o files changed. Now, the timestamps are checked against the
timestamp on core.a first, skipping the build if nothing changed.

Because this uses the current list of .o files, there is a corner case
when a source file is deleted, but no other source file is modified. In
that case, core.a is not rebuilt, even though it should be. However,
this is such a narrow and unrealistic case, that it should pose a real
problem.

This fixes part of #1991
 2014-10-31 17:48:29 +01:00
Matthijs Kooijman
87c87c2897 Delete core.a when building it fails 
This prevents a half-finished core.a file from lingering around.
Currently, this should not make a difference since core.a is rebuilt
every time, but this prepares for skipping this build step if possible.
 2014-10-31 15:43:42 +01:00
Matthijs Kooijman
57bdacc93c Remove core.a before rebuilding it 
Before, the ar command was just ran for all .o files that should end up
in core.a, which should replace any old code in core.a. However, it
seems that in the unlikely event that functions or entire source files
are deleted, they might linger in the core.a file.
 2014-10-31 15:43:07 +01:00
Cristian Maglie
e76de57f6b Fixed parsing of dependency files (.d) to improve sketch build speed 
Close #2255
 2014-10-31 11:39:36 +01:00
Matthijs Kooijman
d4ca6ce127 Allow setting a line timeout in MessageSiphon 
Previously, the MessageSiphon class would read characters from an
InputStream and then push them to the passed MessageConsumer one line at
a time.

Now, you can specify a line timeout. Normally, messages are still
processed line by line, but if no line ending is received within the
specified timeout (counting from the first character in the line), then
the incomplete line is passed on as a message, without waiting for the
line ending.

This feature is used for the uploader command output. In particular,
this allows the avrdude progress bar to be shown in the IDE as expected,
character by character (previously, the entire progress bar would be
buffered, making it show up completely at the end of the upload).
 2014-10-30 12:36:06 +01:00
Cristian Maglie
ed5ad426dd Upped version to 1.0.7. Update revision log. 2014-10-10 00:08:41 +02:00
Cristian Maglie
35d616f050 Updated 'master' translations 2014-10-09 10:13:00 +02:00
Federico Fissore
b6a4c8172f Processing references removed in favour of Arduino 2014-10-08 18:36:25 +02:00
Federico Fissore
82b6e6e325 macosx: removing java.additional.jvmargs property used for proper tests execution 2014-10-07 13:46:51 +02:00
Federico Fissore
1b783fa48c Formatter: cursor position is saved when invoking autoformat. Fixes #2293 2014-09-30 17:17:13 +02:00