* limitations under the License.
*/
-decoder_t::decoder_t()
- : decoded_value{false, openxc_DynamicField_Type_STRING, false, "", false, 0, false, false}
+#include "can-decoder.hpp"
+#include "canutil/read.h"
+
+float decoder_t::parseSignalBitfield(CanSignal& signal, const can_message_t& message)
{
+ return bitfield_parse_float(message.get_data(), CAN_MESSAGE_SIZE,
+ signal.bitPosition, signal.bitSize, signal.factor,
+ signal.offset);
}
-float decoder_t::parseSignalBitfield(const 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_t::noopDecoder(const CanSignal& signal,
- const CanSignal& signals, 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_t::booleanDecoder(const CanSignal& signal,
- const CanSignal& signals, 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_t::ignoreDecoder(const CanSignal& signal,
- const CanSignal& signals, float value, bool* send)
+openxc_DynamicField decoder_t::stateDecoder(CanSignal& signal,
+ const std::vector<CanSignal>& signals, float value, bool* send)
{
- if(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_t::stateDecoder(const CanSignal& signal,
- const CanSignal& signals, 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);
+
+ 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_t::decodeSignal(const CanSignal& signal,
- float value, const CanSignal& signals, 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,
- 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_t::decodeSignal(const CanSignal& signal,
- const CanMessage& message, const CanSignal& signals, bool* send) {
- float value = parseSignalBitfield(signal, message);
- return decodeSignal(signal, value, signals, 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);
+}