X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=src%2Ftelemega-v2.0%2Fao_pins.h;h=ba302c7409a2683c27bee0db87ce4ec36b1e2ebb;hp=8409a1068a968a2366e9d567a996789cc143fb38;hb=dbc52686c6d9808275c35e0c9c987cbbd9f7859d;hpb=0fd370af8bc8842000415c4d182d84b4bf6f90fa

diff --git a/src/telemega-v2.0/ao_pins.h b/src/telemega-v2.0/ao_pins.h
index 8409a106..ba302c74 100644
--- a/src/telemega-v2.0/ao_pins.h
+++ b/src/telemega-v2.0/ao_pins.h
@@ -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
@@ -68,6 +69,7 @@
 #define AO_CONFIG_MAX_SIZE			1024
 #define LOG_ERASE_MARK				0x55
 #define LOG_MAX_ERASE				128
+#define AO_LOG_FORMAT				AO_LOG_FORMAT_TELEMEGA
 
 #define HAS_EEPROM		1
 #define USE_INTERNAL_FLASH	0
@@ -75,6 +77,10 @@
 #define USE_STORAGE_CONFIG	0
 #define HAS_USB			1
 #define HAS_BEEP		1
+#define BEEPER_TIMER		3
+#define BEEPER_CHANNEL		1
+#define BEEPER_PORT		(&stm_gpioc)
+#define BEEPER_PIN		6
 #define HAS_BATTERY_REPORT	1
 #define HAS_RADIO		1
 #define HAS_TELEMETRY		1
@@ -163,9 +169,6 @@
 /* Number of general purpose pyro channels available */
 #define AO_PYRO_NUM	4
 
-#define AO_IGNITER_SET_DROGUE(v)	stm_gpio_set(AO_IGNITER_DROGUE_PORT, AO_IGNITER_DROGUE_PIN, v)
-#define AO_IGNITER_SET_MAIN(v)		stm_gpio_set(AO_IGNITER_MAIN_PORT, AO_IGNITER_MAIN_PIN, v)
-
 /*
  * ADC
  */
@@ -301,24 +304,25 @@ struct ao_adc {
 
 /* gets pretty close to 434.550 */
 
-#define AO_RADIO_CAL_DEFAULT 	0x6ca333
+#define AO_RADIO_CAL_DEFAULT 	5695733
 
 #define AO_FEC_DEBUG		0
-#define AO_CC1120_SPI_CS_PORT	(&stm_gpioc)
-#define AO_CC1120_SPI_CS_PIN	5
-#define AO_CC1120_SPI_BUS	AO_SPI_2_PB13_PB14_PB15
-#define AO_CC1120_SPI		stm_spi2
+#define AO_CC1200_SPI_CS_PORT	(&stm_gpioc)
+#define AO_CC1200_SPI_CS_PIN	5
+#define AO_CC1200_SPI_BUS	AO_SPI_2_PB13_PB14_PB15
+#define AO_CC1200_SPI		stm_spi2
+#define AO_CC1200_SPI_SPEED	AO_SPI_SPEED_FAST
 
-#define AO_CC1120_INT_PORT		(&stm_gpioe)
-#define AO_CC1120_INT_PIN		1
-#define AO_CC1120_MCU_WAKEUP_PORT	(&stm_gpioc)
-#define AO_CC1120_MCU_WAKEUP_PIN	(0)
+#define AO_CC1200_INT_PORT		(&stm_gpioe)
+#define AO_CC1200_INT_PIN		1
+#define AO_CC1200_MCU_WAKEUP_PORT	(&stm_gpioc)
+#define AO_CC1200_MCU_WAKEUP_PIN	(0)
 
-#define AO_CC1120_INT_GPIO	2
-#define AO_CC1120_INT_GPIO_IOCFG	CC1120_IOCFG2
+#define AO_CC1200_INT_GPIO	2
+#define AO_CC1200_INT_GPIO_IOCFG	CC1200_IOCFG2
 
-#define AO_CC1120_MARC_GPIO	3
-#define AO_CC1120_MARC_GPIO_IOCFG	CC1120_IOCFG3
+#define AO_CC1200_MARC_GPIO	3
+#define AO_CC1200_MARC_GPIO_IOCFG	CC1200_IOCFG3
 
 #define HAS_BOOT_RADIO		0
 
@@ -348,6 +352,7 @@ struct ao_adc {
  */
 
 #define HAS_MMA655X		1
+#define AO_MMA655X_INVERT	0
 #define AO_MMA655X_SPI_INDEX	AO_SPI_1_PE13_PE14_PE15
 #define AO_MMA655X_CS_PORT	(&stm_gpiod)
 #define AO_MMA655X_CS_PIN	4
@@ -387,10 +392,10 @@ struct ao_adc {
  */
 
 #define NUM_PWM			4
-#define PWM_MAX			1023
+#define PWM_MAX			20000
 #define AO_PWM_TIMER		stm_tim4
 #define AO_PWM_TIMER_ENABLE	STM_RCC_APB1ENR_TIM4EN
-#define AO_PWM_TIMER_SCALE	1
+#define AO_PWM_TIMER_SCALE	32
 
 #define AO_PWM_0_GPIO		(&stm_gpiod)
 #define AO_PWM_0_PIN		12