Skip to content
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

Preferences option to allow use of sketch's platform.sketch.txt file #7821

Closed
wants to merge 1 commit into from
Closed

Preferences option to allow use of sketch's platform.sketch.txt file #7821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions app/src/cc/arduino/view/preferences/Preferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ private void initComponents() {
checkboxesContainer = new javax.swing.JPanel();
displayLineNumbersBox = new javax.swing.JCheckBox();
enableCodeFoldingBox = new javax.swing.JCheckBox();
usePlatformSketchTxtBox = new javax.swing.JCheckBox();
verifyUploadBox = new javax.swing.JCheckBox();
externalEditorBox = new javax.swing.JCheckBox();
cacheCompiledCore = new javax.swing.JCheckBox();
Expand Down Expand Up @@ -256,6 +257,9 @@ public void mouseEntered(java.awt.event.MouseEvent evt) {
enableCodeFoldingBox.setText(tr("Enable Code Folding"));
checkboxesContainer.add(enableCodeFoldingBox);

usePlatformSketchTxtBox.setText(tr("Allow use of platform.sketch.txt file"));
checkboxesContainer.add(usePlatformSketchTxtBox);

verifyUploadBox.setText(tr("Verify code after upload"));
checkboxesContainer.add(verifyUploadBox);

Expand Down Expand Up @@ -728,6 +732,7 @@ private void autoScaleCheckBoxItemStateChanged(java.awt.event.ItemEvent evt) {//
private javax.swing.JLabel comboWarningsLabel;
private javax.swing.JCheckBox displayLineNumbersBox;
private javax.swing.JCheckBox enableCodeFoldingBox;
private javax.swing.JCheckBox usePlatformSketchTxtBox;
private javax.swing.JButton extendedAdditionalUrlFieldWindow;
private javax.swing.JCheckBox externalEditorBox;
private javax.swing.JCheckBox cacheCompiledCore;
Expand Down Expand Up @@ -828,6 +833,8 @@ private void savePreferencesData() {

PreferencesData.setBoolean("editor.code_folding", enableCodeFoldingBox.isSelected());

PreferencesData.setBoolean("builder.use_platform_sketch_txt", usePlatformSketchTxtBox.isSelected());

PreferencesData.setBoolean("upload.verify", verifyUploadBox.isSelected());

PreferencesData.setBoolean("editor.save_on_verify", saveVerifyUploadBox.isSelected());
Expand Down Expand Up @@ -902,6 +909,8 @@ private void showPrerefencesData() {

enableCodeFoldingBox.setSelected(PreferencesData.getBoolean("editor.code_folding"));

usePlatformSketchTxtBox.setSelected(PreferencesData.getBoolean("builder.use_platform_sketch_txt"));

verifyUploadBox.setSelected(PreferencesData.getBoolean("upload.verify"));

externalEditorBox.setSelected(PreferencesData.getBoolean("editor.external"));
Expand Down
4 changes: 4 additions & 0 deletions arduino-core/src/cc/arduino/Compiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,10 @@ private void callArduinoBuilder(TargetBoard board, TargetPlatform platform, Targ
cmd.add(buildCache.getAbsolutePath());
}

if (PreferencesData.getBoolean("builder.use_platform_sketch_txt")) {
cmd.add("-use-platform-sketch-txt");
}

PreferencesData.getMap()
.subTree("runtime.build_properties_custom")
.entrySet()
Expand Down