tbf

[apps/agl-service-can-low-level.git] / src / can-decoder.cpp

diff --git a/src/can-decoder.cpp b/src/can-decoder.cpp
index 000db2a..0347139 100644 (file)
--- a/src/can-decoder.cpp
+++ b/src/can-decoder.cpp
@@ -15,79 +15,105 @@
  * limitations under the License.
  */
 
-Decoder::Decoder
+#include "can-decoder.hpp"
+#include "canutil/read.h"
+
+float decoder_t::parseSignalBitfield(CanSignal& signal, const can_message_t& message)
 {
-       decoded_value = { .has_type = false,
-                                       .has_numeric_value = false,
-                                       .has_boolean_value = false,
-                                       .has_string_value = false };
+        return bitfield_parse_float(message.get_data(), CAN_MESSAGE_SIZE,
+                       signal.bitPosition, signal.bitSize, signal.factor,
+                       signal.offset);
 }
 
-float Decoder::parseSignalBitfield(CanSignal* signal, const CanMessage* message)
+openxc_DynamicField decoder_t::noopDecoder(CanSignal& signal,
+               const std::vector<CanSignal>& signals, float value, bool* send)
 {
-        return bitfield_parse_float(message->data, CAN_MESSAGE_SIZE,
-                       signal->bitPosition, signal->bitSize, signal->factor,
-                       signal->offset);
+       openxc_DynamicField decoded_value;
+       decoded_value.has_type = true;
+       decoded_value.type = openxc_DynamicField_Type_NUM;
+       decoded_value.has_numeric_value = true;
+       decoded_value.numeric_value = value;
+
+       return decoded_value;
 }
 
-openxc_DynamicField Decoder::noopDecoder(CanSignal* signal,
-        CanSignal* signals, int signalCount, float value, bool* send)
+openxc_DynamicField decoder_t::booleanDecoder(CanSignal& signal,
+               const std::vector<CanSignal>& signals, float value, bool* send)
 {
-       decoded_value = { .has_type = true,
-                                       .type = openxc_DynamicField_Type_NUM,
-                                       .has_numeric_value = true,
-                                       .numeric_value = value };
-    return decoded_value;
+       openxc_DynamicField decoded_value;
+       decoded_value.has_type = true;
+       decoded_value.type = openxc_DynamicField_Type_BOOL;
+       decoded_value.has_boolean_value = true;
+       decoded_value.boolean_value = value == 0.0 ? false : true;
+
+       return decoded_value;
 }
 
-openxc_DynamicField Decoder::booleanDecoder(CanSignal* signal,
-        CanSignal* signals, int signalCount, float value, bool* send)
+openxc_DynamicField decoder_t::ignoreDecoder(CanSignal& signal,
+               const std::vector<CanSignal>& signals, float value, bool* send)
 {
-       decoded_value = { .has_type = true,
-                                       .type = openxc_DynamicField_Type_BOOL,
-                                       .has_boolean_value = true,
-                                       .numeric_value = value == 0.0 ? false : true };
+       if(send)
+         *send = false;
+       
+       openxc_DynamicField decoded_value = {0, openxc_DynamicField_Type_BOOL, 0, "", 0, 0, 0, 0};
+       
        return decoded_value;
 }
 
-openxc_DynamicField Decoder::ignoreDecoder(CanSignal* signal,
-        CanSignal* signals, int signalCount, float value, bool* send)
+openxc_DynamicField decoder_t::stateDecoder(CanSignal& signal,
+               const std::vector<CanSignal>& signals, float value, bool* send)
 {
-    *send = false;
-    openxc_DynamicField decoded_value = {0};
-    return decoded_value;
+       openxc_DynamicField decoded_value = {0, openxc_DynamicField_Type_BOOL, 0, "", 0, 0, 0, 0};
+       decoded_value.has_type = true;
+       decoded_value.type = openxc_DynamicField_Type_STRING;
+       decoded_value.has_string_value = true;
+
+       /* TODO: Handle SignalState 
+       const CanSignalState* signalState = lookupSignalState(value, signal);
+       if(signalState != NULL) {
+               ::strcpy(decoded_value.string_value, signalState->name);
+       } else {
+               *send = false;
+       }*/
+       return decoded_value;
 }
 
-openxc_DynamicField Decoder::stateDecoder(CanSignal* signal,
-        CanSignal* signals, int signalCount, float value, bool* send)
+openxc_DynamicField decoder_t::translateSignal(CanSignal& signal, can_message_t& message,
+       const std::vector<CanSignal>& signals)
 {
-    openxc_DynamicField decoded_value = {0};
-    decoded_value.has_type = true;
-    decoded_value.type = openxc_DynamicField_Type_STRING;
-    decoded_value.has_string_value = true;
+       if(&signal == nullptr || &message == nullptr)
+       {
+               openxc_DynamicField ret = {0, openxc_DynamicField_Type_BOOL, 0, "", 0, 0, 0, 0};
+               return ret;
+       }
 
-    const CanSignalState* signalState = lookupSignalState(value, signal);
-    if(signalState != NULL) {
-        strcpy(decoded_value.string_value, signalState->name);
-    } else {
-        *send = false;
-    }
-    return decoded_value;
+       float value = parseSignalBitfield(signal, message);
+       DEBUG(binder_interface, "translateSignal: Decoded message: %f", value);
+
+       bool send = true;
+       // Must call the decoders every time, regardless of if we are going to
+       // decide to send the signal or not.
+       openxc_DynamicField decoded_value = decodeSignal(signal,
+                       value, signals, &send);
+
+       signal.received = true;
+       signal.lastValue = value;
+       return decoded_value;
 }
 
-openxc_DynamicField Decoder::decodeSignal(CanSignal* signal,
-        float value, CanSignal* signals, int signalCount, bool* send)
+openxc_DynamicField decoder_t::decodeSignal( CanSignal& signal,
+               float value, const std::vector<CanSignal>& signals, bool* send)
 {
-    SignalDecoder decoder = signal->decoder == NULL ?
-                                           noopDecoder : signal->decoder;
-    openxc_DynamicField decoded_value = decoder(signal, signals,
-            signalCount, value, send);
-    return decoded_value;
+       SignalDecoder decoder = signal.decoder == NULL ?
+                                                       noopDecoder : signal.decoder;
+       openxc_DynamicField decoded_value = decoder(signal, signals,
+                       value, send);
+       return decoded_value;
 }
 
-openxc_DynamicField Decoder::decodeSignal(CanSignal* signal,
-        const CanMessage* message, CanSignal* signals, int signalCount,
-        bool* send) {
-    float value = parseSignalBitfield(signal, message);
-    return decodeSignal(signal, value, signals, signalCount, send);
-}
\ No newline at end of file
+openxc_DynamicField decoder_t::decodeSignal( CanSignal& signal,
+               const can_message_t& message, const std::vector<CanSignal>& signals, bool* send)
+{
+       float value = parseSignalBitfield(signal, message);
+       return decodeSignal(signal, value, signals, send);
+}