Callsigns need a number

Author: Dr. Brandon Wiley

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

@@ -1,15 +1,14 @@
 package org.operatorfoundation.codex.symbols
-import android.telecom.Call
 import java.math.BigInteger
 import org.operatorfoundation.codex.*
 
 class WSPRMessage(
-    val prefix: Required,
-    val callsign1: CallLetterNumber,
-    val callsign2: CallLetterNumber,
-    val callsign3: CallLetterNumber,
-    val callsign4: CallLetterNumber,
-    val callsign5: CallLetterNumber,
+    val prefix: Required,           // Q (position 1)
+    val callsign1: CallLetter,      // Letter (position 2)
+    val callsign2: CallNumber,      // Number (position 3) - MUST be a digit
+    val callsign3: CallLetter,      // Letter (position 4)
+    val callsign4: CallLetter,      // Letter (position 5)
+    val callsign5: CallLetter,      // Letter (position 6)
     val grid1: GridLetter,
     val grid2: GridLetter,
     val grid3: GridNumber,
@@ -18,12 +17,14 @@ class WSPRMessage(
 ) : Symbol {
     companion object : SymbolFactory<WSPRMessage> {
         override fun size(): BigInteger {
-            val callsignCapacity = BigInteger.valueOf(CallLetterNumber.size().toLong()).pow(5)
+            val callLetterCapacity = BigInteger.valueOf(CallLetter.size().toLong()).pow(4)  // 4 letter positions
+            val callNumberCapacity = CallNumber.size()  // 1 number position
             val gridLetterCapacity = BigInteger.valueOf(GridLetter.size().toLong()).pow(2)
             val gridNumberCapacity = BigInteger.valueOf(GridNumber.size().toLong()).pow(2)
             val powerCapacity = Power.size()
 
-            return callsignCapacity
+            return callLetterCapacity
+                .multiply(callNumberCapacity)
                 .multiply(gridLetterCapacity)
                 .multiply(gridNumberCapacity)
                 .multiply(powerCapacity)
@@ -62,34 +63,34 @@ class WSPRMessage(
             val grid1 = GridLetter.encode(value)
             remaining = remaining.divide(size)
 
-            // callsign5
-            size = CallLetterNumber.size()
+            // callsign5 - Letter
+            size = CallLetter.size()
             value = remaining.mod(size)
-            val callsign5 = CallLetterNumber.encode(value)
+            val callsign5 = CallLetter.encode(value)
             remaining = remaining.divide(size)
 
-            // callsign4
-            size = CallLetterNumber.size()
+            // callsign4 - Letter
+            size = CallLetter.size()
             value = remaining.mod(size)
-            val callsign4 = CallLetterNumber.encode(value)
+            val callsign4 = CallLetter.encode(value)
             remaining = remaining.divide(size)
 
-            // callsign3
-            size = CallLetterNumber.size()
+            // callsign3 - Letter
+            size = CallLetter.size()
             value = remaining.mod(size)
-            val callsign3 = CallLetterNumber.encode(value)
+            val callsign3 = CallLetter.encode(value)
             remaining = remaining.divide(size)
 
-            // callsign2
-            size = CallLetterNumber.size()
+            // callsign2 - NUMBER position
+            size = CallNumber.size()
             value = remaining.mod(size)
-            val callsign2 = CallLetterNumber.encode(value)
+            val callsign2 = CallNumber.encode(value)
             remaining = remaining.divide(size)
 
-            // callsign1
-            size = CallLetterNumber.size()
+            // callsign1 - Letter
+            size = CallLetter.size()
             value = remaining.mod(size)
-            val callsign1 = CallLetterNumber.encode(value)
+            val callsign1 = CallLetter.encode(value)
             remaining = remaining.divide(size)
 
             require(remaining == BigInteger.ZERO) { "Value $numericValue is too large to encode in WSPR" }
@@ -108,23 +109,23 @@ class WSPRMessage(
         var result = BigInteger.ZERO
 
         // Process symbols in order (most significant first in mixed-radix)
-        var size = CallLetterNumber.size()
+        var size = CallLetter.size()
         var decoded = callsign1.decode()
         result = result.multiply(size).add(decoded)
 
-        size = CallLetterNumber.size()
+        size = CallNumber.size()  // NUMBER position
         decoded = callsign2.decode()
         result = result.multiply(size).add(decoded)
 
-        size = CallLetterNumber.size()
+        size = CallLetter.size()
         decoded = callsign3.decode()
         result = result.multiply(size).add(decoded)
 
-        size = CallLetterNumber.size()
+        size = CallLetter.size()
         decoded = callsign4.decode()
         result = result.multiply(size).add(decoded)
 
-        size = CallLetterNumber.size()
+        size = CallLetter.size()
         decoded = callsign5.decode()
         result = result.multiply(size).add(decoded)
 
@@ -151,8 +152,7 @@ class WSPRMessage(
         return result
     }
 
-    fun extractValues(): Triple<String, String, Int>
-    {
+    fun extractValues(): Triple<String, String, Int> {
         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