Correct calculation of byte and bit position in generated e2p header …

…files.
breaker27 · Mar 23, 2014 · 9ad8903 · 9ad8903
1 parent 2eb6cd8
commit 9ad8903
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/tools/shc_e2p_editor/src/main/java/shcee/SourceCodeGeneratorE2P.java b/tools/shc_e2p_editor/src/main/java/shcee/SourceCodeGeneratorE2P.java
@@ -422,13 +422,14 @@ private String byteAccessStr(int offset, int bits, boolean isArray)
 	{
 		if (isArray)
 		{
-			if ((offset % 8) == 0)
+			if ((bits % 8) == 0)
 			{
-				return (offset / 8) + " + index";
+				int bytesPerValue = bits / 8;
+				return (offset / 8) + " + (uint16_t)index * " + bytesPerValue;
 			}
 			else
 			{
-				return "(" + offset + " + (uint16_t)index * 8) / 8";
+				return "(" + offset + " + (uint16_t)index * " + bits + ") / 8";
 			}
 		}
 		else
@@ -448,13 +449,13 @@ private String bitAccessStr(int offset, int bits, boolean isArray)
 	{
 		if (isArray)
 		{
-			if ((offset % 8) == 0)
+			if ((bits % 8) == 0)
 			{
-				return (offset / 8) + " + index";
+				return "" + (offset % 8);
 			}
 			else
 			{
-				return "(" + offset + " + (uint16_t)index * 8) % 8";
+				return "(" + offset + " + (uint16_t)index * " + bits + ") % 8";
 			}
 		}
 		else