Skip to content

Three new boards and serial monitor window behavior change #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 14 commits into from
Closed

Three new boards and serial monitor window behavior change #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1f7b137
* Add Nanode and FREAKDUINO-CHIBI boards
Cougar Jan 8, 2012
3ab474a
Merge remote-tracking branch 'upstream/master' into nanode
Cougar Jan 8, 2012
caf5107
Added Freaduino ADK V1.0 (Arduino Mega2560)
Cougar Feb 16, 2012
2e9f5fc
Merge remote-tracking branch 'upstream/master'
Cougar Feb 16, 2012
79b02a4
Do not close terminal monitor for code uploads
Cougar Feb 16, 2012
9b98fcf
Merge remote-tracking branch 'upstream/master'
Cougar Feb 28, 2012
266aa18
Merge remote-tracking branch 'upstream/master'
Cougar Apr 2, 2012
4387096
Merge branch 'master' of https://github.com/arduino/Arduino
Cougar Apr 13, 2012
22454aa
Fix missing "(" typo
Cougar Apr 14, 2012
14f4737
added Estonian translation
Cougar Apr 14, 2012
79be737
Merge branch 'et-translation'
Cougar Apr 14, 2012
70e7149
Merge branch 'bugfixes'
Cougar Apr 14, 2012
c40b479
Estonian translation update
Cougar Sep 29, 2013
fe3780a
Merge branch 'et-translation'
Cougar Sep 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
8 changes: 4 additions & 4 deletions app/src/processing/app/Editor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2338,8 +2338,7 @@ class DefaultExportHandler implements Runnable {
public void run() {

try {
serialMonitor.closeSerialPort();
serialMonitor.setVisible(false);
serialMonitor.pauseSerialPort();

uploading = true;

Expand All @@ -2364,6 +2363,7 @@ public void run() {
}
status.unprogress();
uploading = false;
serialMonitor.unPauseSerialPort();
//toolbar.clear();
toolbar.deactivate(EditorToolbar.EXPORT);
}
Expand All @@ -2374,8 +2374,7 @@ class DefaultExportAppHandler implements Runnable {
public void run() {

try {
serialMonitor.closeSerialPort();
serialMonitor.setVisible(false);
serialMonitor.pauseSerialPort();

uploading = true;

Expand All @@ -2400,6 +2399,7 @@ public void run() {
}
status.unprogress();
uploading = false;
serialMonitor.unPauseSerialPort();
//toolbar.clear();
toolbar.deactivate(EditorToolbar.EXPORT);
}
Expand Down
2 changes: 2 additions & 0 deletions app/src/processing/app/Preferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ public class Preferences {
"Dansk" + " (" + _("Danish") + ")",
"Nederlands" + " (" + _("Dutch") + ")",
"English" + " (" + _("English") + ")",
"Eesti" + " (" + _("Estonian") + ")",
"Français" + " (" + _("French") + ")",
"Pilipino" + " (" + _("Filipino") + ")",
"Galego" + " (" + _("Galician") + ")",
Expand All @@ -109,6 +110,7 @@ public class Preferences {
"da",
"nl",
"en",
"et",
"fr",
"tl",
"gl",
Expand Down
2 changes: 1 addition & 1 deletion app/src/processing/app/Resources_ca.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ msgstr ""
msgid ""
"In Arduino 1.0, the default file extension has changed\n"
"from .pde to .ino. New sketches (including those created\n"
"by \"Save-As\" will use the new extension. The extension\n"
"by \"Save-As\") will use the new extension. The extension\n"
"of existing sketches will be updated on save, but you can\n"
"disable this in the Preferences dialog.\n"
"\n"
Expand Down
2 changes: 1 addition & 1 deletion app/src/processing/app/Resources_da.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -801,7 +801,7 @@ msgstr ""
msgid ""
"In Arduino 1.0, the default file extension has changed\n"
"from .pde to .ino. New sketches (including those created\n"
"by \"Save-As\" will use the new extension. The extension\n"
"by \"Save-As\") will use the new extension. The extension\n"
"of existing sketches will be updated on save, but you can\n"
"disable this in the Preferences dialog.\n"
"\n"
Expand Down
2 changes: 1 addition & 1 deletion app/src/processing/app/Resources_de.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ msgstr "Einige Dateien wurden als \"Read-Only\" markiert,\nalso müssen Sie sie
msgid ""
"In Arduino 1.0, the default file extension has changed\n"
"from .pde to .ino. New sketches (including those created\n"
"by \"Save-As\" will use the new extension. The extension\n"
"by \"Save-As\") will use the new extension. The extension\n"
"of existing sketches will be updated on save, but you can\n"
"disable this in the Preferences dialog.\n"
"\n"
Expand Down
2 changes: 1 addition & 1 deletion app/src/processing/app/Resources_el.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ msgstr "Κάποια αρχεία είναι \"μόνο-ανάγνωσης\", ο
msgid ""
"In Arduino 1.0, the default file extension has changed\n"
"from .pde to .ino. New sketches (including those created\n"
"by \"Save-As\" will use the new extension. The extension\n"
"by \"Save-As\") will use the new extension. The extension\n"
"of existing sketches will be updated on save, but you can\n"
"disable this in the Preferences dialog.\n"
"\n"
Expand Down
2 changes: 1 addition & 1 deletion app/src/processing/app/Resources_en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ msgstr ""
msgid ""
"In Arduino 1.0, the default file extension has changed\n"
"from .pde to .ino. New sketches (including those created\n"
"by \"Save-As\" will use the new extension. The extension\n"
"by \"Save-As\") will use the new extension. The extension\n"
"of existing sketches will be updated on save, but you can\n"
"disable this in the Preferences dialog.\n"
"\n"
Expand Down
2 changes: 1 addition & 1 deletion app/src/processing/app/Resources_es.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,7 +808,7 @@ msgstr ""
msgid ""
"In Arduino 1.0, the default file extension has changed\n"
"from .pde to .ino. New sketches (including those created\n"
"by \"Save-As\" will use the new extension. The extension\n"
"by \"Save-As\") will use the new extension. The extension\n"
"of existing sketches will be updated on save, but you can\n"
"disable this in the Preferences dialog.\n"
"\n"
Expand Down
Loading