diff --git a/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10JEDECExporter.java b/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10JEDECExporter.java index aa76a13c2..cee423d59 100644 --- a/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10JEDECExporter.java +++ b/src/main/java/de/neemann/digital/builder/Gal22v10/Gal22v10JEDECExporter.java @@ -17,7 +17,7 @@ import java.io.IOException; import java.io.OutputStream; /** - * Class to create a JEDEC file for the Lattice GAL16V8 + * Class to create a JEDEC file for the Lattice GAL22V10 */ public class Gal22v10JEDECExporter implements ExpressionExporter { private static final int[] PRODUCTS_BY_OLMC = new int[]{8, 10, 12, 14, 16, 16, 14, 12, 10, 8}; diff --git a/src/main/java/de/neemann/digital/builder/jedec/FuseMap.java b/src/main/java/de/neemann/digital/builder/jedec/FuseMap.java index 8bd8056dd..c2082b80f 100644 --- a/src/main/java/de/neemann/digital/builder/jedec/FuseMap.java +++ b/src/main/java/de/neemann/digital/builder/jedec/FuseMap.java @@ -6,6 +6,8 @@ package de.neemann.digital.builder.jedec; /** + * Represents the fuses in the fuse map. + * Fuse data is represented by bytes containing 8 fuses each */ public class FuseMap { diff --git a/src/main/java/de/neemann/digital/builder/jedec/FuseMapFiller.java b/src/main/java/de/neemann/digital/builder/jedec/FuseMapFiller.java index e3aaeb7c0..334de1ebb 100644 --- a/src/main/java/de/neemann/digital/builder/jedec/FuseMapFiller.java +++ b/src/main/java/de/neemann/digital/builder/jedec/FuseMapFiller.java @@ -26,8 +26,6 @@ public class FuseMapFiller { /** * Creates a new instance - * The given vars list needs to contain all variables connected to the matrix in the correct order. - * If a variable in the matrix is not used, you have to add a null to the variables list. * * @param fuseMap the fuse map to fill * @param varsConnectedToMap the number variables available in matrix diff --git a/src/main/java/de/neemann/digital/builder/jedec/JedecWriter.java b/src/main/java/de/neemann/digital/builder/jedec/JedecWriter.java index 9da1195d4..66ee55c30 100644 --- a/src/main/java/de/neemann/digital/builder/jedec/JedecWriter.java +++ b/src/main/java/de/neemann/digital/builder/jedec/JedecWriter.java @@ -8,6 +8,7 @@ package de.neemann.digital.builder.jedec; import java.io.FilterOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.nio.charset.StandardCharsets; /** */ @@ -35,11 +36,11 @@ public class JedecWriter extends FilterOutputStream { * Writes the string to the file * * @param s the string to write - * @return this for chanined calls + * @return this for chained calls * @throws IOException IOException */ public JedecWriter print(String s) throws IOException { - write(s.getBytes("ISO-8859-1")); + write(s.getBytes(StandardCharsets.ISO_8859_1)); return this; } @@ -48,7 +49,7 @@ public class JedecWriter extends FilterOutputStream { * Adds a carriage return and a line feed * * @param s the string to write - * @return this for chanined calls + * @return this for chained calls * @throws IOException IOException */ public JedecWriter println(String s) throws IOException { @@ -104,7 +105,7 @@ public class JedecWriter extends FilterOutputStream { @Override public void close() throws IOException { write(ETX); - out.write(toHex(checksum & 0xffff, 4).getBytes("ISO-8859-1")); + out.write(toHex(checksum & 0xffff, 4).getBytes(StandardCharsets.ISO_8859_1)); super.close(); }