eb_ebb: Makefile.omk - added adc file to library

	servo.h - fixed global variable time_ms
	engine.c - fixed pwm setting

diff --git a/app/eb_ebb/Makefile.omk b/app/eb_ebb/Makefile.omk
index 00b62cf053896c60418afda548f0c0fcb82dc7c7..ea04ab003e8321b5a41c4bface7f6554f054f042 100644 (file)
--- a/app/eb_ebb/Makefile.omk
+++ b/app/eb_ebb/Makefile.omk
@@ -6,6 +6,6 @@ eb_ebb_SOURCES = main.c
 eb_ebb_LIBS = can ebb
 
 lib_LIBRARIES = ebb
-ebb_SOURCES = powswitch.c uart.c servo.c engine.c
+ebb_SOURCES = powswitch.c uart.c servo.c engine.c adc.c
 
-include_HEADERS = engine.h powswitch.h servo.h uart.h
+include_HEADERS = engine.h powswitch.h servo.h uart.h adc.h

diff --git a/app/eb_ebb/engine.c b/app/eb_ebb/engine.c
index e0d9b167b1859bc1e80ed50ed74163f52fb98df8..b116516d73b45d9f164b05f57db504d6bc7adc39 100644 (file)
--- a/app/eb_ebb/engine.c
+++ b/app/eb_ebb/engine.c
@@ -56,7 +56,7 @@ void engine_B_dir(unsigned dir)
        else
                IO1CLR |= (1<<ENGINE_IN2B);
 
-       engine_A_pwm(pwm_B);
+       engine_B_pwm(pwm_B);
 }
 
 void engine_A_pwm(unsigned pwm)
@@ -88,15 +88,11 @@ void init_engine_A()
        IO0DIR |= (1<<ENGINE_PIN_A);
        IO1DIR |= (1<<ENGINE_ENA) | (1<<ENGINE_IN2A);
        IO1SET |= (1<<ENGINE_ENA) | (1<<ENGINE_IN2A);
-
        
        PWMPR = 0;
        PWMMR0 = CPU_APB_HZ / 20000;
 
-       
-
        PWMMR2 =0;      
-
        
        PWMPCR |= PWMPCR_PWMENA2_m;
        PWMLER |= PWMLER_LA0_m | PWMLER_LA2_m;

diff --git a/app/eb_ebb/servo.h b/app/eb_ebb/servo.h
index b163713346de25ee22da5128d6b522ed1e79864e..3a54149964a03949e13819a1844c3063d294b040 100644 (file)
--- a/app/eb_ebb/servo.h
+++ b/app/eb_ebb/servo.h
@@ -6,7 +6,7 @@
 /** gobal time
  *  @note incremented twenty 20ms, overrun every 1194hours
  */
-unsigned int time_ms;
+volatile unsigned int time_ms;
 
 /** Initialize servos
  *  @note All three servos - should be fixed FIXME