working on autogeneration of message unpacking and decoding

Author: Bvngee

Telemetry-Main/fsdaq/can_processor_generated.cpp

@@ -0,0 +1,18 @@
+#include "can_processor_generated.hpp"
+#include "encoder_generated.hpp"
+#include "mbed.h"
+
+namespace fsdaq {
+
+CANProcessor::CANProcessor(CAN &can)
+    : current_row(std::make_unique<DataRow>()), can(can) {}
+
+void CANProcessor::process_message() {
+    CANMessage msg;
+    if (!can.read(msg)) return;
+    switch (static_cast<fsdaq::MessageID>(msg.id)) {
+@CAN_MESSAGE_PROCESSING@
+    };
+}
+
+} // namespace fsdaq

Telemetry-Main/fsdaq/can_processor_generated.cpp.in

@@ -0,0 +1,65 @@
+#pragma once
+
+#include "mbed.h"
+#include "encoder_generated.hpp"
+
+namespace fsdaq {
+
+enum MessageID : uint32_t {
+    SYNC = 0x80,
+    SME_RPDO_Throttle_Demand = 0x186,
+    SME_RPDO_Max_Currents = 0x286,
+    SME_TPDO_Torque_speed = 0x482,
+    SME_TPDO_Temperature = 0x682,
+    ACC_TPDO_STATUS = 0x188,
+    ACC_TPDO_POWER = 0x288,
+    ACC_TPDO_SEG0_VOLTS = 0x191,
+    ACC_TPDO_SEG0_TEMPS = 0x291,
+    ACC_TPDO_SEG1_VOLTS = 0x192,
+    ACC_TPDO_SEG1_TEMPS = 0x292,
+    ACC_TPDO_SEG2_VOLTS = 0x193,
+    ACC_TPDO_SEG2_TEMPS = 0x293,
+    ACC_TPDO_SEG3_VOLTS = 0x194,
+    ACC_TPDO_SEG3_TEMPS = 0x294,
+    ACC_TPDO_SEG4_VOLTS = 0x195,
+    ACC_TPDO_SEG4_TEMPS = 0x295,
+    VDM_GPS_LAT_LONG = 0xa0000,
+    VDM_GPS_DATA = 0xa0001,
+    VDM_DATE_TIME = 0xa0002,
+    VDM_ACCELERATION = 0xa0003,
+    VDM_YAW_RATE = 0xa0004,
+    ETC_TPDO_STATUS = 0x189,
+    PDB_TPDO_POWER_A = 0x19a,
+    PDB_TPDO_POWER_B = 0x29a,
+    TMAIN_TPDO_DATA = 0x1a0,
+    TPERIPH_FL_TPDO_DATA = 0x1a2,
+    TPERIPH_FR_TPDO_DATA = 0x1a3,
+    TPERIPH_BL_TPDO_DATA = 0x1a4,
+    TPERIPH_BR_TPDO_DATA = 0x1a5,
+    TPERIPH_FL_TPDO_TIRETEMP = 0x2a1,
+    TPERIPH_FR_TPDO_TIRETEMP = 0x2a2,
+    TPERIPH_BL_TPDO_TIRETEMP = 0x2a3,
+    TPERIPH_BR_TPDO_TIRETEMP = 0x2a4,
+    LSS_COMMAND = 0x7e5,
+    LSS_RESPONSE = 0x7e4,
+    SMPC_RPDO_CONTROL = 0x206,
+    SMPC_RPDO_MAX_VOLTAGE_CURRENT = 0x306,
+    SMPC_TPDO_STATUS = 0x190,
+    SMPC_TPDO_MAX_VOLTAGE_CURRENT = 0x290,
+    SMPC_TPDO_INPUT_AC = 0x390,
+    SMPC_TPDO_SERIAL_PART_NUM = 0x490,
+};
+
+class CANProcessor {
+public:
+    std::unique_ptr<DataRow> current_row;
+
+    CANProcessor(CAN &can);
+
+    void process_message();
+
+private:
+    CAN &can;
+};
+
+} // namespace fsdaq

Telemetry-Main/fsdaq/can_processor_generated.hpp

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "mbed.h"
+#include "encoder_generated.hpp"
+
+namespace fsdaq {
+
+enum MessageID : uint32_t {
+@MESSAGE_IDS@
+};
+
+class CANProcessor {
+public:
+    std::unique_ptr<DataRow> current_row;
+
+    CANProcessor(CAN &can);
+
+    void process_message();
+
+private:
+    CAN &can;
+};
+
+} // namespace fsdaq

Telemetry-Main/fsdaq/can_processor_generated.hpp.in

@@ -1,3 +1,5 @@
+#pragma once
+
 #include "mbed.h"
 
 namespace fsdaq {
@@ -10,16 +12,16 @@ static const char *col_names[] = { @COL_NAMES@ };
 static const uint8_t col_name_sizes[] = { @COL_NAME_SIZES@ };
 static const char *col_name_types[] = { @COL_NAME_TYPES@ };
 
-struct BatchRow {
-@BATCH_ROW_STRUCT_FIELDS@
+struct DataRow {
+@DATA_ROW_STRUCT_FIELDS@
 };
 
 #pragma pack(1)
-class Batch {
-@BATCH_STRUCT_FIELDS@
+class DataBatch {
+@DATA_BATCH_STRUCT_FIELDS@
 
 public:
-    void setRow(BatchRow row, int idx) {
+    void setRow(DataRow row, int idx) {
 @UPDATE_FIELDS_FROM_ROW@
     }
 };
@@ -45,7 +47,7 @@ inline void write_fsdaq_schema(FILE *file) {
     }
 }
 
-inline void write_fsdaq_batch(Batch *batch, FILE *file) {
+inline void write_fsdaq_batch(DataBatch *batch, FILE *file) {
     fwrite(batch, sizeof(*batch), 1, file);
 }
 

Telemetry-Main/fsdaq/encoder_generated_from_dbc.hpp renamed to Telemetry-Main/fsdaq/encoder_generated.hpp

@@ -0,0 +1,28 @@
+#include "encoder_generated.hpp"
+
+namespace fsdaq {
+
+class FileBatchWriter {
+public:
+    FileBatchWriter(FILE *file)
+        : curr_batch(std::make_unique<DataBatch>()), fp(file) {}
+
+    void append_row(DataRow next_row) {
+        curr_batch->setRow(next_row, row_idx);
+
+        row_idx++;
+        if (row_idx == ROWS_PER_BATCH) {
+            write_fsdaq_batch(curr_batch.get(), fp);
+            row_idx = 0;
+        }
+    }
+
+private:
+    std::unique_ptr<DataBatch> curr_batch;
+
+    int row_idx = 0;
+
+    FILE *fp;
+};
+
+} // namespace fsdaq

Telemetry-Main/fsdaq/encoder_generated_from_dbc.hpp.in renamed to Telemetry-Main/fsdaq/encoder_generated.hpp.in

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "encoder_generated.hpp"
+
+namespace fsdaq {
+
+class FileBatchWriter {
+public:
+    FileBatchWriter(FILE *file);
+
+    void append_row(DataRow next_row);
+
+private:
+    std::unique_ptr<DataBatch> curr_batch;
+
+    int row_idx;
+
+    FILE *fp;
+};
+
+} // namespace fsdaq