Implemented firmware version command

Author: bbogush

firmware/main.c

@@ -15,7 +15,8 @@
 int main()
 {
     uart_init();
-    printf("\r\nNAND programmer ver: "SW_VERSION"\r\n");
+    printf("\r\nNAND programmer ver: %d.%d.%d\r\n", SW_VERSION_MAJOR,
+        SW_VERSION_MINOR, SW_VERSION_BUILD);
 
     printf("JTAG init...");
     jtag_init();

firmware/nand_programmer.c

@@ -9,6 +9,7 @@
 #include "chip_info.h"
 #include "led.h"
 #include "log.h"
+#include "version.h"
 #include <stdio.h>
 #include <string.h>
 #include <stddef.h>
@@ -31,7 +32,8 @@ typedef enum
     NP_CMD_NAND_WRITE_E = 0x05,
     NP_CMD_NAND_CONF    = 0x06,
     NP_CMD_NAND_READ_BB = 0x07,
-    NP_CMD_NAND_LAST    = 0x08,
+    NP_CMD_VERSION_GET  = 0x08,
+    NP_CMD_NAND_LAST    = 0x09,
 } np_cmd_code_t;
 
 enum
@@ -160,6 +162,19 @@ typedef struct __attribute__((__packed__))
     uint8_t err_code;
 } np_resp_err_t;
 
+typedef struct __attribute__((__packed__))
+{
+    uint8_t major;
+    uint8_t minor;
+    uint16_t build;
+} version_t;
+
+typedef struct __attribute__((__packed__))
+{
+    np_resp_t header;
+    version_t version;
+} np_resp_version_t;
+
 typedef struct
 {
     uint32_t addr;
@@ -908,6 +923,25 @@ int np_cmd_read_bad_blocks(np_prog_t *prog)
     return np_send_ok_status();
 }
 
+int np_cmd_version_get(np_prog_t *prog)
+{
+    np_resp_version_t resp;
+    size_t resp_len = sizeof(resp);
+
+    DEBUG_PRINT("Read version command\r\n");
+
+    resp.header.code = NP_RESP_DATA;
+    resp.header.info = resp_len - sizeof(resp.header);
+    resp.version.major = SW_VERSION_MAJOR;
+    resp.version.minor = SW_VERSION_MINOR;
+    resp.version.build = SW_VERSION_BUILD;
+
+    if (np_comm_cb)
+        np_comm_cb->send((uint8_t *)&resp, resp_len);
+
+    return 0;
+}
+
 static np_cmd_handler_t cmd_handler[] =
 {
     { NP_CMD_NAND_READ_ID, np_cmd_nand_read_id },
@@ -918,6 +952,7 @@ static np_cmd_handler_t cmd_handler[] =
     { NP_CMD_NAND_WRITE_E, np_cmd_nand_write },
     { NP_CMD_NAND_CONF, np_cmd_nand_conf },
     { NP_CMD_NAND_READ_BB, np_cmd_read_bad_blocks },
+    { NP_CMD_VERSION_GET, np_cmd_version_get },
 };
 
 static bool np_cmd_is_valid(np_cmd_code_t code)
@@ -929,7 +964,8 @@ static int np_cmd_handler(np_prog_t *prog)
 {
     np_cmd_t *cmd = (np_cmd_t *)prog->rx_buf;
 
-    if (!prog->chip_is_conf && cmd->code != NP_CMD_NAND_CONF)
+    if (!prog->chip_is_conf && cmd->code != NP_CMD_NAND_CONF &&
+        cmd->code != NP_CMD_VERSION_GET)
     {
         ERROR_PRINT("Chip is not configured\r\n");
         return NP_ERR_CHIP_NOT_CONF;

firmware/version.h

@@ -1,6 +1,8 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define SW_VERSION "2.2.0"
+#define SW_VERSION_MAJOR 2
+#define SW_VERSION_MINOR 2
+#define SW_VERSION_BUILD 0
 
 #endif

qt/cmd.h

@@ -13,6 +13,7 @@ enum
     CMD_NAND_WRITE_E = 0x05,
     CMD_NAND_CONF    = 0x06,
     CMD_NAND_READ_BB = 0x07,
+    CMD_VERSION_GET  = 0x08,
 };
 
 typedef struct __attribute__((__packed__))
@@ -90,7 +91,12 @@ typedef enum
     STATUS_BB_SKIP   = 0x04,
 } StatusData;
 
-
+typedef struct __attribute__((__packed__))
+{
+    uint8_t major;
+    uint8_t minor;
+    uint16_t build;
+} FwVersion;
 
 typedef struct __attribute__((__packed__))
 {
@@ -107,6 +113,12 @@ typedef struct __attribute__((__packed__))
     uint8_t data[];
 } RespHeader;
 
+typedef struct __attribute__((__packed__))
+{
+    RespHeader header;
+    FwVersion version;
+} RespVersion;
+
 typedef struct __attribute__((__packed__))
 {
     RespHeader header;

qt/main_window.cpp

@@ -194,17 +194,28 @@ void MainWindow::setUiStateSelected(bool isSelected)
     ui->actionReadBadBlocks->setEnabled(isSelected);
 }
 
+void MainWindow::slotProgConnectCompleted(int status)
+{
+    disconnect(prog, SIGNAL(connectCompleted(int)), this,
+        SLOT(slotProgConnectCompleted(int)));
+
+    if (status)
+        return;
+
+    qInfo() << "Connected to programmer";
+    setUiStateConnected(true);
+    ui->actionConnect->setText(tr("Disconnect"));
+}
+
 void MainWindow::slotProgConnect()
 {
     if (!prog->isConnected())
     {
         if (!prog->connect())
-            qInfo() << "Connected to programmer";
-        else
-            return;
-
-        setUiStateConnected(true);
-        ui->actionConnect->setText(tr("Disconnect"));
+        {
+            connect(prog, SIGNAL(connectCompleted(int)), this,
+                SLOT(slotProgConnectCompleted(int)));
+        }
     }
     else
     {

qt/main_window.h

@@ -38,6 +38,7 @@ class MainWindow : public QMainWindow
     void updateChipList();
 
 private slots:
+    void slotProgConnectCompleted(int status);
     void slotProgReadDeviceIdCompleted(int status);
     void slotProgReadCompleted(int status);
     void slotProgWriteCompleted(int status);

qt/programmer.cpp

@@ -56,12 +56,43 @@ void Programmer::serialPortDisconnect()
     serialPort.close();
 }
 
+void Programmer::connectCb(int ret)
+{
+    QObject::disconnect(&reader, SIGNAL(result(int)), this,
+        SLOT(connectCb(int)));
+
+    if (ret < 0)
+    {
+        qCritical() << "Failed to read firmware version";
+        return;
+    }
+
+    emit connectCompleted(ret);
+
+    isConn = true;
+    qInfo() << "Firmware version: " <<
+        fwVersionToString(fwVersion).toLatin1().data();
+}
+
 int Programmer::connect()
 {
+    Cmd cmd = { .code = CMD_VERSION_GET };
+
     if (serialPortConnect())
         return -1;
 
-    isConn = true;
+    QObject::connect(&reader, SIGNAL(result(int)), this,
+        SLOT(connectCb(int)));
+
+    /* Serial port object cannot be used in other thread */
+    serialPortDisconnect();
+    writeData.clear();
+    writeData.append(reinterpret_cast<const char *>(&cmd), sizeof(cmd));
+    reader.init(usbDevName, SERIAL_PORT_SPEED,
+        reinterpret_cast<uint8_t *>(&fwVersion), sizeof(fwVersion),
+        reinterpret_cast<const uint8_t *>(writeData.constData()),
+        static_cast<uint32_t>(writeData.size()), false, false);
+    reader.start();
 
     return 0;
 }
@@ -283,4 +314,10 @@ void Programmer::logCb(QtMsgType msgType, QString msg)
     }
 }
 
+QString Programmer::fwVersionToString(FwVersion fwVersion)
+{
+    return QString("%1.%2.%3").arg(fwVersion.major).
+        arg(fwVersion.minor).arg(fwVersion.build);
+}
+
 

qt/programmer.h

@@ -27,6 +27,7 @@ class Programmer : public QObject
     Reader reader;
     bool isConn;
     bool skipBB;
+    FwVersion fwVersion;
 
     int serialPortConnect();
     void serialPortDisconnect();
@@ -50,8 +51,10 @@ class Programmer : public QObject
         uint32_t pageSize);
     void readChipBadBlocks();
     void confChip(ChipInfo *chipInfo);
+    QString fwVersionToString(FwVersion fwVersion);
 
 signals:
+    void connectCompleted(int ret);
     void readChipIdCompleted(int ret);
     void writeChipCompleted(int ret);
     void readChipCompleted(int ret);
@@ -67,6 +70,7 @@ private slots:
     void readChipBadBlocksCb(int ret);
     void confChipCb(int ret);
     void logCb(QtMsgType msgType, QString msg);
+    void connectCb(int ret);
 };
 
 #endif // PROGRAMMER_H