[paparazzi-commits] [6312] moved tiny board headers to sw/airborne/ boar

paparazzi-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6312] moved tiny board headers to sw/airborne/ boar

From:	Felix Ruess
Subject:	[paparazzi-commits] [6312] moved tiny board headers to sw/airborne/ boards and cleaned up some trailing whitespaces
Date:	Sun, 31 Oct 2010 23:25:03 +0000
Revision: 6312
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6312
Author:   flixr
Date:     2010-10-31 23:25:00 +0000 (Sun, 31 Oct 2010)
Log Message:
-----------
moved tiny board headers to sw/airborne/boards and cleaned up some trailing 
whitespaces

Modified Paths:
--------------
    paparazzi3/trunk/conf/boards/tiny_0.99.makefile
    paparazzi3/trunk/conf/boards/tiny_1.1.makefile
    paparazzi3/trunk/conf/boards/tiny_2.1.makefile
    paparazzi3/trunk/conf/boards/tiny_2.11.makefile
    paparazzi3/trunk/conf/boards/twog_1.makefile

Added Paths:
-----------
    paparazzi3/trunk/sw/airborne/boards/tiny_0.99.h
    paparazzi3/trunk/sw/airborne/boards/tiny_1.1.h
    paparazzi3/trunk/sw/airborne/boards/tiny_2.0.h
    paparazzi3/trunk/sw/airborne/boards/tiny_2.1.h
    paparazzi3/trunk/sw/airborne/boards/tiny_2.11.h
    paparazzi3/trunk/sw/airborne/boards/twog_1.0.h

Removed Paths:
-------------
    paparazzi3/trunk/conf/autopilot/tiny_0_99.h
    paparazzi3/trunk/conf/autopilot/tiny_1_1.h
    paparazzi3/trunk/conf/autopilot/tiny_2_0.h
    paparazzi3/trunk/conf/autopilot/tiny_2_1.h
    paparazzi3/trunk/conf/autopilot/tiny_2_1_1.h
    paparazzi3/trunk/conf/autopilot/twog_v1.h

Deleted: paparazzi3/trunk/conf/autopilot/tiny_0_99.h
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny_0_99.h 2010-10-31 23:24:53 UTC (rev 
6311)
+++ paparazzi3/trunk/conf/autopilot/tiny_0_99.h 2010-10-31 23:25:00 UTC (rev 
6312)
@@ -1,130 +0,0 @@
-#ifndef CONFIG_TINY_H
-#define CONFIG_TINY_H
-
-#ifdef SITL
-/* Dummy definitions: adc are unused anyway */
-#define AdcBank0(x) (x)
-#define AdcBank1(x) (x)
-#endif /* SITL */
-
-/* Master oscillator freq.       */
-#define FOSC (12000000) 
-
-/* PLL multiplier                */
-#define PLL_MUL (5)         
-
-/* CPU clock freq.               */
-#define CCLK (FOSC * PLL_MUL) 
-
-/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2   */
-#define PBSD_BITS 0x00    
-#define PBSD_VAL 4
-
-/* Peripheral bus clock freq. */
-#define PCLK (CCLK / PBSD_VAL) 
-
-#define LED_1_BANK 1
-#define LED_1_PIN 28
-
-#define LED_2_BANK 1
-#define LED_2_PIN 19
-
-/* P0.5 aka MAT0.1  */
-#define SERVO_CLOCK_PIN  5
-#define SERVO_CLOCK_PINSEL PINSEL0
-#define SERVO_CLOCK_PINSEL_VAL 0x02
-#define SERVO_CLOCK_PINSEL_BIT 10
-/* p1.23          */
-#define SERVO_DATA_PIN  20
-/* p1.24          */
-#define SERVO_RESET_PIN 29
-
-/* PPM : rc rx on P0.6*/
-#define PPM_PINSEL PINSEL0
-#define PPM_PINSEL_VAL 0x02
-#define PPM_PINSEL_BIT 12
-#define PPM_CRI TIR_CR2I
-#define PPM_CCR_CRF TCCR_CR2_F
-#define PPM_CCR_CRR TCCR_CR2_R
-#define PPM_CCR_CRI TCCR_CR2_I
-#define PPM_CR T0CR2
-
-/* ADC */
-
-#define ADC_0 AdcBank0(3)
-#ifdef USE_ADC_0
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_3
-#endif
-
-#define ADC_1 AdcBank0(2)
-#ifdef USE_ADC_1
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_2
-#endif
-
-
-#define ADC_2 AdcBank0(1)
-#ifdef USE_ADC_2
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_1
-#endif
-
-#define ADC_3 AdcBank1(7)
-#ifdef USE_ADC_3
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_7
-#endif
-
-#define ADC_4 AdcBank1(3)
-#ifdef USE_ADC_4
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_3
-#endif
-
-#define ADC_5 AdcBank1(4)
-#ifdef USE_ADC_5
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_4
-#endif
-
-#define ADC_6 AdcBank1(5)
-#ifdef USE_ADC_6
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_5
-#endif
-
-#define ADC_7 AdcBank1(2)
-#ifdef USE_ADC_7
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_2
-#endif
-
-#define ADC_CHANNEL_VSUPPLY AdcBank1(6)
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_6
-
-#define DefaultVoltageOfAdc(adc) (0.01787109375*adc)
-
-#define SPI_SELECT_SLAVE0_PORT 0
-#define SPI_SELECT_SLAVE0_PIN 20
-
-#endif /* CONFIG_TINY_H */

Deleted: paparazzi3/trunk/conf/autopilot/tiny_1_1.h
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny_1_1.h  2010-10-31 23:24:53 UTC (rev 
6311)
+++ paparazzi3/trunk/conf/autopilot/tiny_1_1.h  2010-10-31 23:25:00 UTC (rev 
6312)
@@ -1,140 +0,0 @@
-#ifndef CONFIG_TINY_H
-#define CONFIG_TINY_H
-
-/* Master oscillator freq.       */
-#define FOSC (12000000) 
-
-/* PLL multiplier                */
-#define PLL_MUL (5)         
-
-/* CPU clock freq.               */
-#define CCLK (FOSC * PLL_MUL) 
-
-/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2   */
-#define PBSD_BITS 0x00    
-#define PBSD_VAL 4
-
-/* Peripheral bus clock freq. */
-#define PCLK (CCLK / PBSD_VAL) 
-
-/* Onboard leds */
-#define LED_1_BANK 1
-#define LED_1_PIN 28
-
-#define LED_2_BANK 1
-#define LED_2_PIN 19
-
-/* Switch pin */
-#define LED_3_BANK 0
-#define LED_3_PIN 11
-
-#define POWER_SWITCH_LED 3
-
-/* P0.5 aka MAT0.1  */
-#define SERVO_CLOCK_PIN  5
-#define SERVO_CLOCK_PINSEL PINSEL0
-#define SERVO_CLOCK_PINSEL_VAL 0x02
-#define SERVO_CLOCK_PINSEL_BIT 10
-/* p1.23          */
-#define SERVO_DATA_PIN  23
-/* p1.24          */
-#define SERVO_RESET_PIN 24
-
-/* PPM : rc rx on P0.6*/
-#define PPM_PINSEL PINSEL0
-#define PPM_PINSEL_VAL 0x02
-#define PPM_PINSEL_BIT 12
-#define PPM_CRI TIR_CR2I
-#define PPM_CCR_CRF TCCR_CR2_F
-#define PPM_CCR_CRR TCCR_CR2_R
-#define PPM_CCR_CRI TCCR_CR2_I
-#define PPM_CR T0CR2
-
-/* ADC */
-
-#define ADC_0 AdcBank0(3)
-#ifdef USE_ADC_0
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_3
-#endif
-
-#define ADC_1 AdcBank0(2)
-#ifdef USE_ADC_1
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_2
-#endif
-
-
-#define ADC_2 AdcBank0(1)
-#ifdef USE_ADC_2
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_1
-#endif
-
-#define ADC_3 AdcBank0(4)
-#ifdef USE_ADC_3
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_4
-#endif
-
-#define ADC_4 AdcBank1(7)
-#ifdef USE_ADC_4
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_7
-#endif
-
-#define ADC_5 AdcBank1(3)
-#ifdef USE_ADC_5
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_3
-#endif
-
-#define ADC_6 AdcBank1(4)
-#ifdef USE_ADC_6
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_4
-#endif
-
-#define ADC_7 AdcBank1(5)
-#ifdef USE_ADC_7
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_5
-#endif
-
-#define ADC_CHANNEL_VSUPPLY AdcBank1(6)
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_6
-
-
-#ifndef VoltageOfAdc
-#define VoltageOfAdc(adc) (0.01787109375*adc)
-#endif
-
-#define SPI_SELECT_SLAVE0_PORT 0
-#define SPI_SELECT_SLAVE0_PIN 20
-
-#define SPI1_DRDY_PINSEL PINSEL0
-#define SPI1_DRDY_PINSEL_BIT  14
-#define SPI1_DRDY_PINSEL_VAL   3
-#define SPI1_DRDY_EINT         2
-#define SPI1_DRDY_VIC_IT       VIC_EINT2
-
-#endif /* CONFIG_TINY_H */

Deleted: paparazzi3/trunk/conf/autopilot/tiny_2_0.h
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny_2_0.h  2010-10-31 23:24:53 UTC (rev 
6311)
+++ paparazzi3/trunk/conf/autopilot/tiny_2_0.h  2010-10-31 23:25:00 UTC (rev 
6312)
@@ -1,139 +0,0 @@
-#ifndef CONFIG_TINY_H
-#define CONFIG_TINY_H
-
-#ifdef SITL
-/* Dummy definitions: adc are unused anyway */
-#define AdcBank0(x) (x)
-#define AdcBank1(x) (x)
-#endif /* SITL */
-
-/* Master oscillator freq.       */
-#define FOSC (12000000) 
-
-/* PLL multiplier                */
-#define PLL_MUL (5)         
-
-/* CPU clock freq.               */
-#define CCLK (FOSC * PLL_MUL) 
-
-/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2   */
-#define PBSD_BITS 0x00    
-#define PBSD_VAL 4
-
-/* Peripheral bus clock freq. */
-#define PCLK (CCLK / PBSD_VAL) 
-
-#define LED_1_BANK 1
-#define LED_1_PIN 17
-
-#define LED_2_BANK 1
-#define LED_2_PIN 16
-
-#define LED_3_BANK 1
-#define LED_3_PIN 23
-
-#define LED_4_BANK 1
-#define LED_4_PIN 18
-
-#define POWER_SWITCH_LED 4
-
-/* P0.5 aka MAT0.1  */
-#define SERVO_CLOCK_PIN  5
-#define SERVO_CLOCK_PINSEL PINSEL0
-#define SERVO_CLOCK_PINSEL_VAL 0x02
-#define SERVO_CLOCK_PINSEL_BIT 10
-/* p1.20          */
-#define SERVO_RESET_PIN 20
-
-/* PPM : rc rx on P0.6*/
-#define PPM_PINSEL PINSEL0
-#define PPM_PINSEL_VAL 0x02
-#define PPM_PINSEL_BIT 12
-#define PPM_CRI TIR_CR2I
-#define PPM_CCR_CRF TCCR_CR2_F
-#define PPM_CCR_CRR TCCR_CR2_R
-#define PPM_CCR_CRI TCCR_CR2_I
-#define PPM_CR T0CR2
-
-/* ADC */
-
-#define ADC_0 AdcBank1(6)
-#ifdef USE_ADC_0
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_6
-#endif
-
-#define ADC_1 AdcBank1(7)
-#ifdef USE_ADC_1
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_7
-#endif
-
-
-#define ADC_2 AdcBank0(4)
-#ifdef USE_ADC_2
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_4
-#endif
-
-#define ADC_3 AdcBank0(6)
-#ifdef USE_ADC_3
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_6
-#endif
-
-#define ADC_4 AdcBank0(3)
-#ifdef USE_ADC_4
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_3
-#endif
-
-#define ADC_5 AdcBank0(2)
-#ifdef USE_ADC_5
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_2
-#endif
-
-#define ADC_6 AdcBank0(1)
-#ifdef USE_ADC_6
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_1
-#endif
-
-#define ADC_7 AdcBank1(3)
-#ifdef USE_ADC_7
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_3
-#endif
-
-#define ADC_CHANNEL_VSUPPLY AdcBank1(5)
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_5
-
-
-#ifndef VoltageOfAdc
-#define VoltageOfAdc(adc) (0.01787109375*adc)
-#endif
-
-#define SPI_SELECT_SLAVE0_PORT 0
-#define SPI_SELECT_SLAVE0_PIN 20
-
-#endif /* CONFIG_TINY_H */

Deleted: paparazzi3/trunk/conf/autopilot/tiny_2_1.h
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny_2_1.h  2010-10-31 23:24:53 UTC (rev 
6311)
+++ paparazzi3/trunk/conf/autopilot/tiny_2_1.h  2010-10-31 23:25:00 UTC (rev 
6312)
@@ -1,169 +0,0 @@
-#ifndef CONFIG_TINY_H
-#define CONFIG_TINY_H
-
-#ifdef SITL
-/* Dummy definitions: adc are unused anyway */
-#define AdcBank0(x) (x)
-#define AdcBank1(x) (x)
-#endif /* SITL */
-
-/* Master oscillator freq.       */
-#define FOSC (12000000) 
-
-/* PLL multiplier                */
-#define PLL_MUL (5)         
-
-/* CPU clock freq.               */
-#define CCLK (FOSC * PLL_MUL) 
-
-/* current @7V, Tiny2.11, Funjet4, no LED
-   PCLK   max   min
-   15MHz  99mA  92mA
-   30MHz 105mA  98mA
-   60MHz 116mA 108mA
-*/
-
-#ifdef USE_USB_HIGH_PCLK
-/* Peripheral bus speed mask  0x00-> 4, 0x01-> 1, 0x02-> 2   */
-/* change both PBSD_BITS/VAL     15MHz,    60MHz,    30MHz   */
-#define PBSD_BITS 0x02
-#define PBSD_VAL 2
-#else
-/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2   */
-#define PBSD_BITS 0x00    
-#define PBSD_VAL 4
-#endif
-
-/* Peripheral bus clock freq. */
-#define PCLK (CCLK / PBSD_VAL) 
-
-#define LED_1_BANK 1
-#define LED_1_PIN 17
-
-#define LED_2_BANK 1
-#define LED_2_PIN 16
-
-#define LED_3_BANK 1
-#define LED_3_PIN 23
-
-#define LED_4_BANK 1
-#define LED_4_PIN 18
-
-#define POWER_SWITCH_LED 4
-
-#define LED_5_BANK 1
-#define LED_5_PIN 22
-
-#define CAM_SWITCH_LED 5
-
-#define LED_GPS_RESET_BANK 1
-#define LED_GPS_RESET_PIN 21
-
-#define Configure_GPS_RESET_Pin() LED_INIT(GPS_RESET)
-#define Set_GPS_RESET_Pin_LOW() LED_ON(GPS_RESET)
-#define Open_GPS_RESET_Pin() ClearBit(LED_DIR(GPS_RESET), LED_PIN(GPS_RESET))
-
-/* P0.5 aka MAT0.1  */
-#define SERVO_CLOCK_PIN  5
-#define SERVO_CLOCK_PINSEL PINSEL0
-#define SERVO_CLOCK_PINSEL_VAL 0x02
-#define SERVO_CLOCK_PINSEL_BIT 10
-/* p1.20          */
-#define SERVO_RESET_PIN 20
-
-/* PPM : rc rx on P0.6*/
-#define PPM_PINSEL PINSEL0
-#define PPM_PINSEL_VAL 0x02
-#define PPM_PINSEL_BIT 12
-#define PPM_CRI TIR_CR2I
-#define PPM_CCR_CRF TCCR_CR2_F
-#define PPM_CCR_CRR TCCR_CR2_R
-#define PPM_CCR_CRI TCCR_CR2_I
-#define PPM_CR T0CR2
-
-/* ADC */
-
-#define ADC_0 AdcBank1(6)
-#ifdef USE_ADC_0
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_6
-#endif
-
-#define ADC_1 AdcBank1(7)
-#ifdef USE_ADC_1
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_7
-#endif
-
-
-#define ADC_2 AdcBank0(4)
-#ifdef USE_ADC_2
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_4
-#endif
-
-#define ADC_3 AdcBank0(6)
-#ifdef USE_ADC_3
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_6
-#endif
-
-#define ADC_4 AdcBank0(3)
-#ifdef USE_ADC_4
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_3
-#endif
-
-#define ADC_5 AdcBank0(2)
-#ifdef USE_ADC_5
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_2
-#endif
-
-#define ADC_6 AdcBank0(1)
-#ifdef USE_ADC_6
-#ifndef USE_AD0
-#define USE_AD0
-#endif
-#define USE_AD0_1
-#endif
-
-#define ADC_7 AdcBank1(3)
-#ifdef USE_ADC_7
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_3
-#endif
-
-#define ADC_CHANNEL_VSUPPLY AdcBank1(5)
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_5
-
-
-#define DefaultVoltageOfAdc(adc) (0.01787109375*adc)
-
-#define SPI_SELECT_SLAVE0_PORT 0
-#define SPI_SELECT_SLAVE0_PIN 20
-
-#define SPI1_DRDY_PINSEL PINSEL1
-#define SPI1_DRDY_PINSEL_BIT   0
-#define SPI1_DRDY_PINSEL_VAL   1
-#define SPI1_DRDY_EINT         0
-#define SPI1_DRDY_VIC_IT       VIC_EINT0
-
-#endif /* CONFIG_TINY_H */

Deleted: paparazzi3/trunk/conf/autopilot/tiny_2_1_1.h
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny_2_1_1.h        2010-10-31 23:24:53 UTC 
(rev 6311)
+++ paparazzi3/trunk/conf/autopilot/tiny_2_1_1.h        2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -1,4 +0,0 @@
-#include "tiny_2_1.h"
-
-#undef DefaultVoltageOfAdc
-#define DefaultVoltageOfAdc(adc) (0.0247311828*adc)

Deleted: paparazzi3/trunk/conf/autopilot/twog_v1.h
===================================================================
--- paparazzi3/trunk/conf/autopilot/twog_v1.h   2010-10-31 23:24:53 UTC (rev 
6311)
+++ paparazzi3/trunk/conf/autopilot/twog_v1.h   2010-10-31 23:25:00 UTC (rev 
6312)
@@ -1,4 +0,0 @@
-#include "tiny_2_1.h"
-
-#undef DefaultVoltageOfAdc
-#define DefaultVoltageOfAdc(adc) (0.0247311828*adc)

Modified: paparazzi3/trunk/conf/boards/tiny_0.99.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_0.99.makefile     2010-10-31 23:24:53 UTC 
(rev 6311)
+++ paparazzi3/trunk/conf/boards/tiny_0.99.makefile     2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -11,12 +11,8 @@
 BOARD=tiny
 BOARD_VERSION=0.99
 
-#BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
-# TODO: update syntax
-BOARD_CFG = \"tiny_0_99.h\"
-
-
 GPS_UART_NR    = 1
 GPS_LED = none
 MODEM_UART_NR = 0

Modified: paparazzi3/trunk/conf/boards/tiny_1.1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_1.1.makefile      2010-10-31 23:24:53 UTC 
(rev 6311)
+++ paparazzi3/trunk/conf/boards/tiny_1.1.makefile      2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -11,11 +11,8 @@
 BOARD=tiny
 BOARD_VERSION=1.1
 
-#BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
-# TODO: update syntax
-BOARD_CFG = \"tiny_1_1.h\"
-
 GPS_UART_NR    = 1
 GPS_LED = none
 MODEM_UART_NR = 0

Modified: paparazzi3/trunk/conf/boards/tiny_2.1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_2.1.makefile      2010-10-31 23:24:53 UTC 
(rev 6311)
+++ paparazzi3/trunk/conf/boards/tiny_2.1.makefile      2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -10,10 +10,5 @@
 BOARD=tiny
 BOARD_VERSION=2.1
 
-#BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
-# TODO: update syntax
-BOARD_CFG = \"tiny_2_1.h\"
-
-
-

Modified: paparazzi3/trunk/conf/boards/tiny_2.11.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/tiny_2.11.makefile     2010-10-31 23:24:53 UTC 
(rev 6311)
+++ paparazzi3/trunk/conf/boards/tiny_2.11.makefile     2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -9,11 +9,8 @@
 BOARD=tiny
 BOARD_VERSION=2.11
 
-#BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
 
-# TODO: update syntax
-BOARD_CFG = \"tiny_2_1_1.h\"
-
 ifndef FLASH_MODE
 FLASH_MODE = IAP
 endif

Modified: paparazzi3/trunk/conf/boards/twog_1.makefile
===================================================================
--- paparazzi3/trunk/conf/boards/twog_1.makefile        2010-10-31 23:24:53 UTC 
(rev 6311)
+++ paparazzi3/trunk/conf/boards/twog_1.makefile        2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -9,7 +9,4 @@
 BOARD=twog
 BOARD_VERSION=1.0
 
-#BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"
-
-# TODO: update syntax
-BOARD_CFG = \"twog_v1.h\"
+BOARD_CFG=\"boards/$(BOARD)_$(BOARD_VERSION).h\"

Copied: paparazzi3/trunk/sw/airborne/boards/tiny_0.99.h (from rev 6311, 
paparazzi3/trunk/conf/autopilot/tiny_0_99.h)
===================================================================
--- paparazzi3/trunk/sw/airborne/boards/tiny_0.99.h                             
(rev 0)
+++ paparazzi3/trunk/sw/airborne/boards/tiny_0.99.h     2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -0,0 +1,130 @@
+#ifndef CONFIG_TINY_H
+#define CONFIG_TINY_H
+
+#ifdef SITL
+/* Dummy definitions: adc are unused anyway */
+#define AdcBank0(x) (x)
+#define AdcBank1(x) (x)
+#endif /* SITL */
+
+/* Master oscillator freq.       */
+#define FOSC (12000000)
+
+/* PLL multiplier                */
+#define PLL_MUL (5)
+
+/* CPU clock freq.               */
+#define CCLK (FOSC * PLL_MUL)
+
+/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2   */
+#define PBSD_BITS 0x00
+#define PBSD_VAL 4
+
+/* Peripheral bus clock freq. */
+#define PCLK (CCLK / PBSD_VAL)
+
+#define LED_1_BANK 1
+#define LED_1_PIN 28
+
+#define LED_2_BANK 1
+#define LED_2_PIN 19
+
+/* P0.5 aka MAT0.1  */
+#define SERVO_CLOCK_PIN  5
+#define SERVO_CLOCK_PINSEL PINSEL0
+#define SERVO_CLOCK_PINSEL_VAL 0x02
+#define SERVO_CLOCK_PINSEL_BIT 10
+/* p1.23          */
+#define SERVO_DATA_PIN  20
+/* p1.24          */
+#define SERVO_RESET_PIN 29
+
+/* PPM : rc rx on P0.6*/
+#define PPM_PINSEL PINSEL0
+#define PPM_PINSEL_VAL 0x02
+#define PPM_PINSEL_BIT 12
+#define PPM_CRI TIR_CR2I
+#define PPM_CCR_CRF TCCR_CR2_F
+#define PPM_CCR_CRR TCCR_CR2_R
+#define PPM_CCR_CRI TCCR_CR2_I
+#define PPM_CR T0CR2
+
+/* ADC */
+
+#define ADC_0 AdcBank0(3)
+#ifdef USE_ADC_0
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_3
+#endif
+
+#define ADC_1 AdcBank0(2)
+#ifdef USE_ADC_1
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_2
+#endif
+
+
+#define ADC_2 AdcBank0(1)
+#ifdef USE_ADC_2
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_1
+#endif
+
+#define ADC_3 AdcBank1(7)
+#ifdef USE_ADC_3
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_7
+#endif
+
+#define ADC_4 AdcBank1(3)
+#ifdef USE_ADC_4
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_3
+#endif
+
+#define ADC_5 AdcBank1(4)
+#ifdef USE_ADC_5
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_4
+#endif
+
+#define ADC_6 AdcBank1(5)
+#ifdef USE_ADC_6
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_5
+#endif
+
+#define ADC_7 AdcBank1(2)
+#ifdef USE_ADC_7
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_2
+#endif
+
+#define ADC_CHANNEL_VSUPPLY AdcBank1(6)
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_6
+
+#define DefaultVoltageOfAdc(adc) (0.01787109375*adc)
+
+#define SPI_SELECT_SLAVE0_PORT 0
+#define SPI_SELECT_SLAVE0_PIN 20
+
+#endif /* CONFIG_TINY_H */

Copied: paparazzi3/trunk/sw/airborne/boards/tiny_1.1.h (from rev 6311, 
paparazzi3/trunk/conf/autopilot/tiny_1_1.h)
===================================================================
--- paparazzi3/trunk/sw/airborne/boards/tiny_1.1.h                              
(rev 0)
+++ paparazzi3/trunk/sw/airborne/boards/tiny_1.1.h      2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -0,0 +1,140 @@
+#ifndef CONFIG_TINY_H
+#define CONFIG_TINY_H
+
+/* Master oscillator freq.       */
+#define FOSC (12000000)
+
+/* PLL multiplier                */
+#define PLL_MUL (5)
+
+/* CPU clock freq.               */
+#define CCLK (FOSC * PLL_MUL)
+
+/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2   */
+#define PBSD_BITS 0x00
+#define PBSD_VAL 4
+
+/* Peripheral bus clock freq. */
+#define PCLK (CCLK / PBSD_VAL)
+
+/* Onboard leds */
+#define LED_1_BANK 1
+#define LED_1_PIN 28
+
+#define LED_2_BANK 1
+#define LED_2_PIN 19
+
+/* Switch pin */
+#define LED_3_BANK 0
+#define LED_3_PIN 11
+
+#define POWER_SWITCH_LED 3
+
+/* P0.5 aka MAT0.1  */
+#define SERVO_CLOCK_PIN  5
+#define SERVO_CLOCK_PINSEL PINSEL0
+#define SERVO_CLOCK_PINSEL_VAL 0x02
+#define SERVO_CLOCK_PINSEL_BIT 10
+/* p1.23          */
+#define SERVO_DATA_PIN  23
+/* p1.24          */
+#define SERVO_RESET_PIN 24
+
+/* PPM : rc rx on P0.6*/
+#define PPM_PINSEL PINSEL0
+#define PPM_PINSEL_VAL 0x02
+#define PPM_PINSEL_BIT 12
+#define PPM_CRI TIR_CR2I
+#define PPM_CCR_CRF TCCR_CR2_F
+#define PPM_CCR_CRR TCCR_CR2_R
+#define PPM_CCR_CRI TCCR_CR2_I
+#define PPM_CR T0CR2
+
+/* ADC */
+
+#define ADC_0 AdcBank0(3)
+#ifdef USE_ADC_0
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_3
+#endif
+
+#define ADC_1 AdcBank0(2)
+#ifdef USE_ADC_1
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_2
+#endif
+
+
+#define ADC_2 AdcBank0(1)
+#ifdef USE_ADC_2
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_1
+#endif
+
+#define ADC_3 AdcBank0(4)
+#ifdef USE_ADC_3
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_4
+#endif
+
+#define ADC_4 AdcBank1(7)
+#ifdef USE_ADC_4
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_7
+#endif
+
+#define ADC_5 AdcBank1(3)
+#ifdef USE_ADC_5
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_3
+#endif
+
+#define ADC_6 AdcBank1(4)
+#ifdef USE_ADC_6
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_4
+#endif
+
+#define ADC_7 AdcBank1(5)
+#ifdef USE_ADC_7
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_5
+#endif
+
+#define ADC_CHANNEL_VSUPPLY AdcBank1(6)
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_6
+
+
+#ifndef VoltageOfAdc
+#define VoltageOfAdc(adc) (0.01787109375*adc)
+#endif
+
+#define SPI_SELECT_SLAVE0_PORT 0
+#define SPI_SELECT_SLAVE0_PIN 20
+
+#define SPI1_DRDY_PINSEL PINSEL0
+#define SPI1_DRDY_PINSEL_BIT  14
+#define SPI1_DRDY_PINSEL_VAL   3
+#define SPI1_DRDY_EINT         2
+#define SPI1_DRDY_VIC_IT       VIC_EINT2
+
+#endif /* CONFIG_TINY_H */

Copied: paparazzi3/trunk/sw/airborne/boards/tiny_2.0.h (from rev 6311, 
paparazzi3/trunk/conf/autopilot/tiny_2_0.h)
===================================================================
--- paparazzi3/trunk/sw/airborne/boards/tiny_2.0.h                              
(rev 0)
+++ paparazzi3/trunk/sw/airborne/boards/tiny_2.0.h      2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -0,0 +1,139 @@
+#ifndef CONFIG_TINY_H
+#define CONFIG_TINY_H
+
+#ifdef SITL
+/* Dummy definitions: adc are unused anyway */
+#define AdcBank0(x) (x)
+#define AdcBank1(x) (x)
+#endif /* SITL */
+
+/* Master oscillator freq.       */
+#define FOSC (12000000)
+
+/* PLL multiplier                */
+#define PLL_MUL (5)
+
+/* CPU clock freq.               */
+#define CCLK (FOSC * PLL_MUL)
+
+/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2   */
+#define PBSD_BITS 0x00
+#define PBSD_VAL 4
+
+/* Peripheral bus clock freq. */
+#define PCLK (CCLK / PBSD_VAL)
+
+#define LED_1_BANK 1
+#define LED_1_PIN 17
+
+#define LED_2_BANK 1
+#define LED_2_PIN 16
+
+#define LED_3_BANK 1
+#define LED_3_PIN 23
+
+#define LED_4_BANK 1
+#define LED_4_PIN 18
+
+#define POWER_SWITCH_LED 4
+
+/* P0.5 aka MAT0.1  */
+#define SERVO_CLOCK_PIN  5
+#define SERVO_CLOCK_PINSEL PINSEL0
+#define SERVO_CLOCK_PINSEL_VAL 0x02
+#define SERVO_CLOCK_PINSEL_BIT 10
+/* p1.20          */
+#define SERVO_RESET_PIN 20
+
+/* PPM : rc rx on P0.6*/
+#define PPM_PINSEL PINSEL0
+#define PPM_PINSEL_VAL 0x02
+#define PPM_PINSEL_BIT 12
+#define PPM_CRI TIR_CR2I
+#define PPM_CCR_CRF TCCR_CR2_F
+#define PPM_CCR_CRR TCCR_CR2_R
+#define PPM_CCR_CRI TCCR_CR2_I
+#define PPM_CR T0CR2
+
+/* ADC */
+
+#define ADC_0 AdcBank1(6)
+#ifdef USE_ADC_0
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_6
+#endif
+
+#define ADC_1 AdcBank1(7)
+#ifdef USE_ADC_1
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_7
+#endif
+
+
+#define ADC_2 AdcBank0(4)
+#ifdef USE_ADC_2
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_4
+#endif
+
+#define ADC_3 AdcBank0(6)
+#ifdef USE_ADC_3
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_6
+#endif
+
+#define ADC_4 AdcBank0(3)
+#ifdef USE_ADC_4
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_3
+#endif
+
+#define ADC_5 AdcBank0(2)
+#ifdef USE_ADC_5
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_2
+#endif
+
+#define ADC_6 AdcBank0(1)
+#ifdef USE_ADC_6
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_1
+#endif
+
+#define ADC_7 AdcBank1(3)
+#ifdef USE_ADC_7
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_3
+#endif
+
+#define ADC_CHANNEL_VSUPPLY AdcBank1(5)
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_5
+
+
+#ifndef VoltageOfAdc
+#define VoltageOfAdc(adc) (0.01787109375*adc)
+#endif
+
+#define SPI_SELECT_SLAVE0_PORT 0
+#define SPI_SELECT_SLAVE0_PIN 20
+
+#endif /* CONFIG_TINY_H */

Copied: paparazzi3/trunk/sw/airborne/boards/tiny_2.1.h (from rev 6311, 
paparazzi3/trunk/conf/autopilot/tiny_2_1.h)
===================================================================
--- paparazzi3/trunk/sw/airborne/boards/tiny_2.1.h                              
(rev 0)
+++ paparazzi3/trunk/sw/airborne/boards/tiny_2.1.h      2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -0,0 +1,169 @@
+#ifndef CONFIG_TINY_H
+#define CONFIG_TINY_H
+
+#ifdef SITL
+/* Dummy definitions: adc are unused anyway */
+#define AdcBank0(x) (x)
+#define AdcBank1(x) (x)
+#endif /* SITL */
+
+/* Master oscillator freq.       */
+#define FOSC (12000000)
+
+/* PLL multiplier                */
+#define PLL_MUL (5)
+
+/* CPU clock freq.               */
+#define CCLK (FOSC * PLL_MUL)
+
+/* current @7V, Tiny2.11, Funjet4, no LED
+   PCLK   max   min
+   15MHz  99mA  92mA
+   30MHz 105mA  98mA
+   60MHz 116mA 108mA
+*/
+
+#ifdef USE_USB_HIGH_PCLK
+/* Peripheral bus speed mask  0x00-> 4, 0x01-> 1, 0x02-> 2   */
+/* change both PBSD_BITS/VAL     15MHz,    60MHz,    30MHz   */
+#define PBSD_BITS 0x02
+#define PBSD_VAL 2
+#else
+/* Peripheral bus speed mask 0x00->4, 0x01-> 1, 0x02 -> 2   */
+#define PBSD_BITS 0x00
+#define PBSD_VAL 4
+#endif
+
+/* Peripheral bus clock freq. */
+#define PCLK (CCLK / PBSD_VAL)
+
+#define LED_1_BANK 1
+#define LED_1_PIN 17
+
+#define LED_2_BANK 1
+#define LED_2_PIN 16
+
+#define LED_3_BANK 1
+#define LED_3_PIN 23
+
+#define LED_4_BANK 1
+#define LED_4_PIN 18
+
+#define POWER_SWITCH_LED 4
+
+#define LED_5_BANK 1
+#define LED_5_PIN 22
+
+#define CAM_SWITCH_LED 5
+
+#define LED_GPS_RESET_BANK 1
+#define LED_GPS_RESET_PIN 21
+
+#define Configure_GPS_RESET_Pin() LED_INIT(GPS_RESET)
+#define Set_GPS_RESET_Pin_LOW() LED_ON(GPS_RESET)
+#define Open_GPS_RESET_Pin() ClearBit(LED_DIR(GPS_RESET), LED_PIN(GPS_RESET))
+
+/* P0.5 aka MAT0.1  */
+#define SERVO_CLOCK_PIN  5
+#define SERVO_CLOCK_PINSEL PINSEL0
+#define SERVO_CLOCK_PINSEL_VAL 0x02
+#define SERVO_CLOCK_PINSEL_BIT 10
+/* p1.20          */
+#define SERVO_RESET_PIN 20
+
+/* PPM : rc rx on P0.6*/
+#define PPM_PINSEL PINSEL0
+#define PPM_PINSEL_VAL 0x02
+#define PPM_PINSEL_BIT 12
+#define PPM_CRI TIR_CR2I
+#define PPM_CCR_CRF TCCR_CR2_F
+#define PPM_CCR_CRR TCCR_CR2_R
+#define PPM_CCR_CRI TCCR_CR2_I
+#define PPM_CR T0CR2
+
+/* ADC */
+
+#define ADC_0 AdcBank1(6)
+#ifdef USE_ADC_0
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_6
+#endif
+
+#define ADC_1 AdcBank1(7)
+#ifdef USE_ADC_1
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_7
+#endif
+
+
+#define ADC_2 AdcBank0(4)
+#ifdef USE_ADC_2
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_4
+#endif
+
+#define ADC_3 AdcBank0(6)
+#ifdef USE_ADC_3
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_6
+#endif
+
+#define ADC_4 AdcBank0(3)
+#ifdef USE_ADC_4
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_3
+#endif
+
+#define ADC_5 AdcBank0(2)
+#ifdef USE_ADC_5
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_2
+#endif
+
+#define ADC_6 AdcBank0(1)
+#ifdef USE_ADC_6
+#ifndef USE_AD0
+#define USE_AD0
+#endif
+#define USE_AD0_1
+#endif
+
+#define ADC_7 AdcBank1(3)
+#ifdef USE_ADC_7
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_3
+#endif
+
+#define ADC_CHANNEL_VSUPPLY AdcBank1(5)
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_5
+
+
+#define DefaultVoltageOfAdc(adc) (0.01787109375*adc)
+
+#define SPI_SELECT_SLAVE0_PORT 0
+#define SPI_SELECT_SLAVE0_PIN 20
+
+#define SPI1_DRDY_PINSEL PINSEL1
+#define SPI1_DRDY_PINSEL_BIT   0
+#define SPI1_DRDY_PINSEL_VAL   1
+#define SPI1_DRDY_EINT         0
+#define SPI1_DRDY_VIC_IT       VIC_EINT0
+
+#endif /* CONFIG_TINY_H */

Copied: paparazzi3/trunk/sw/airborne/boards/tiny_2.11.h (from rev 6311, 
paparazzi3/trunk/conf/autopilot/tiny_2_1_1.h)
===================================================================
--- paparazzi3/trunk/sw/airborne/boards/tiny_2.11.h                             
(rev 0)
+++ paparazzi3/trunk/sw/airborne/boards/tiny_2.11.h     2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -0,0 +1,4 @@
+#include "boards/tiny_2.1.h"
+
+#undef DefaultVoltageOfAdc
+#define DefaultVoltageOfAdc(adc) (0.0247311828*adc)

Copied: paparazzi3/trunk/sw/airborne/boards/twog_1.0.h (from rev 6311, 
paparazzi3/trunk/conf/autopilot/twog_v1.h)
===================================================================
--- paparazzi3/trunk/sw/airborne/boards/twog_1.0.h                              
(rev 0)
+++ paparazzi3/trunk/sw/airborne/boards/twog_1.0.h      2010-10-31 23:25:00 UTC 
(rev 6312)
@@ -0,0 +1,4 @@
+#include "boards/tiny_2.1.h"
+
+#undef DefaultVoltageOfAdc
+#define DefaultVoltageOfAdc(adc) (0.0247311828*adc)
[Prev in Thread]
Current Thread
[Next in Thread]
[paparazzi-commits] [6312] moved tiny board headers to sw/airborne/ boards and cleaned up some trailing whitespaces, Felix Ruess <=
Prev by Date: [paparazzi-commits] [6311] update fixedwing.xml description a little
Next by Date: [paparazzi-commits] [6313] renamed twog board from "twog_1" to "twog_1.0", please update
Previous by thread: [paparazzi-commits] [6311] update fixedwing.xml description a little
Next by thread: [paparazzi-commits] [6313] renamed twog board from "twog_1" to "twog_1.0", please update
Index(es):
- Date
- Thread