Callsigns should have 6, not 7 entries

Author: Dr. Brandon Wiley

Codex/src/main/java/org/operatorfoundation/codex/symbols/WSPRMessage.kt

@@ -10,7 +10,6 @@ class WSPRMessage(
     val callsign3: CallLetterNumber,
     val callsign4: CallLetterNumber,
     val callsign5: CallLetterNumber,
-    val callsign6: CallLetterNumber,
     val grid1: GridLetter,
     val grid2: GridLetter,
     val grid3: GridNumber,
@@ -19,7 +18,7 @@ class WSPRMessage(
 ) : Symbol {
     companion object : SymbolFactory<WSPRMessage> {
         override fun size(): BigInteger {
-            val callsignCapacity = BigInteger.valueOf(CallLetterNumber.size().toLong()).pow(6)
+            val callsignCapacity = BigInteger.valueOf(CallLetterNumber.size().toLong()).pow(5)
             val gridLetterCapacity = BigInteger.valueOf(GridLetter.size().toLong()).pow(2)
             val gridNumberCapacity = BigInteger.valueOf(GridNumber.size().toLong()).pow(2)
             val powerCapacity = Power.size()
@@ -63,12 +62,6 @@ class WSPRMessage(
             val grid1 = GridLetter.encode(value)
             remaining = remaining.divide(size)
 
-            // callsign6
-            size = CallLetterNumber.size()
-            value = remaining.mod(size)
-            val callsign6 = CallLetterNumber.encode(value)
-            remaining = remaining.divide(size)
-
             // callsign5
             size = CallLetterNumber.size()
             value = remaining.mod(size)
@@ -103,12 +96,12 @@ class WSPRMessage(
 
             val required = Required('Q')
 
-            return WSPRMessage(required, callsign1, callsign2, callsign3, callsign4, callsign5, callsign6, grid1, grid2, grid3, grid4, power)
+            return WSPRMessage(required, callsign1, callsign2, callsign3, callsign4, callsign5, grid1, grid2, grid3, grid4, power)
         }
     }
 
     override fun toString(): String = "WSPRMessage(${prefix.value}, " +
-            "${callsign1.value}${callsign2.value}${callsign3.value}${callsign4.value}${callsign5.value}${callsign6.value}, " +
+            "${callsign1.value}${callsign2.value}${callsign3.value}${callsign4.value}${callsign5.value}, " +
             "${grid1.value}${grid2.value}${grid3.value}${grid4.value}, ${power.value})"
 
     override fun decode(): BigInteger {
@@ -135,10 +128,6 @@ class WSPRMessage(
         decoded = callsign5.decode()
         result = result.multiply(size).add(decoded)
 
-        size = CallLetterNumber.size()
-        decoded = callsign6.decode()
-        result = result.multiply(size).add(decoded)
-
         size = GridLetter.size()
         decoded = grid1.decode()
         result = result.multiply(size).add(decoded)
@@ -164,7 +153,7 @@ class WSPRMessage(
 
     fun extractValues(): Triple<String, String, Int>
     {
-        val callsign = "Q${callsign1.value}${callsign2.value}${callsign3.value}${callsign4.value}${callsign5.value}${callsign6.value}"
+        val callsign = "Q${callsign1.value}${callsign2.value}${callsign3.value}${callsign4.value}${callsign5.value}"
         val grid = "${grid1.value}${grid2.value}${grid3.value}${grid4.value}"
         val power = power.value
         return Triple(callsign, grid, power)

Codex/src/test/java/org/operatorfoundation/codex/EncoderDecoderTest.kt

@@ -447,7 +447,7 @@ class SymbolTest {
 
                 println("  Encoded successfully")
                 println("  Prefix: ${encoded.prefix.value}")
-                println("  Callsign: ${encoded.callsign1.value}${encoded.callsign2.value}${encoded.callsign3.value}${encoded.callsign4.value}${encoded.callsign5.value}${encoded.callsign6.value}")
+                println("  Callsign: ${encoded.callsign1.value}${encoded.callsign2.value}${encoded.callsign3.value}${encoded.callsign4.value}${encoded.callsign5.value}")
                 println("  Grid: ${encoded.grid1.value}${encoded.grid2.value}${encoded.grid3.value}${encoded.grid4.value}")
                 println("  Power: ${encoded.power.value}")
 
@@ -474,7 +474,7 @@ class SymbolTest {
         val encoded = WSPRMessage.encode(BigInteger.ZERO)
 
         println("Prefix: ${encoded.prefix.value}")
-        println("Callsign: ${encoded.callsign1.value}${encoded.callsign2.value}${encoded.callsign3.value}${encoded.callsign4.value}${encoded.callsign5.value}${encoded.callsign6.value}")
+        println("Callsign: ${encoded.callsign1.value}${encoded.callsign2.value}${encoded.callsign3.value}${encoded.callsign4.value}${encoded.callsign5.value}")
         println("Grid: ${encoded.grid1.value}${encoded.grid2.value}${encoded.grid3.value}${encoded.grid4.value}")
         println("Power: ${encoded.power.value}")
 
@@ -491,7 +491,7 @@ class SymbolTest {
         val encoded = WSPRMessage.encode(BigInteger.ONE)
 
         println("Prefix: ${encoded.prefix.value}")
-        println("Callsign: ${encoded.callsign1.value}${encoded.callsign2.value}${encoded.callsign3.value}${encoded.callsign4.value}${encoded.callsign5.value}${encoded.callsign6.value}")
+        println("Callsign: ${encoded.callsign1.value}${encoded.callsign2.value}${encoded.callsign3.value}${encoded.callsign4.value}${encoded.callsign5.value}")
         println("Grid: ${encoded.grid1.value}${encoded.grid2.value}${encoded.grid3.value}${encoded.grid4.value}")
         println("Power: ${encoded.power.value}")
 
@@ -634,7 +634,7 @@ class SymbolTest {
             val encoded = WSPRMessage.encode(value)
             println("  Encoded successfully")
             println("  Prefix: ${encoded.prefix.value}")
-            println("  Callsign: ${encoded.callsign1.value}${encoded.callsign2.value}${encoded.callsign3.value}${encoded.callsign4.value}${encoded.callsign5.value}${encoded.callsign6.value}")
+            println("  Callsign: ${encoded.callsign1.value}${encoded.callsign2.value}${encoded.callsign3.value}${encoded.callsign4.value}${encoded.callsign5.value}")
             println("  Grid: ${encoded.grid1.value}${encoded.grid2.value}${encoded.grid3.value}${encoded.grid4.value}")
             println("  Power: ${encoded.power.value}")