Merge branch 'easymotor-v3' of ssh://git.gag.com/scm/git/fw/altos into easymotor-v3

diff --cc src/easymotor-v3/ao_pins.h
index d43b855a195b23b6cc7ee5c02d3a5ecce63790ae,668bcf04d27d4a1146908714594bccf642987a9f..400f5d31f7b5be6e0a8cec822a04e071f46a52fe
--- 1/src/easymotor-v3/ao_pins.h
--- 2/src/easymotor-v3/ao_pins.h
+++ b/src/easymotor-v3/ao_pins.h
@@@ -62,11 -58,15 +62,15 @@@
  #define USE_EEPROM_CONFIG     0
  #define USE_STORAGE_CONFIG    1
  #define AO_PA11_PA12_RMP      1
 -#define HAS_BEEP              0
 +#define HAS_BEEP              1
  #define HAS_BATTERY_REPORT    1
  #define HAS_PAD_REPORT                1
- #define BEEPER_CHANNEL                3
- #define BEEPER_TIMER          2
+ 
+ /* Beeper is on pio0_1 ct32b0_mat2 */
+ #define BEEPER_PORT           0
+ #define BEEPER_PIN            1
+ #define BEEPER_TIMER          0
+ #define BEEPER_OUTPUT         2
  
  #define HAS_RADIO             0
  #define HAS_TELEMETRY         0