Skip to content

IEP-1037: Fix for the confserver handling of the hex values #859

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

Merged
merged 2 commits into from
Dec 6, 2023
Merged

IEP-1037: Fix for the confserver handling of the hex values #859

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eba79ef
IEP-1037: Fix for the confserver handling of the hex values
alirana01 Nov 23, 2023
4ea5121
added hex tag to the label for hex values
alirana01 Nov 23, 2023
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
12 changes: 8 additions & 4 deletions ...pressif.idf.sdk.config.ui/src/com/espressif/idf/sdk/config/ui/SDKConfigurationEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ protected void renderMenuItems(KConfigMenuItem selectedElement)
else if (isVisible && type.equals(IJsonServerConfig.HEX_TYPE))
{
Label labelName = new Label(updateUIComposite, SWT.NONE);
labelName.setText(kConfigMenuItem.getTitle());
labelName.setText(kConfigMenuItem.getTitle().concat(" (hex)"));

Text textControl = new Text(updateUIComposite, SWT.SINGLE | SWT.BORDER);
GridData gridData = new GridData();
Expand All @@ -635,8 +635,10 @@ else if (isVisible && type.equals(IJsonServerConfig.HEX_TYPE))
textControl.setToolTipText(helpInfo);
if (configValue != null)
{
textControl.setText(newConfigValue != null ? Long.toString((long) newConfigValue)
: Long.toString((long) configValue));
String hexText = newConfigValue != null ? Long.toHexString((long) newConfigValue)
: Long.toHexString((long) configValue);
textControl.setText("0x" + hexText.toUpperCase());

}
textControl.addModifyListener(addModifyListener(configKey, textControl));
addTooltipImage(kConfigMenuItem);
Expand Down Expand Up @@ -851,9 +853,11 @@ protected ModifyListener addModifyListener(String configKey, Text textControl)
@Override
public void modifyText(ModifyEvent e)
{
String text = textControl.getText().toLowerCase();
boolean isHex = text.startsWith("0x");
isDirty = true;
editorDirtyStateChanged();
modifiedJsonMap.put(configKey, textControl.getText().trim());
modifiedJsonMap.put(configKey, isHex ? Long.parseLong(text.substring(2), 16) : textControl.getText().trim());
}
};
}
Expand Down