File tree 1 file changed +10
-7
lines changed
1 file changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -150,19 +150,19 @@ private void createAndUpload(){
150
150
editor .statusError ("Not Supported on " +PreferencesData .get ("target_platform" ));
151
151
return ;
152
152
}
153
-
153
+
154
154
String tc = "esp108" ;
155
155
if (PreferencesData .get ("target_platform" ).contentEquals ("esp8266" )){
156
156
tc = "lx106" ;
157
157
}
158
-
158
+
159
159
TargetPlatform platform = BaseNoGui .getTargetPlatform ();
160
-
160
+
161
161
String gccPath = PreferencesData .get ("runtime.tools.xtensa-" +tc +"-elf-gcc.path" );
162
162
if (gccPath == null ){
163
163
gccPath = platform .getFolder () + "/tools/xtensa-" +tc +"-elf" ;
164
164
}
165
-
165
+
166
166
String addr2line ;
167
167
if (PreferencesData .get ("runtime.os" ).contentEquals ("windows" ))
168
168
addr2line = "xtensa-" +tc +"-elf-addr2line.exe" ;
@@ -178,9 +178,12 @@ private void createAndUpload(){
178
178
179
179
elf = new File (getBuildFolderPath (editor .getSketch ()), editor .getSketch ().getName () + ".ino.elf" );
180
180
if (!elf .exists () || !elf .isFile ()) {
181
- editor .statusError ("ERROR: " +editor .getSketch ().getName () + ".ino.elf not found!" );
182
- System .err .println ("Did you forget to compile the sketch?" );
183
- return ;
181
+ elf = new File (getBuildFolderPath (editor .getSketch ()), editor .getSketch ().getName () + ".cpp.elf" );
182
+ if (!elf .exists () || !elf .isFile ()){
183
+ editor .statusError ("ERROR: neither " +editor .getSketch ().getName () + ".ino.elf or " +editor .getSketch ().getName () + ".cpp.elf were found!" );
184
+ System .err .println ("Did you forget to compile the sketch?" );
185
+ return ;
186
+ }
184
187
}
185
188
186
189
JFrame .setDefaultLookAndFeelDecorated (true );
You can’t perform that action at this time.
0 commit comments