Skip to content

Commit 1ac2cf5

Browse files
author
jan
committed
convert to Sloeber project should convert size command.
1 parent d08b0d0 commit 1ac2cf5

File tree

4 files changed

+40
-14
lines changed

4 files changed

+40
-14
lines changed

io.sloeber.core/src/io/sloeber/core/Messages.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,6 @@ public class Messages extends NLS {
109109
public static String CompileDescription_CustomDebugLevel;
110110
public static String CompileDescription_OptimizedForDebug;
111111
public static String CompileDescription_OptimizedForRelease;
112-
public static String CompileDescription_SizeArduinoWay;
113-
public static String CompileDescription_SizeAVRAlternative;
114-
public static String CompileDescription_SizeCustom;
115-
public static String CompileDescription_SizeRawResult;
116112
public static String CompileDescription_WarningsAll;
117113
public static String CompileDescription_WarningsCustom;
118114
public static String CompileDescription_WarningsDefault;

io.sloeber.core/src/io/sloeber/core/api/CompileDescription.java

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -166,23 +166,55 @@ public enum SizeCommands {
166166

167167
ARDUINO_WAY, AVR_ALTERNATIVE, RAW_RESULT, CUSTOM;
168168

169+
170+
171+
172+
169173
@Override
170174
public String toString() {
171-
switch (this) {
175+
return toString (this);
176+
}
177+
178+
public static String toString(SizeCommands value) {
179+
180+
switch (value) {
172181
case ARDUINO_WAY:
173-
return Messages.CompileDescription_SizeArduinoWay;
182+
return "Arduino Way"; //$NON-NLS-1$
174183
case AVR_ALTERNATIVE:
175-
return Messages.CompileDescription_SizeAVRAlternative;
184+
return "AVR Alternative"; //$NON-NLS-1$
176185
case RAW_RESULT:
177-
return Messages.CompileDescription_SizeRawResult;
186+
return "Raw result"; //$NON-NLS-1$
178187
case CUSTOM:
179-
return Messages.CompileDescription_SizeCustom;
188+
return "Custom"; //$NON-NLS-1$
180189
default:
181190
break;
182191
}
183-
return super.toString();
192+
try {
193+
return value.toString();
194+
} catch (@SuppressWarnings("unused") Exception e) {
195+
// ignore exception
196+
}
197+
return "Arduino Way"; //$NON-NLS-1$
184198
}
185199

200+
public static SizeCommands valueOf(String name, SizeCommands defaultValue) {
201+
if (name.equals(toString(ARDUINO_WAY))) {
202+
return ARDUINO_WAY;
203+
}
204+
if (name.equals(toString(AVR_ALTERNATIVE))) {
205+
return AVR_ALTERNATIVE;
206+
}
207+
if (name.equals(toString(RAW_RESULT))) {
208+
return RAW_RESULT;
209+
}
210+
if (name.equals(toString(CUSTOM))) {
211+
return CUSTOM;
212+
}
213+
return defaultValue;
214+
}
215+
216+
217+
186218
private String myCustomSizeCommand = EMPTY;
187219

188220
/**

io.sloeber.core/src/io/sloeber/core/api/SloeberProject.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import io.sloeber.autoBuild.schema.api.IProjectType;
5050
import io.sloeber.core.Activator;
5151
import io.sloeber.core.Messages;
52+
import io.sloeber.core.api.CompileDescription.SizeCommands;
5253
import io.sloeber.core.internal.ArduinoHardwareLibrary;
5354
import io.sloeber.core.internal.ArduinoPrivateLibraryVersion;
5455
import io.sloeber.core.internal.SloeberConfiguration;
@@ -306,6 +307,7 @@ private static CompileDescription getCompileDescription(KeyValueTree oldConfig)
306307
ret.set_CPP_CompileOptions(extraConfig.getValue("cpp.compile")); //$NON-NLS-1$
307308
ret.set_Link_CompileOptions(extraConfig.getValue("link")); //$NON-NLS-1$
308309
ret.set_C_andCPP_CompileOptions(extraConfig.getValue("compile")); //$NON-NLS-1$
310+
ret.setSizeCommand(SizeCommands.valueOf(extraConfig.getValue("compile.sloeber.size.type"),SizeCommands.ARDUINO_WAY)); //$NON-NLS-1$
309311

310312

311313
// ret.setSizeCommand(extraConfig.getValue("compile")); //$NON-NLS-1$

io.sloeber.core/src/io/sloeber/core/messages.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,6 @@ sizeReportData=Global variables use "arduino_data" bytes ("int(arduino_data/maxi
8282
CompileDescription_CustomDebugLevel=Custom debug level
8383
CompileDescription_OptimizedForDebug=Optimized for debug
8484
CompileDescription_OptimizedForRelease=Optimized for release
85-
CompileDescription_SizeArduinoWay=Arduino Way
86-
CompileDescription_SizeAVRAlternative=AVR Alternative
87-
CompileDescription_SizeCustom=Custom
88-
CompileDescription_SizeRawResult=Raw result
8985
CompileDescription_WarningsAll=All
9086
CompileDescription_WarningsCustom=Custom
9187
CompileDescription_WarningsDefault=Default

0 commit comments

Comments
 (0)