Move all the motors stuff into a saner namespace
Letting the mechanical engineers name software is never a good idea...
Change-Id: I5d0e43d84a8f45693435472cc0e5e288f6190b14
diff --git a/motors/simple_receiver.cc b/motors/simple_receiver.cc
index 910d2ae..49f5ecb 100644
--- a/motors/simple_receiver.cc
+++ b/motors/simple_receiver.cc
@@ -468,7 +468,7 @@
}
struct EncoderReading {
- EncoderReading(const salsa::SimpleAdcReadings &adc_readings) {
+ EncoderReading(const SimpleAdcReadings &adc_readings) {
const float sin = ConvertEncoderChannel(adc_readings.sin);
const float cos = ConvertEncoderChannel(adc_readings.cos);
@@ -491,10 +491,10 @@
global_polydrivetrain.load(::std::memory_order_acquire);
Spring *spring = global_spring.load(::std::memory_order_acquire);
- salsa::SimpleAdcReadings adc_readings;
+ SimpleAdcReadings adc_readings;
{
DisableInterrupts disable_interrupts;
- adc_readings = salsa::AdcReadSimple(disable_interrupts);
+ adc_readings = AdcReadSimple(disable_interrupts);
}
EncoderReading encoder(adc_readings);
@@ -724,7 +724,7 @@
PIT_TCTRL3 = PIT_TCTRL_TIE | PIT_TCTRL_TEN;
can_init(0, 1);
- salsa::AdcInitSimple();
+ AdcInitSimple();
SetupPwmFtm(FTM0);
SetupPwmFtm(FTM3);