a few config tweaks

diff --git a/src/easymotor-v3/Makefile b/src/easymotor-v3/Makefile
index e4572e7ba6c3f327efa2bcc70d1f94a1f226741f..7f1f5bfbe1b3f7bd3170631fb6b6ae69511247ff 100644 (file)
--- a/src/easymotor-v3/Makefile
+++ b/src/easymotor-v3/Makefile
@@ -39,8 +39,7 @@ ALTOS_SRC = \
        ao_log_motor.c \
        ao_cmd.c \
        ao_config.c \
-       ao_dma_lpc.c \
-       ao_timer_lpc.c \
+       ao_timer.c \
        ao_exti_lpc.c \
        ao_spi_lpc.c \
        ao_adc_lpc.c \
@@ -55,7 +54,7 @@ IDPRODUCT=0x002c
 
 CFLAGS = $(PRODUCT_DEF) $(LPC_CFLAGS)
 
-PROGNAME=easymotor-v2
+PROGNAME=easymotor-v3
 PROG=$(PROGNAME)-$(VERSION).elf
 HEX=$(PROGNAME)-$(VERSION).ihx
 

diff --git a/src/easymotor-v3/ao_easymotor.c b/src/easymotor-v3/ao_easymotor.c
index b97f20044283230367492e205984b85eed666a7c..154c4c016e1b7efcdbc76edf602aa265188f4ddc 100644 (file)
--- a/src/easymotor-v3/ao_easymotor.c
+++ b/src/easymotor-v3/ao_easymotor.c
@@ -28,7 +28,7 @@ main(void)
        ao_task_init();
        ao_timer_init();
 
-       ao_dma_init();
+//     ao_dma_init();
        ao_spi_init();
        ao_exti_init();
 

diff --git a/src/easymotor-v3/ao_pins.h b/src/easymotor-v3/ao_pins.h
index 52632718a9d675e5079d5d5d2a96c8ed5a4b659f..48485c6cbdf2f53aacb7795b51c7acdd2351263a 100644 (file)
--- a/src/easymotor-v3/ao_pins.h
+++ b/src/easymotor-v3/ao_pins.h
@@ -58,7 +58,7 @@
 #define USE_EEPROM_CONFIG      0
 #define USE_STORAGE_CONFIG     1
 #define AO_PA11_PA12_RMP       1
-#define HAS_BEEP               1
+#define HAS_BEEP               0
 #define HAS_BATTERY_REPORT     1
 #define HAS_PAD_REPORT         1
 #define BEEPER_CHANNEL         3
@@ -96,10 +96,10 @@ struct ao_adc {
 };
 
 #define AO_ADC_DUMP(p) \
-       printf("tick: batt: %5d %5lu motor_pressure: %5d\n", \
+       printf("tick: %5lu batt: %5d motor_pressure: %5d\n", \
               (p)->tick, \
-              (p)->adc.v_batt);
-              (p)->adc.motor_pressure, \
+              (p)->adc.v_batt, \
+              (p)->adc.motor_pressure); 
 
 /*
  * Voltage divider on ADC battery sampler
@@ -139,9 +139,9 @@ struct ao_adc {
 /* ADXL375 */
 
 #define HAS_ADXL375            1
+#define AO_ADXL375_SPI_INDEX   0
 #define AO_ADXL375_CS_PORT     0
-#define AO_ADXL375_CS_MASK     (1 << 19)
-#define AO_ADXL375_SPI_BUS     1
+#define AO_ADXL375_CS_PIN      19
 
 #define AO_ADXL375_AXIS                x
 #define AO_ADXL375_ACROSS_AXIS y