X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Flpc%2Fao_beep_lpc.c;h=eab86ee644ebe44b92e6deee77828dc5809bc661;hb=6fdc392ef1b624c06e26e7a053c3579435c455d5;hp=281f981fc2e19c3960140bd4548ce0076b085aa5;hpb=c0d0147251bfcebd753196b74c22c00c3116fd22;p=fw%2Faltos

diff --git a/src/lpc/ao_beep_lpc.c b/src/lpc/ao_beep_lpc.c
index 281f981f..eab86ee6 100644
--- a/src/lpc/ao_beep_lpc.c
+++ b/src/lpc/ao_beep_lpc.c
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -29,16 +30,19 @@ ao_beep(uint8_t beep)
 
 		/* Set prescaler to match cc1111 clocks
 		 */
-		lpc_ct32b1.pc = AO_LPC_CLKOUT / 750000 - 1;
+		lpc_ct32b1.pr = AO_LPC_SYSCLK / 750000 - 1;
 
 		/* Write the desired data in the match registers */
 
 		/* Reset after two time units */
 		lpc_ct32b1.mr[0] = beep << 1;
 
-		/* Flip output after one time unit */
+		/* PWM width is half of that */
 		lpc_ct32b1.mr[1] = beep;
 
+		/* Flip output 1 on PWM match */
+		lpc_ct32b1.emr = (LPC_CT32B_EMR_EMC_TOGGLE << LPC_CT32B_EMR_EMC1);
+
 		/* Reset on match 0 */
 		lpc_ct32b1.mcr = (1 << LPC_CT32B_MCR_MR0R);
 
@@ -50,12 +54,12 @@ ao_beep(uint8_t beep)
 
 		/* And turn the timer on */
 		lpc_ct32b1.tcr = ((1 << LPC_CT32B_TCR_CEN) |
-				  (1 << LPC_CT32B_TCR_CRST));
+				  (0 << LPC_CT32B_TCR_CRST));
 	}
 }
 
 void
-ao_beep_for(uint8_t beep, uint16_t ticks) __reentrant
+ao_beep_for(uint8_t beep, uint16_t ticks) 
 {
 	ao_beep(beep);
 	ao_delay(ticks);
@@ -73,6 +77,7 @@ ao_beep_init(void)
 			      (LPC_IOCONF_MODE_INACTIVE << LPC_IOCONF_MODE) |
 			      (0 << LPC_IOCONF_HYS) |
 			      (0 << LPC_IOCONF_INV) |
+			      (1 << LPC_IOCONF_ADMODE) |
 			      (0 << LPC_IOCONF_OD));
 
 	lpc_scb.sysahbclkctrl |= (1 << LPC_SCB_SYSAHBCLKCTRL_CT32B1);