Overloaded +=, -=, *=, and /= operators for CANSignals (#49)

feistjo · web-flow · commit 586ab41e4d9a · 2023-06-07T23:57:06.000-05:00
diff --git a/include/can_interface.h b/include/can_interface.h
@@ -102,6 +102,14 @@ class ITypedCANSignal : public ICANSignal
 
     void operator=(const SignalType &signal) { signal_ = signal; }
 
+    SignalType operator+=(const SignalType &signal) { return signal_ += signal; }
+
+    SignalType operator-=(const SignalType &signal) { return signal_ -= signal; }
+
+    SignalType operator*=(const SignalType &signal) { return signal_ *= signal; }
+
+    SignalType operator/=(const SignalType &signal) { return signal_ /= signal; }
+
     operator SignalType() const { return signal_; }
 
 protected:
@@ -269,6 +277,14 @@ class CANSignal : public ITypedCANSignal<SignalType>
     }
 
     void operator=(const SignalType &signal) { ITypedCANSignal<SignalType>::operator=(signal); }
+
+    SignalType operator+=(const SignalType &signal) { return ITypedCANSignal<SignalType>::operator+=(signal); }
+
+    SignalType operator-=(const SignalType &signal) { return ITypedCANSignal<SignalType>::operator-=(signal); }
+
+    SignalType operator*=(const SignalType &signal) { return ITypedCANSignal<SignalType>::operator*=(signal); }
+
+    SignalType operator/=(const SignalType &signal) { return ITypedCANSignal<SignalType>::operator/=(signal); }
 };
 
 // Macros for making signed and unsigned CAN signals, default little-endian
diff --git a/platformio.ini b/platformio.ini
@@ -9,7 +9,7 @@
 ; https://docs.platformio.org/page/projectconf.html
 
 [platformio]
-default_envs = esp32dev
+default_envs = native
 
 [env]
 check_skip_packages = yes
diff --git a/test/test_main.cpp b/test/test_main.cpp
@@ -153,6 +153,21 @@ void MITMotorBigEndianCANSignalTest(void)
     TEST_ASSERT_EQUAL(bswap(uint64_t(0x8005800000fff800)), *full_msg);
 }
 
+void OperatorsTest(void)
+{
+    MakeSignedCANSignal(float, 0, 32, 1, 0) test_signal;
+    test_signal = 0;
+    TEST_ASSERT_EQUAL_FLOAT(0, test_signal);
+    test_signal += 10;
+    TEST_ASSERT_EQUAL_FLOAT(10, test_signal);
+    test_signal -= 5;
+    TEST_ASSERT_EQUAL_FLOAT(5, test_signal);
+    test_signal *= 2;
+    TEST_ASSERT_EQUAL_FLOAT(10, test_signal);
+    test_signal /= 2;
+    TEST_ASSERT_EQUAL_FLOAT(5, test_signal);
+}
+
 int runUnityTests(void)
 {
     UNITY_BEGIN();
@@ -163,6 +178,7 @@ int runUnityTests(void)
     RUN_TEST(TypedCanSignalTest);
     RUN_TEST(EnumClassSignalTest);
     RUN_TEST(MITMotorBigEndianCANSignalTest);
+    RUN_TEST(OperatorsTest);
     return UNITY_END();
 }
 
