added STM32 UDID reporting

Author: W3AXL

fw/v24/inc/util.h

@@ -18,6 +18,8 @@ extern "C" {
 #include <string.h>
 #include "log.h"
 
+#define STM32_UUID ((uint32_t *)0x1FFFF7E8)
+
 typedef struct {
     uint8_t const buffer;
     int head;
@@ -30,6 +32,9 @@ bool GetBitAtPos(uint8_t byte, uint8_t pos);
 uint8_t SetBitAtPos(uint8_t byte, uint8_t pos, bool value);
 void printHexArray(char *outBuf, uint8_t *array, uint8_t len);
 unsigned char reverseBits(unsigned char b);
+void getUid(uint8_t* buffer);
+void getUidString(char *str);
+void getCPU();
 
 #ifdef __cplusplus
 }

fw/v24/inc/vcp.h

@@ -47,6 +47,8 @@ void VCPCallback();
 bool VCPWrite(uint8_t *data, uint16_t len);
 bool VCPWriteP25Frame(const uint8_t *data, uint16_t len);
 
+void sendVersion();
+
 bool VCPWriteDebug1(const char *text);
 bool VCPWriteDebug2(const char *text, int16_t n1);
 bool VCPWriteDebug3(const char *text, int16_t n1, int16_t n2);

fw/v24/src/serial.c

@@ -11,6 +11,7 @@
 #include "fifo.h"
 #include "stdbool.h"
 #include "config.h"
+#include "util.h"
 
 uint8_t serialDMABuffer[SERIAL_BUFFER_SIZE];
 
@@ -122,5 +123,10 @@ void SerialStartup(UART_HandleTypeDef *huart) {
     SerialWrite(huart, " v");
     SerialWriteLn(huart, VERSION_STRING);
     SerialWriteLn(huart, "    " DATE_STRING);
+    SerialWrite(huart, "    SERIAL: ");
+    // Get chip UID (24-character hex string)
+    char buffer[25];
+    getUidString(buffer);
+    SerialWriteLn(huart, buffer);
     SerialWriteLn(huart, "");
 }

fw/v24/src/util.c

@@ -7,6 +7,7 @@
 
 /* Self referential incude */
 #include "util.h"
+#include <inttypes.h>
 
 /**
  * @brief Converts an array of chars to a space-separated string with braces
@@ -49,7 +50,7 @@ uint8_t SetBitAtPos(uint8_t byte, uint8_t pos, bool value)
 }
 
 /**
- * @brief Prints an array of hex characters, space separated
+ * @brief Prints an array of hex characters
  * @param outBuf output buffer (must be 3x the length of input array)
  * @param array input array to print
  * @param len length of array
@@ -74,4 +75,38 @@ unsigned char reverseBits(unsigned char b)
     b = (b & 0xCC) >> 2 | (b & 0x33) << 2;
     b = (b & 0xAA) >> 1 | (b & 0x55) << 1;
     return b;
+}
+
+/**
+ * @brief Get the UID of the stm32 chip into a 12-byte buffer
+*/
+void getUid(uint8_t* buffer)
+{
+    memcpy(buffer, (void*)STM32_UUID, 12);
+}
+
+/**
+ * @brief Read the UID of the STM32 chip to a 25-byte hex string (null-terminated)
+ * 
+ * @param str 25-byte buffer to write to
+*/
+void getUidString(char *str)
+{
+    // Get the 12 byte UID
+    uint8_t buffer[12];
+    getUid(buffer);
+
+    // Print to string
+    for (int i = 0; i < 12; i++)
+    {
+        sprintf(str + (i * 2), "%02X", buffer[i]);
+    }
+}
+
+/**
+ * @breif Returns the flash size of the STM32F103 chip
+*/
+uint16_t readFlashSize()
+{
+    return (uint16_t)(0x1FF8007C);
 }

fw/v24/src/vcp.c

@@ -18,6 +18,8 @@
 #include "string.h"
 #include "hdlc.h"
 
+const char HARDWARE[] = "DVM-V24 FW " __TIME__ " " __DATE__;
+
 uint8_t vcpRxMsg[VCP_RX_BUF_LEN];
 
 extern bool USB_VCP_DTR;
@@ -122,6 +124,10 @@ void VCPCallback()
             // Send the UI
             HDLCSendUI(p25data, length - 4);
         }
+        else if (command == CMD_GET_VERSION)
+        {
+            sendVersion();
+        }
         LED_USB(0);
     }
 
@@ -209,13 +215,43 @@ bool VCPWriteP25Frame(const uint8_t *data, uint16_t len)
     #endif
     #ifdef TRACE_VCP
     uint8_t hexStrBuf[(len+3)*4];
-    printHexArray((char*)hexStrBuf, buffer, len+3);
+    printHexArray((char*)hexStrBuf, buffer, len+3, " ");
     log_trace("Sending %s", hexStrBuf);
     #endif
 
     return VCPWrite(buffer, len+4);
 }
 
+/**
+ * @brief Send the V24 board version and UID over the VCP
+ * 
+ * Stolen from the DVM modem firmware
+*/
+void sendVersion()
+{
+    uint8_t reply[200U];
+
+    reply[0U] = DVM_FRAME_START;
+    reply[1U] = 0U;
+    reply[2U] = CMD_GET_VERSION;
+    reply[3U] = 0x01U;     // protocol version
+    reply[4U] = 0x02U;  // CPU type (STM32)
+
+    // 16-byte UDID
+    memset(reply + 5U, 0x00U, 16U);
+    getUid(reply + 5U);
+
+    // HW description
+    uint8_t count = 21;
+    for (uint8_t i = 0U; i < sizeof(HARDWARE); i++, count++)
+        reply[count] = HARDWARE[i];
+
+    // Total length
+    reply[1U] = count;
+
+    VCPWrite(reply, count);
+}
+
 /**
  * @brief Write a debug message to the USB port, using the DVMHost modem format
  *