updater fixes (#324)

* update stm32cubeprogrammer

* fix port picker in case of no ports (only dfu)

* fix port picker state management
This commit is contained in:
Matthew Kennedy 2023-12-25 15:43:12 -08:00 committed by GitHub
parent 996a0c0630
commit 7ca6b11631
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 327 additions and 297 deletions

View File

@ -130,6 +130,10 @@ public enum SerialPortScanner {
}
private static List<PortResult> inspectPorts(final List<String> ports) {
if (ports.isEmpty()) {
return new ArrayList<>();
}
final Object resultsLock = new Object();
final Map<String, PortResult> results = new HashMap<>();
@ -196,7 +200,6 @@ public enum SerialPortScanner {
*/
private void findAllAvailablePorts(boolean includeSlowLookup) {
List<PortResult> ports = new ArrayList<>();
boolean dfuConnected;
String[] serialPorts = LinkManager.getCommPorts();
@ -246,12 +249,10 @@ public enum SerialPortScanner {
for (String tcpPort : TcpConnector.getAvailablePorts()) {
ports.add(new PortResult(tcpPort, SerialPortType.FomeEcu));
}
dfuConnected = DfuFlasher.detectSTM32BootloaderDriverState(UpdateOperationCallbacks.DUMMY);
} else {
dfuConnected = false;
}
boolean dfuConnected = DfuFlasher.detectSTM32BootloaderDriverState(UpdateOperationCallbacks.DUMMY);
boolean isListUpdated;
AvailableHardware currentHardware = new AvailableHardware(ports, dfuConnected);

View File

@ -166,12 +166,12 @@ public class StartupFrame {
private void applyKnownPorts(SerialPortScanner.AvailableHardware currentHardware) {
List<SerialPortScanner.PortResult> ports = currentHardware.getKnownPorts();
log.info("Rendering available ports: " + ports);
connectPanel.setVisible(!ports.isEmpty());
noPortsMessage.setVisible(ports.isEmpty());
log.info("Rendering available ports: " + ports);
connectPanel.setVisible(!ports.isEmpty());
noPortsMessage.setVisible(ports.isEmpty());
applyPortSelectionToUIcontrol(ports);
UiUtils.trueLayout(connectPanel);
applyPortSelectionToUIcontrol(ports);
UiUtils.trueLayout(connectPanel);
}
public static void setFrameIcon(Frame frame) {

View File

@ -171,19 +171,13 @@ public class DfuFlasher {
}
private static String getDfuWriteCommand() throws FileNotFoundException {
String prefix = "fome";
String suffix = ".bin";
String fileName = IniFileModel.findFile(Launcher.INPUT_FILES_PATH, prefix, suffix);
String fileName = Launcher.INPUT_FILES_PATH + File.separator + "fome.bin";
if (fileName == null)
throw new FileNotFoundException("File not found " + prefix + "*" + suffix);
throw new FileNotFoundException("File not found: fome.bin");
// we need quotes in case if absolute path contains spaces
String hexAbsolutePath = quote(new File(fileName).getAbsolutePath());
String quotedAbsolutePath = "\"" + (new File(fileName).getAbsolutePath()) + "\"";
return DFU_BINARY_LOCATION + "/" + DFU_BINARY + " -c port=usb1 -w " + hexAbsolutePath + " 0x08000000 -v -s";
}
private static String quote(String absolutePath) {
return "\"" + absolutePath + "\"";
return DFU_BINARY_LOCATION + "/" + DFU_BINARY + " -c port=usb1 -w " + quotedAbsolutePath + " 0x08000000 -v -s";
}
private static String getDfuEraseCommand() {

View File

@ -260,34 +260,47 @@ public class ProgramSelector {
private SerialPortScanner.AvailableHardware currentHardware = new SerialPortScanner.AvailableHardware(new ArrayList<>(), false);
private void selectedPortChanged(ItemEvent e) {
SerialPortScanner.PortResult pr = (SerialPortScanner.PortResult) e.getItem();
private void addDfuItems() {
if (currentHardware.dfuFound) {
mode.addItem(MANUAL_DFU);
mode.addItem(DFU_ERASE);
}
}
private void selectedPortChanged(ItemEvent e) {
mode.removeAllItems();
// Prefer OpenBLT so put that option first
if (pr.type == SerialPortScanner.SerialPortType.FomeEcuWithOpenblt) {
mode.addItem(OPENBLT_AUTO);
mode.addItem(OPENBLT_SWITCH);
}
if (e != null) {
SerialPortScanner.PortResult pr = (SerialPortScanner.PortResult) e.getItem();
// Prefer OpenBLT so put that option first
if (pr.type == SerialPortScanner.SerialPortType.FomeEcuWithOpenblt) {
mode.addItem(OPENBLT_AUTO);
mode.addItem(OPENBLT_SWITCH);
}
if (IS_WIN) {
if (pr.isEcu()) {
mode.addItem(AUTO_DFU);
}
addDfuItems();
}
if (IS_WIN) {
if (pr.isEcu()) {
mode.addItem(AUTO_DFU);
mode.addItem(DFU_SWITCH);
}
if (currentHardware.dfuFound) {
mode.addItem(MANUAL_DFU);
mode.addItem(DFU_ERASE);
if (pr.type == SerialPortScanner.SerialPortType.OpenBlt) {
mode.addItem(OPENBLT_MANUAL);
}
}
if (pr.isEcu()) {
mode.addItem(DFU_SWITCH);
}
if (pr.type == SerialPortScanner.SerialPortType.OpenBlt) {
mode.addItem(OPENBLT_MANUAL);
else
{
// No ports, just show DFU items (if present)
if (IS_WIN) {
addDfuItems();
}
}
// Show update controls if there are any options
@ -300,6 +313,11 @@ public class ProgramSelector {
public void apply(SerialPortScanner.AvailableHardware currentHardware) {
this.currentHardware = currentHardware;
// If no ports, force an update with nothing selected
if (currentHardware.getKnownPorts().isEmpty()) {
selectedPortChanged(null);
}
noHardware.setVisible(currentHardware.isEmpty());
trueLayout(mode);

View File

@ -30,7 +30,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x20000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -49,16 +49,16 @@
<Parameters address="0x08000000" name=" 1024 Kbytes Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x7" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -75,10 +75,10 @@
<Parameters address="0x1FFF7800" name=" 512 Bytes Data OTP" size="0x210"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FFF7800" name="OTP" occurence="0x1" size="0x210"/>
<Parameters address="0x1FFF7800" name="OTP" occurrence="0x1" size="0x210"/>
</Field>
</Bank>
</Configuration>
@ -95,10 +95,10 @@
<Parameters address="0x1FFFC000" name=" 8 Bytes Data MirrorOptionBytes" size="0x8"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurence="0x1" size="0x8"/>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurrence="0x1" size="0x8"/>
</Field>
</Bank>
</Configuration>

View File

@ -88,7 +88,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x30000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x30000"/>
</Field>
</Bank>
</Configuration>
@ -107,27 +107,27 @@
<Parameters address="0x08000000" name=" 2048 Kbytes Embedded Flash" size="0x200000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x7" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x08100000" name="sector12" occurence="0x4" size="0x4000"/>
<Parameters address="0x08100000" name="sector12" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08110000" name="sector16" occurence="0x1" size="0x10000"/>
<Parameters address="0x08110000" name="sector16" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08120000" name="sector17" occurence="0x7" size="0x20000"/>
<Parameters address="0x08120000" name="sector17" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -135,21 +135,21 @@
<Parameters address="0x08000000" name=" 1024 Kbytes Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x3" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x3" size="0x20000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x08080000" name="sector8" occurence="0x4" size="0x20000"/>
<Parameters address="0x08080000" name="sector8" occurrence="0x4" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -157,16 +157,16 @@
<Parameters address="0x08000000" name=" 1024 Kbytes Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x7" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -183,10 +183,10 @@
<Parameters address="0x1FFF7800" name=" 512 Bytes Data OTP" size="0x210"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FFF7800" name="OTP" occurence="0x1" size="0x210"/>
<Parameters address="0x1FFF7800" name="OTP" occurrence="0x1" size="0x210"/>
</Field>
</Bank>
</Configuration>
@ -203,15 +203,15 @@
<Parameters address="0x1FFF7800" name=" 24 Bytes Data MirrorOptionBytes" size="0x18"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x1FFFC000" name="Bank1" occurence="0x1" size="0x10"/>
<Parameters address="0x1FFFC000" name="Bank1" occurrence="0x1" size="0x10"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x1FFEC008" name="Bank2" occurence="0x1" size="0x8"/>
<Parameters address="0x1FFEC008" name="Bank2" occurrence="0x1" size="0x8"/>
</Field>
</Bank>
</Configuration>

View File

@ -44,7 +44,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x20000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -63,16 +63,16 @@
<Parameters address="0x08000000" name=" 512 Kbytes Embedded Flash" size="0x80000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x3" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x3" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -89,10 +89,10 @@
<Parameters address="0x1FFF7800" name=" 512 Bytes Data OTP" size="0x210"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FFF7800" name="OTP" occurence="0x1" size="0x210"/>
<Parameters address="0x1FFF7800" name="OTP" occurrence="0x1" size="0x210"/>
</Field>
</Bank>
</Configuration>
@ -109,10 +109,10 @@
<Parameters address="0x1FFFC000" name=" 16 Bytes Data MirrorOptionBytes" size="0x10"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurence="0x1" size="0x10"/>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurrence="0x1" size="0x10"/>
</Field>
</Bank>
</Configuration>

View File

@ -44,7 +44,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x10000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x10000"/>
</Field>
</Bank>
</Configuration>
@ -63,16 +63,16 @@
<Parameters address="0x08000000" name=" 256 Kbytes Embedded Flash" size="0x40000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x1" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x1" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -89,10 +89,10 @@
<Parameters address="0x1FFF7800" name=" 512 Bytes Data OTP" size="0x210"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FFF7800" name="OTP" occurence="0x1" size="0x210"/>
<Parameters address="0x1FFF7800" name="OTP" occurrence="0x1" size="0x210"/>
</Field>
</Bank>
</Configuration>
@ -109,10 +109,10 @@
<Parameters address="0x1FFFC000" name=" 16 Bytes Data MirrorOptionBytes" size="0x10"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurence="0x1" size="0x10"/>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurrence="0x1" size="0x10"/>
</Field>
</Bank>
</Configuration>

View File

@ -44,7 +44,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x10000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x10000"/>
</Field>
</Bank>
</Configuration>
@ -63,16 +63,16 @@
<Parameters address="0x08000000" name=" 512 Kbytes Embedded Flash" size="0x80000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x3" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x3" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -89,10 +89,10 @@
<Parameters address="0x1FFF7800" name=" 512 Bytes Data OTP" size="0x210"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FFF7800" name="OTP" occurence="0x1" size="0x210"/>
<Parameters address="0x1FFF7800" name="OTP" occurrence="0x1" size="0x210"/>
</Field>
</Bank>
</Configuration>
@ -109,10 +109,10 @@
<Parameters address="0x1FFFC000" name=" 16 Bytes Data MirrorOptionBytes" size="0x10"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurence="0x1" size="0x10"/>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurrence="0x1" size="0x10"/>
</Field>
</Bank>
</Configuration>

View File

@ -44,7 +44,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x10000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x10000"/>
</Field>
</Bank>
</Configuration>
@ -63,16 +63,16 @@
<Parameters address="0x08000000" name=" 384 Kbytes Embedded Flash" size="0x800000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x3" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x3" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -89,10 +89,10 @@
<Parameters address="0x1FFF7800" name=" 512 Bytes Data OTP" size="0x210"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FFF7800" name="OTP" occurence="0x1" size="0x210"/>
<Parameters address="0x1FFF7800" name="OTP" occurrence="0x1" size="0x210"/>
</Field>
</Bank>
</Configuration>
@ -109,10 +109,10 @@
<Parameters address="0x1FFFC000" name=" 16 Bytes Data MirrorOptionBytes" size="0x10"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurence="0x1" size="0x10"/>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurrence="0x1" size="0x10"/>
</Field>
</Bank>
</Configuration>

View File

@ -88,7 +88,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x50000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x50000"/>
</Field>
</Bank>
</Configuration>
@ -107,27 +107,27 @@
<Parameters address="0x08000000" name=" 2048 Kbytes Embedded Flash" size="0x200000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x7" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x08100000" name="sector12" occurence="0x4" size="0x4000"/>
<Parameters address="0x08100000" name="sector12" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08110000" name="sector16" occurence="0x1" size="0x10000"/>
<Parameters address="0x08110000" name="sector16" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08120000" name="sector17" occurence="0x7" size="0x20000"/>
<Parameters address="0x08120000" name="sector17" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -135,21 +135,21 @@
<Parameters address="0x08000000" name=" 1024 Kbytes Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x3" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x3" size="0x20000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x08080000" name="sector8" occurence="0x4" size="0x20000"/>
<Parameters address="0x08080000" name="sector8" occurrence="0x4" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -157,16 +157,16 @@
<Parameters address="0x08000000" name=" 1024 Kbytes Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x7" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -183,10 +183,10 @@
<Parameters address="0x1FFF7800" name=" 512 Bytes Data OTP" size="0x210"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FFF7800" name="OTP" occurence="0x1" size="0x210"/>
<Parameters address="0x1FFF7800" name="OTP" occurrence="0x1" size="0x210"/>
</Field>
</Bank>
</Configuration>
@ -203,15 +203,15 @@
<Parameters address="0x1FFEC008" name=" 20 Bytes Data MirrorOptionBytes" size="0x14"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x1FFEC008" name="Bank1" occurence="0x1" size="0x4"/>
<Parameters address="0x1FFEC008" name="Bank1" occurrence="0x1" size="0x4"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x1FFFC000" name="Bank2" occurence="0x1" size="0x10"/>
<Parameters address="0x1FFFC000" name="Bank2" occurrence="0x1" size="0x10"/>
</Field>
</Bank>
</Configuration>

View File

@ -30,7 +30,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x1FF8"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x1FF8"/>
</Field>
</Bank>
</Configuration>
@ -49,10 +49,10 @@
<Parameters address="0x08000000" name=" 64 Kbytes Embedded Flash" size="0x10000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x40" size="0x400"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x40" size="0x400"/>
</Field>
</Bank>
</Configuration>
@ -187,7 +187,7 @@
<Parameters address="0x1FFFF808" name="WRP" size="0x4"/>
<AssignedBits>
<Bit>
<Name>nWRP0</Name>
<Name>WRP bit0</Name>
<Description/>
<BitOffset>0x0</BitOffset>
<BitWidth>0x8</BitWidth>
@ -198,7 +198,7 @@
</Values>
</Bit>
<Bit>
<Name>nWRP8</Name>
<Name>nWRP bit8</Name>
<Description/>
<BitOffset>0x10</BitOffset>
<BitWidth>0x8</BitWidth>

View File

@ -44,7 +44,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x40000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x40000"/>
</Field>
</Bank>
</Configuration>
@ -63,16 +63,16 @@
<Parameters address="0x08000000" name=" 1 Mbytes Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x7" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -89,10 +89,10 @@
<Parameters address="0x1FFF7800" name=" 512 Bytes Data OTP" size="0x210"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FFF7800" name="OTP" occurence="0x1" size="0x210"/>
<Parameters address="0x1FFF7800" name="OTP" occurrence="0x1" size="0x210"/>
</Field>
</Bank>
</Configuration>
@ -109,10 +109,10 @@
<Parameters address="0x1FFFC000" name=" 16 Bytes Data MirrorOptionBytes" size="0x10"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurence="0x1" size="0x10"/>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurrence="0x1" size="0x10"/>
</Field>
</Bank>
</Configuration>

View File

@ -30,7 +30,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x8000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x8000"/>
</Field>
</Bank>
</Configuration>
@ -49,10 +49,10 @@
<Parameters address="0x08000000" name=" 256 Kbytes Embedded Flash" size="0x40000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x80" size="0x800"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x80" size="0x800"/>
</Field>
</Bank>
</Configuration>

View File

@ -30,7 +30,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x1000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x1000"/>
</Field>
</Bank>
</Configuration>
@ -49,10 +49,10 @@
<Parameters address="0x08000000" name=" 32 Kbytes Embedded Flash" size="0x8000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x20" size="0x400"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x20" size="0x400"/>
</Field>
</Bank>
</Configuration>

View File

@ -30,7 +30,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x1800"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x1800"/>
</Field>
</Bank>
</Configuration>
@ -49,10 +49,10 @@
<Parameters address="0x08000000" name=" 32 Kbytes Embedded Flash" size="0x8000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x20" size="0x400"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x20" size="0x400"/>
</Field>
</Bank>
</Configuration>
@ -204,13 +204,13 @@
</Field>
</Category>
<Category>
<Name>Write Protection</Name>
<Name>Write Protection WRP0</Name>
<Field>
<Parameters address="0x1FFFF808" name="WRP_0_1" size="0x4"/>
<AssignedBits>
<Bit>
<Name>nWRP0</Name>
<Description/>
<Name>WRP_bit0</Name>
<Description>The following option byte protect the flash memory by sector of 4 kB (each bit protect 4kB).</Description>
<BitOffset>0x0</BitOffset>
<BitWidth>0x8</BitWidth>
<Access>RW</Access>

View File

@ -30,7 +30,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x4000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x4000"/>
</Field>
</Bank>
</Configuration>
@ -49,10 +49,10 @@
<Parameters address="0x08000000" name=" 128 Kbytes Embedded Flash" size="0x20000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x40" size="0x800"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x40" size="0x800"/>
</Field>
</Bank>
</Configuration>

View File

@ -52,7 +52,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM1" occurence="0x1" size="0x50000"/>
<Parameters address="0x20000000" name="SRAM1" occurrence="0x1" size="0x50000"/>
</Field>
</Bank>
</Configuration>
@ -73,16 +73,16 @@
<Parameters address="0x08000000" name=" 1 Mbytes Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x8000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x8000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector4" occurence="0x1" size="0x20000"/>
<Parameters address="0x08020000" name="sector4" occurrence="0x1" size="0x20000"/>
</Field>
<Field>
<Parameters address="0x08040000" name="sector5" occurence="0x3" size="0x40000"/>
<Parameters address="0x08040000" name="sector5" occurrence="0x3" size="0x40000"/>
</Field>
</Bank>
</Configuration>
@ -90,10 +90,10 @@
<Parameters address="0x08000000" name=" 64 KByte Embedded Flash" size="0x10000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x2" size="0x8000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x2" size="0x8000"/>
</Field>
</Bank>
</Configuration>
@ -110,16 +110,16 @@
<Parameters address="0x00200000" name=" 1 Mbytes Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x00200000" name="sector0" occurence="0x4" size="0x8000"/>
<Parameters address="0x00200000" name="sector0" occurrence="0x4" size="0x8000"/>
</Field>
<Field>
<Parameters address="0x00220000" name="sector4" occurence="0x1" size="0x20000"/>
<Parameters address="0x00220000" name="sector4" occurrence="0x1" size="0x20000"/>
</Field>
<Field>
<Parameters address="0x00240000" name="sector5" occurence="0x3" size="0x40000"/>
<Parameters address="0x00240000" name="sector5" occurrence="0x3" size="0x40000"/>
</Field>
</Bank>
</Configuration>
@ -127,10 +127,10 @@
<Parameters address="0x00200000" name=" 64 KByte Embedded Flash" size="0x10000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x00200000" name="sector0" occurence="0x2" size="0x8000"/>
<Parameters address="0x00200000" name="sector0" occurrence="0x2" size="0x8000"/>
</Field>
</Bank>
</Configuration>
@ -147,10 +147,10 @@
<Parameters address="0x1FF0F000" name=" 1 KBytes Data OTP" size="0x200"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FF0F000" name="OTP" occurence="0x1" size="0x200"/>
<Parameters address="0x1FF0F000" name="OTP" occurrence="0x1" size="0x200"/>
</Field>
</Bank>
</Configuration>
@ -167,10 +167,10 @@
<Parameters address="0x1FFF0000" name=" 44 Bytes Data MirrorOptionBytes" size="0x2C"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFF0000" name="MirrorOptionBytes" occurence="0x1" size="0x2C"/>
<Parameters address="0x1FFF0000" name="MirrorOptionBytes" occurrence="0x1" size="0x2C"/>
</Field>
</Bank>
</Configuration>
@ -269,8 +269,8 @@
<BitWidth>0x1</BitWidth>
<Access>RW</Access>
<Values>
<Val value="0x0">Hardware independant watchdog</Val>
<Val value="0x1">Software independant watchdog</Val>
<Val value="0x0">Hardware independent watchdog</Val>
<Val value="0x1">Software independent watchdog</Val>
</Values>
</Bit>
<Bit>
@ -446,8 +446,8 @@
<BitWidth>0x1</BitWidth>
<Access>RW</Access>
<Values>
<Val value="0x0">Hardware independant watchdog</Val>
<Val value="0x1">Software independant watchdog</Val>
<Val value="0x0">Hardware independent watchdog</Val>
<Val value="0x1">Software independent watchdog</Val>
</Values>
</Bit>
<Bit>

View File

@ -135,7 +135,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x24000000" name="SRAM" occurence="0x1" size="0x80000"/>
<Parameters address="0x24000000" name="SRAM" occurrence="0x1" size="0x80000"/>
</Field>
</Bank>
</Configuration>
@ -154,15 +154,15 @@
<Parameters address="0x08000000" name="2 MBytes Dual Bank Embedded Flash" size="0x200000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x8" size="0x20000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x8" size="0x20000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x08100000" name="sector8" occurence="0x8" size="0x20000"/>
<Parameters address="0x08100000" name="sector8" occurrence="0x8" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -171,10 +171,10 @@
<Parameters address="0x08000000" name="RomLess 128 KB Embedded Flash" size="0x20000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x1" size="0x20000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x1" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -191,15 +191,15 @@
<Parameters address="0x00200000" name="2 MBytes Dual Bank Embedded Flash" size="0x200000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x00200000" name="sector0" occurence="0x8" size="0x20000"/>
<Parameters address="0x00200000" name="sector0" occurrence="0x8" size="0x20000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x00300000" name="sector8" occurence="0x8" size="0x20000"/>
<Parameters address="0x00300000" name="sector8" occurrence="0x8" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -208,10 +208,10 @@
<Parameters address="0x00200000" name="RomLess 128 KB Embedded Flash" size="0x20000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x00200000" name="sector0" occurence="0x1" size="0x20000"/>
<Parameters address="0x00200000" name="sector0" occurrence="0x1" size="0x20000"/>
</Field>
</Bank>
</Configuration>

View File

@ -90,7 +90,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM1" occurence="0x1" size="0x80000"/>
<Parameters address="0x20000000" name="SRAM1" occurrence="0x1" size="0x80000"/>
</Field>
</Bank>
</Configuration>
@ -109,16 +109,16 @@
<Parameters address="0x08000000" name=" 2 Mbytes single bank Embedded Flash" size="0x200000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x8000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x8000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector4" occurence="0x1" size="0x20000"/>
<Parameters address="0x08020000" name="sector4" occurrence="0x1" size="0x20000"/>
</Field>
<Field>
<Parameters address="0x08040000" name="sector5" occurence="0x7" size="0x40000"/>
<Parameters address="0x08040000" name="sector5" occurrence="0x7" size="0x40000"/>
</Field>
</Bank>
</Configuration>
@ -127,27 +127,27 @@
<Parameters address="0x08000000" name=" 2 Mbytes dual bank Embedded Flash" size="0x200000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x7" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x08100000" name="sector12" occurence="0x4" size="0x4000"/>
<Parameters address="0x08100000" name="sector12" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08110000" name="sector16" occurence="0x1" size="0x10000"/>
<Parameters address="0x08110000" name="sector16" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08120000" name="sector17" occurence="0x7" size="0x20000"/>
<Parameters address="0x08120000" name="sector17" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -156,16 +156,16 @@
<Parameters address="0x08000000" name=" 1 Mbyte single bank Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x8000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x8000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector4" occurence="0x1" size="0x20000"/>
<Parameters address="0x08020000" name="sector4" occurrence="0x1" size="0x20000"/>
</Field>
<Field>
<Parameters address="0x08040000" name="sector5" occurence="0x3" size="0x40000"/>
<Parameters address="0x08040000" name="sector5" occurrence="0x3" size="0x40000"/>
</Field>
</Bank>
</Configuration>
@ -174,27 +174,27 @@
<Parameters address="0x08000000" name=" 1 Mbyte dual bank Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x3" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x3" size="0x20000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x08080000 " name="sector12" occurence="0x4" size="0x4000"/>
<Parameters address="0x08080000 " name="sector12" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08090000" name="sector16" occurence="0x1" size="0x10000"/>
<Parameters address="0x08090000" name="sector16" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x080A0000" name="sector17" occurence="0x3" size="0x20000"/>
<Parameters address="0x080A0000" name="sector17" occurrence="0x3" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -211,16 +211,16 @@
<Parameters address="0x00200000" name=" 2 Mbytes single bank Embedded Flash" size="0x200000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x00200000" name="sector0" occurence="0x4" size="0x8000"/>
<Parameters address="0x00200000" name="sector0" occurrence="0x4" size="0x8000"/>
</Field>
<Field>
<Parameters address="0x00220000" name="sector4" occurence="0x1" size="0x20000"/>
<Parameters address="0x00220000" name="sector4" occurrence="0x1" size="0x20000"/>
</Field>
<Field>
<Parameters address="0x00240000" name="sector5" occurence="0x7" size="0x40000"/>
<Parameters address="0x00240000" name="sector5" occurrence="0x7" size="0x40000"/>
</Field>
</Bank>
</Configuration>
@ -229,27 +229,27 @@
<Parameters address="0x00200000" name=" 2 Mbytes dual bank Embedded Flash" size="0x200000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x00200000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x00200000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x00210000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x00210000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x00220000" name="sector5" occurence="0x7" size="0x20000"/>
<Parameters address="0x00220000" name="sector5" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x00300000" name="sector12" occurence="0x4" size="0x4000"/>
<Parameters address="0x00300000" name="sector12" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x00310000" name="sector16" occurence="0x1" size="0x10000"/>
<Parameters address="0x00310000" name="sector16" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x00320000" name="sector17" occurence="0x7" size="0x20000"/>
<Parameters address="0x00320000" name="sector17" occurrence="0x7" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -266,10 +266,10 @@
<Parameters address="0x1FF0F000" name=" 1 KBytes Data OTP" size="0x480"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FF0F000" name="OTP" occurence="0x1" size="0x480"/>
<Parameters address="0x1FF0F000" name="OTP" occurrence="0x1" size="0x480"/>
</Field>
</Bank>
</Configuration>
@ -286,10 +286,10 @@
<Parameters address="0x1FFF0000" name=" 44 Bytes Data MirrorOptionBytes" size="0x2C"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFF0000" name="MirrorOptionBytes" occurence="0x1" size="0x2C"/>
<Parameters address="0x1FFF0000" name="MirrorOptionBytes" occurrence="0x1" size="0x2C"/>
</Field>
</Bank>
</Configuration>
@ -381,7 +381,7 @@
<Val value="0x1">Flash in single bank with 256 bits read access</Val>
</Values>
</Bit>
<Bit config="1,4">
<Bit config="1,3">
<Name>nDBOOT</Name>
<Description/>
<BitOffset>0x1C</BitOffset>
@ -410,8 +410,8 @@
<BitWidth>0x1</BitWidth>
<Access>RW</Access>
<Values>
<Val value="0x0">Hardware independant watchdog</Val>
<Val value="0x1">Software independant watchdog</Val>
<Val value="0x0">Hardware independent watchdog</Val>
<Val value="0x1">Software independent watchdog</Val>
</Values>
</Bit>
<Bit>
@ -586,7 +586,7 @@
<Val value="0x1">Flash in single bank with 256 bits read access</Val>
</Values>
</Bit>
<Bit config="1">
<Bit config="1,3">
<Name>nDBOOT</Name>
<Description/>
<BitOffset>0xC</BitOffset>
@ -620,8 +620,8 @@
<BitWidth>0x1</BitWidth>
<Access>RW</Access>
<Values>
<Val value="0x0">Hardware independant watchdog</Val>
<Val value="0x1">Software independant watchdog</Val>
<Val value="0x0">Hardware independent watchdog</Val>
<Val value="0x1">Software independent watchdog</Val>
</Values>
</Bit>
<Bit>

View File

@ -47,7 +47,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x40000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x40000"/>
</Field>
</Bank>
</Configuration>
@ -66,16 +66,16 @@
<Parameters address="0x08000000" name=" 512 Kbytes Embedded Flash" size="0x80000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0x3" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0x3" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -84,10 +84,10 @@
<Parameters address="0x08000000" name=" 64 Kbytes Embedded Flash" size="0x10000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
</Bank>
</Configuration>
@ -104,16 +104,16 @@
<Parameters address="0x00200000" name=" 512 Kbytes ITCM Flash" size="0x80000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x00200000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x00200000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x00210000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x00210000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x00220000" name="sector5" occurence="0x3" size="0x20000"/>
<Parameters address="0x00220000" name="sector5" occurrence="0x3" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -122,10 +122,10 @@
<Parameters address="0x00200000" name=" 64 Kbytes ITCM Flash" size="0x10000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x10</Allignement>
<Alignment>0x10</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x00200000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x00200000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
</Bank>
</Configuration>
@ -142,10 +142,10 @@
<Parameters address="0x1FF07800" name=" 512 Bytes Data OTP" size="0x200"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FF07800" name="OTP" occurence="0x1" size="0x200"/>
<Parameters address="0x1FF07800" name="OTP" occurrence="0x1" size="0x200"/>
</Field>
</Bank>
</Configuration>
@ -162,10 +162,10 @@
<Parameters address="0x1FFF0000" name=" 44 Bytes Data MirrorOptionBytes" size="0x2C"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFF0000" name="MirrorOptionBytes" occurence="0x1" size="0x2C"/>
<Parameters address="0x1FFF0000" name="MirrorOptionBytes" occurrence="0x1" size="0x2C"/>
</Field>
</Bank>
</Configuration>
@ -264,8 +264,8 @@
<BitWidth>0x1</BitWidth>
<Access>RW</Access>
<Values>
<Val value="0x0">Hardware independant watchdog</Val>
<Val value="0x1">Software independant watchdog</Val>
<Val value="0x0">Hardware independent watchdog</Val>
<Val value="0x1">Software independent watchdog</Val>
</Values>
</Bit>
<Bit>
@ -487,8 +487,8 @@
<BitWidth>0x1</BitWidth>
<Access>RW</Access>
<Values>
<Val value="0x0">Hardware independant watchdog</Val>
<Val value="0x1">Software independant watchdog</Val>
<Val value="0x0">Hardware independent watchdog</Val>
<Val value="0x1">Software independent watchdog</Val>
</Values>
</Bit>
<Bit>

View File

@ -44,7 +44,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x8000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x8000"/>
</Field>
</Bank>
</Configuration>
@ -63,13 +63,13 @@
<Parameters address="0x08000000" name=" 128 Kbytes Embedded Flash" size="0x20000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
</Bank>
</Configuration>
@ -86,10 +86,10 @@
<Parameters address="0x1FFF7800" name=" 512 Bytes Data OTP" size="0x210"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FFF7800" name="OTP" occurence="0x1" size="0x210"/>
<Parameters address="0x1FFF7800" name="OTP" occurrence="0x1" size="0x210"/>
</Field>
</Bank>
</Configuration>
@ -106,10 +106,10 @@
<Parameters address="0x1FFFC000" name=" 16 Bytes Data MirrorOptionBytes" size="0x10"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurence="0x1" size="0x10"/>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurrence="0x1" size="0x10"/>
</Field>
</Bank>
</Configuration>

View File

@ -44,7 +44,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x20000000" name="SRAM" occurence="0x1" size="0x50000"/>
<Parameters address="0x20000000" name="SRAM" occurrence="0x1" size="0x50000"/>
</Field>
</Bank>
</Configuration>
@ -63,16 +63,16 @@
<Parameters address="0x08000000" name=" 1.5 Mbytes Embedded Flash" size="0x180000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x4" size="0x4000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x4" size="0x4000"/>
</Field>
<Field>
<Parameters address="0x08010000" name="sector4" occurence="0x1" size="0x10000"/>
<Parameters address="0x08010000" name="sector4" occurrence="0x1" size="0x10000"/>
</Field>
<Field>
<Parameters address="0x08020000" name="sector5" occurence="0xB" size="0x20000"/>
<Parameters address="0x08020000" name="sector5" occurrence="0xB" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -89,10 +89,10 @@
<Parameters address="0x1FFF7800" name=" 512 Bytes Data OTP" size="0x210"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x1FFF7800" name="OTP" occurence="0x1" size="0x210"/>
<Parameters address="0x1FFF7800" name="OTP" occurrence="0x1" size="0x210"/>
</Field>
</Bank>
</Configuration>
@ -109,10 +109,10 @@
<Parameters address="0x1FFFC000" name=" 16 Bytes Data MirrorOptionBytes" size="0x10"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x4</Allignement>
<Alignment>0x4</Alignment>
<Bank name="MirrorOptionBytes">
<Field>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurence="0x1" size="0x10"/>
<Parameters address="0x1FFFC000" name="MirrorOptionBytes" occurrence="0x1" size="0x10"/>
</Field>
</Bank>
</Configuration>

View File

@ -63,7 +63,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x24000000" name="SRAM" occurence="0x1" size="0x100000"/>
<Parameters address="0x24000000" name="SRAM" occurrence="0x1" size="0x100000"/>
</Field>
</Bank>
</Configuration>
@ -82,15 +82,15 @@
<Parameters address="0x08000000" name="2 MBytes Dual Bank Embedded Flash" size="0x200000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x80" size="0x2000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x80" size="0x2000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x08100000" name="sector128" occurence="0x80" size="0x2000"/>
<Parameters address="0x08100000" name="sector128" occurrence="0x80" size="0x2000"/>
</Field>
</Bank>
</Configuration>
@ -99,15 +99,15 @@
<Parameters address="0x08000000" name="1 MBytes Dual Bank Embedded Flash" size="0x200000"/>
<Description/>
<Organization>Dual</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x80" size="0x2000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x80" size="0x2000"/>
</Field>
</Bank>
<Bank name="Bank 2">
<Field>
<Parameters address="0x08080000" name="sector64" occurence="0x80" size="0x2000"/>
<Parameters address="0x08080000" name="sector64" occurrence="0x80" size="0x2000"/>
</Field>
</Bank>
</Configuration>
@ -124,10 +124,10 @@
<Parameters address="0x08FFF000" name=" 1 KBytes Data OTP" size="0x400"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="OTP">
<Field>
<Parameters address="0x08FFF000" name="OTP" occurence="0x1" size="0x400"/>
<Parameters address="0x08FFF000" name="OTP" occurrence="0x1" size="0x400"/>
</Field>
</Bank>
</Configuration>
@ -773,6 +773,35 @@
</AssignedBits>
</Field>
</Category>
<Category>
<Name>FLASH OTP</Name>
<Field>
<Parameters address="0x52002068" name="FOTPBL_CUR" size="0x4"/>
<AssignedBits>
<Bit>
<Name>LOCKBL</Name>
<Description/>
<BitOffset>0x0</BitOffset>
<BitWidth>0x10</BitWidth>
<Access>R</Access>
<Equation multiplier="0" offset="0x00000000"/>
</Bit>
</AssignedBits>
</Field>
<Field>
<Parameters address="0x5200206C" name="FOTPBL_PRG" size="0x4"/>
<AssignedBits>
<Bit>
<Name>LOCKBL</Name>
<Description>OTP Block Lock</Description>
<BitOffset>0x0</BitOffset>
<BitWidth>0x10</BitWidth>
<Access>W</Access>
<Equation multiplier="0" offset="0x00000000"/>
</Bit>
</AssignedBits>
</Field>
</Category>
<Category>
<Name>Write Protection</Name>
<Field>

View File

@ -49,7 +49,7 @@
<Organization>Single</Organization>
<Bank name="Bank 1">
<Field>
<Parameters address="0x24000000" name="SRAM" occurence="0x1" size="0x20000"/>
<Parameters address="0x24000000" name="SRAM" occurrence="0x1" size="0x20000"/>
</Field>
</Bank>
</Configuration>
@ -68,10 +68,10 @@
<Parameters address="0x08000000" name="1 MBytes Single Bank Embedded Flash" size="0x100000"/>
<Description/>
<Organization>Single</Organization>
<Allignement>0x20</Allignement>
<Alignment>0x20</Alignment>
<Bank name="Bank 1">
<Field>
<Parameters address="0x08000000" name="sector0" occurence="0x8" size="0x20000"/>
<Parameters address="0x08000000" name="sector0" occurrence="0x8" size="0x20000"/>
</Field>
</Bank>
</Configuration>

View File

@ -34,7 +34,7 @@
<Organization>Single</Organization>
<Bank>
<Field>
<Parameters address="0x10000000" name="SRAM" occurence="0x1" size="0x20000"/>
<Parameters address="0x10000000" name="SRAM" occurrence="0x1" size="0x20000"/>
</Field>
</Bank>
</Configuration>

View File

@ -34,7 +34,7 @@
<Organization>Single</Organization>
<Bank>
<Field>
<Parameters address="0x10000000" name="SRAM" occurence="0x1" size="0x20000"/>
<Parameters address="0x10000000" name="SRAM" occurrence="0x1" size="0x20000"/>
</Field>
</Bank>
</Configuration>

Binary file not shown.

View File

@ -1 +0,0 @@
STM32_Programmer_CLI.exe -c port=usb1 -w ../../../fome.bin 0x08000000 --verify --start 0x08000000

View File

@ -1 +0,0 @@
STM32_Programmer_CLI.exe -c port=usb1 -e all

View File

@ -1,2 +0,0 @@
STM32_Programmer_CLI.exe -c port=usb1 -r 0x08000000 0x0020000 dump_f0.hex

View File

@ -1,5 +0,0 @@
java -jar ../../fome_console.jar reboot_dfu
echo Now sleeping before DFU
sleep 5
STM32_Programmer_CLI.exe -c port=usb1 -r 0x08000000 0x0100000 rusefi_dump.hex

View File

@ -1 +0,0 @@
STM32_Programmer_CLI.exe -c port=usb1 -rdu

View File

@ -1 +0,0 @@
STM32_Programmer_CLI.exe -c port=usb1 -ob nDBANK=0

View File

@ -1 +0,0 @@
STM32_Programmer_CLI.exe -c port=usb1 -ob