From: Jiri Kubias <jiri.kubias@gmail.com>
Date: Thu, 24 Apr 2008 13:40:07 +0000 (+0200)
Subject: eb_ebb: Makefile.omk - added adc file to library
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/sysless.git/commitdiff_plain/edaac64b3ea6a2ead588306973c56024c713ff52

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 00b62cf..ea04ab0 100644
--- 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 e0d9b16..b116516 100644
--- 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 b163713..3a54149 100644
--- 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