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/button_board.cc b/motors/button_board.cc
index 7e4a43c..6d5d11e 100644
--- a/motors/button_board.cc
+++ b/motors/button_board.cc
@@ -69,12 +69,12 @@
teensy::HidFunction *joystick1) {
uint32_t start = micros();
while (true) {
- salsa::JoystickAdcReadings adc;
+ JoystickAdcReadings adc;
char report0[report_size()];
char report1[report_size()];
{
DisableInterrupts disable_interrupts;
- adc = salsa::AdcReadJoystick(disable_interrupts);
+ adc = AdcReadJoystick(disable_interrupts);
}
FTM0->C1V = adc.analog0 / 4;
@@ -334,7 +334,7 @@
usb_device.Initialize();
can_init(0, 1);
- salsa::AdcInitJoystick();
+ AdcInitJoystick();
SetupLedFtm(FTM0);
SetupLedFtm(FTM3);