Skip to content

Error color #7537

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.

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 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5e9406e
Update README.md
ALGU-GitHub Feb 5, 2018
78f35b6
Update README.md
Feb 5, 2018
2b901be
swap function between iswhitespce and isspace
zikunliu Mar 26, 2018
aa5381c
Delete Original About Page
ayohenry Mar 28, 2018
06ee1ea
Delete Original Splash Page
ayohenry Mar 28, 2018
efe7b76
Uploading Our About Page and Splash Screen
ayohenry Mar 28, 2018
cea4e4b
Delete Wrong About Page
ayohenry Mar 28, 2018
4066cc1
Uploading Correct Winner Chicken About Page
ayohenry Mar 28, 2018
758a55b
Line Numbers on by Default
ayohenry Mar 28, 2018
cb538d7
added documentation to preferences.txt
Apr 11, 2018
74a077c
changed preferences for auto format
Apr 16, 2018
9d54592
Change to preference
ayohenry Apr 16, 2018
ee8efaa
Increase font size and String.float() fixed
ayohenry Apr 17, 2018
3ef7814
Adding fix for increase font size keyboard shortcut and String.toFloa…
ayohenry Apr 17, 2018
81b815d
Merge branch 'master' of https://github.com/ALGU-GitHub/Arduino
ayohenry Apr 17, 2018
ff54d25
Keyboard shortcut to toggle line numbers
ayohenry Apr 17, 2018
01fd4df
Added Comments on Keyboard Shortcuts
ayohenry Apr 23, 2018
1846477
Commented on Line Number Method
ayohenry Apr 23, 2018
9cfb880
Added comments for String::toFloat()
ayohenry Apr 23, 2018
756c995
Revert String.toFloat()
ayohenry Apr 26, 2018
bf81006
add compile time
zikunliu Apr 28, 2018
8c42fbf
added line highlighting
Apr 28, 2018
43d4995
changed error color to be brighter
Apr 28, 2018
afee888
Links to Alternative GUI Theme .zip Files
ALGU-GitHub Apr 28, 2018
bfa6a61
revert change to error output
Apr 30, 2018
75656ab
Changed error output color to brighter orange for better visibility
Apr 30, 2018
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
13 changes: 13 additions & 0 deletions LinksToThemes.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
The following links to a .zip file containing Arduino IDE's of different themes.

Darkmode:
https://drive.google.com/open?id=1FmHbchrEP4liQsDU9AirGmKO_shUO8vS

Grayscale:
https://drive.google.com/open?id=1Oju1h0spgkYQ_Jxcd5EgW7BOyjRl5_ou

Inverted:
https://drive.google.com/file/d/1jGh3BPdnRtl8RSeUdKsXvhmUfuQq0Nl8/view?usp=sharing

All Themes:
https://drive.google.com/file/d/1kCt66OMgP7BhYhgKw4M8smg2B1fR8_Qa/view?usp=sharing
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Arduino
========

========
* A Fork By Winner Chicken.
Winner Chicken are ALAN, AHSI, AYO, ZIKUN.
* Arduino is an open-source physical computing platform based on a simple I/O
board and a development environment that implements the Processing/Wiring
language. Arduino can be used to develop stand-alone interactive objects or
Expand Down
10 changes: 10 additions & 0 deletions app/src/processing/app/Base.java
Original file line number Diff line number Diff line change
Expand Up @@ -1878,6 +1878,16 @@ public void handleFontSizeChange(int change) {
getEditors().forEach(Editor::applyPreferences);
}

// Method turns line number on/off when triggered by keyboard shortcut
public void toggleLineNumber() {
if (PreferencesData.getBoolean("editor.linenumbers")) {
PreferencesData.setBoolean("editor.linenumbers", false);
} else {
PreferencesData.setBoolean("editor.linenumbers", true);
}
getEditors().forEach(Editor::applyPreferences);
}

public List<JMenu> getBoardsCustomMenus() {
return boardsCustomMenus;
}
Expand Down
5 changes: 4 additions & 1 deletion app/src/processing/app/Editor.java
Original file line number Diff line number Diff line change
Expand Up @@ -1754,10 +1754,13 @@ public BuildHandler(boolean verbose, boolean saveHex) {

@Override
public void run() {
long startTime=System.currentTimeMillis();
try {
removeAllLineHighlights();
sketchController.build(verbose, saveHex);
statusNotice(tr("Done compiling."));
long endTime=System.currentTimeMillis();
long time=endTime-startTime;
statusNotice(tr("Done compiling. Comiling time: "+time+"ms"));
} catch (PreferencesMapException e) {
statusError(I18n.format(
tr("Error while compiling: missing '{0}' configuration parameter"),
Expand Down
1,135 changes: 1,135 additions & 0 deletions build/hs_err_pid2398.log

Large diffs are not rendered by default.

Binary file modified build/shared/lib/about.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified build/shared/lib/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion build/shared/lib/preferences.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
# You'll have problems running Processing if you incorrectly
# modify lines in this file.

# DO NOT CHANGE THIS FILE if you want to edit autoformatter
# Look for the file "formatter.conf" and follow instructions at top

# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

Expand Down Expand Up @@ -112,7 +114,7 @@ editor.caret.blink=true
editor.invalid=false

# show line numbers in editor
editor.linenumbers = false
editor.linenumbers = true

# enable ctrl-ins, shift-ins, shift-delete for cut/copy/paste
# on windows and linux, but disable on the mac
Expand Down
4 changes: 2 additions & 2 deletions build/shared/lib/theme/theme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ console.font = Monospaced,plain,11
console.font.macosx = Monaco,plain,10
console.color = #000000
console.output.color = #eeeeee
console.error.color = #E34C00
console.error.color = #FF8300

# GUI - BUTTONS
buttons.bgcolor = #006468
Expand Down Expand Up @@ -64,7 +64,7 @@ editor.bgcolor = #ffffff
# highlight for the current line
editor.linehighlight.color=#e2e2e2
# highlight for the current line
editor.linehighlight=false
editor.linehighlight=true

# caret blinking and caret color
editor.caret.color = #333300
Expand Down
6 changes: 3 additions & 3 deletions hardware/arduino/avr/cores/arduino/WCharacter.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ inline boolean isAscii(int c)
// Checks for a blank character, that is, a space or a tab.
inline boolean isWhitespace(int c)
{
return ( isblank (c) == 0 ? false : true);
return ( isspace (c) == 0 ? false : true);
}


Expand Down Expand Up @@ -120,7 +120,7 @@ inline boolean isPunct(int c)
// return ('\r'), horizontal tab ('\t'), and vertical tab ('\v').
inline boolean isSpace(int c)
{
return ( isspace (c) == 0 ? false : true);
return ( isblank (c) == 0 ? false : true);
}


Expand Down Expand Up @@ -165,4 +165,4 @@ inline int toUpperCase(int c)
return toupper (c);
}

#endif
#endif
4 changes: 2 additions & 2 deletions hardware/arduino/avr/cores/arduino/WString.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
WString.cpp - String library for Wiring & Arduino
...mostly rewritten by Paul Stoffregen...
Copyright (c) 2009-10 Hernando Barragan. All rights reserved.
Expand Down Expand Up @@ -746,5 +746,5 @@ float String::toFloat(void) const
double String::toDouble(void) const
{
if (buffer) return atof(buffer);
return 0;
return 0.0;
}