[paparazzi-commits] [6317] moved some old tiny makefiles and headers to

paparazzi-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [6317] moved some old tiny makefiles and headers to

From:	Felix Ruess
Subject:	[paparazzi-commits] [6317] moved some old tiny makefiles and headers to obsolete dir
Date:	Mon, 01 Nov 2010 11:35:31 +0000
Revision: 6317
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6317
Author:   flixr
Date:     2010-11-01 11:35:31 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
moved some old tiny makefiles and headers to obsolete dir

Added Paths:
-----------
    paparazzi3/trunk/conf/autopilot/obsolete/tiny.h
    paparazzi3/trunk/conf/autopilot/obsolete/tiny.makefile
    paparazzi3/trunk/conf/autopilot/obsolete/tiny_2_1_1_usb.h

Removed Paths:
-------------
    paparazzi3/trunk/conf/autopilot/tiny.h
    paparazzi3/trunk/conf/autopilot/tiny.makefile
    paparazzi3/trunk/conf/autopilot/tiny_2_1_1_usb.h

Copied: paparazzi3/trunk/conf/autopilot/obsolete/tiny.h (from rev 6316, 
paparazzi3/trunk/conf/autopilot/tiny.h)
===================================================================
--- paparazzi3/trunk/conf/autopilot/obsolete/tiny.h                             
(rev 0)
+++ paparazzi3/trunk/conf/autopilot/obsolete/tiny.h     2010-11-01 11:35:31 UTC 
(rev 6317)
@@ -0,0 +1,127 @@
+#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) 
+
+#define LED_1_BANK 1
+#define LED_1_PIN 28
+
+#define LED_2_BANK 1
+#define LED_2_PIN 19
+
+/* p0.21 aka PWM5 */
+#define SERV0_CLOCK_PIN 21
+#define SERV0_CLOCK_PINSEL PINSEL1
+#define SERV0_CLOCK_PINSEL_VAL 0x01
+#define SERV0_CLOCK_PINSEL_BIT 10
+/* p1.20          */
+#define SERV0_DATA_PIN  20
+/* p1.21          */
+#define SERV0_RESET_PIN 21
+
+/* P0.7 aka PWM2  */
+#define SERV1_CLOCK_PIN  7
+#define SERV1_CLOCK_PINSEL PINSEL0
+#define SERV1_CLOCK_PINSEL_VAL 0x02
+#define SERV1_CLOCK_PINSEL_BIT 14
+/* p1.30          */
+#define SERV1_DATA_PIN  30
+/* p1.29          */
+#define SERV1_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) Used for VSUPPLY */
+
+#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(7)
+#ifndef USE_AD1
+#define USE_AD1
+#endif
+#define USE_AD1_7
+
+
+#define DefaultVoltageOfAdc(adc) (0.01787109375*adc)
+
+
+#endif /* CONFIG_TINY_H */

Copied: paparazzi3/trunk/conf/autopilot/obsolete/tiny.makefile (from rev 6316, 
paparazzi3/trunk/conf/autopilot/tiny.makefile)
===================================================================
--- paparazzi3/trunk/conf/autopilot/obsolete/tiny.makefile                      
        (rev 0)
+++ paparazzi3/trunk/conf/autopilot/obsolete/tiny.makefile      2010-11-01 
11:35:31 UTC (rev 6317)
@@ -0,0 +1,72 @@
+# Makefile for the Tiny board (1 arm7tdmi, 1 LEA-LA)
+
+#
+# can we remove this file?
+# the makefiles under conf/boards/ should be used now
+#
+
+ARCHI=lpc21
+ARCH=lpc21
+
+ap.ARCHDIR = $(ARCHI)
+
+fbw.ARCHDIR = $(ARCHI)
+
+LPC21ISP_BAUD = 38400
+LPC21ISP_XTAL = 12000
+
+
+### default settings for tiny_2 and twog
+GPS_UART_NR    = 0
+GPS_BAUD       = 38400
+MODEM_UART_NR = 1
+MODEM_BAUD = 57600
+
+ADC_IR1 = ADC_1
+ADC_IR2 = ADC_2
+ADC_IR_TOP = ADC_0
+ADC_IR_NB_SAMPLES = 16
+ADC_GYRO_ROLL = ADC_3
+ADC_GYRO_NB_SAMPLES = 16
+
+# a test program to setup actuators
+setup_actuators.ARCHDIR = $(ARCHI)
+
+setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 
-DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART0 -DUART0_BAUD=B9600 
-DDATALINK=PPRZ -DPPRZ_UART=Uart0
+setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c 
$(SRC_ARCH)/servos_4015_hw.c main.c
+
+
+# a test program to tunnel between both uart
+tunnel.ARCHDIR = $(ARCHI)
+
+tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DLED
+tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
+
+
+# A test program to monitor the ADC values
+test_adcs.ARCHDIR = $(ARCHI)
+
+test_adcs.CFLAGS += -DBOARD_CONFIG=$(CONFIG) -DLED -DTIME_LED=1 -DADC 
-DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5 
-DUSE_ADC_6 -DUSE_ADC_7
+test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport 
-DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 
-DDATALINK=XBEE -DUART0_BAUD=B9600
+test_adcs.srcs += downlink.c $(SRC_ARCH)/uart_hw.c xbee.c
+
+test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c test_adcs.c
+# pprz_transport.c
+
+
+# a configuration program to access both uart through usb
+usb_tunnel_0.ARCHDIR = $(ARCHI)
+usb_tunnel_0.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART0 
-DUART0_BAUD=B115200
+usb_tunnel_0.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
+usb_tunnel_0.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c
+usb_tunnel_0.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c 
$(SRC_ARCH)/lpcusb/usbinit.c
+usb_tunnel_0.srcs += $(SRC_ARCH)/lpcusb/usbcontrol.c 
$(SRC_ARCH)/lpcusb/usbstdreq.c
+usb_tunnel_0.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
+
+usb_tunnel_1.ARCHDIR = $(ARCHI)
+usb_tunnel_1.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART1 
-DUART1_BAUD=B115200
+usb_tunnel_1.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
+usb_tunnel_1.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c
+usb_tunnel_1.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c 
$(SRC_ARCH)/lpcusb/usbinit.c
+usb_tunnel_1.srcs += $(SRC_ARCH)/lpcusb/usbcontrol.c 
$(SRC_ARCH)/lpcusb/usbstdreq.c
+usb_tunnel_1.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c

Copied: paparazzi3/trunk/conf/autopilot/obsolete/tiny_2_1_1_usb.h (from rev 
6316, paparazzi3/trunk/conf/autopilot/tiny_2_1_1_usb.h)
===================================================================
--- paparazzi3/trunk/conf/autopilot/obsolete/tiny_2_1_1_usb.h                   
        (rev 0)
+++ paparazzi3/trunk/conf/autopilot/obsolete/tiny_2_1_1_usb.h   2010-11-01 
11:35:31 UTC (rev 6317)
@@ -0,0 +1,6 @@
+#define USE_USB_HIGH_PCLK
+
+#include "tiny_2_1.h"
+
+#undef DefaultVoltageOfAdc
+#define DefaultVoltageOfAdc(adc) (0.0247311828*adc)

Deleted: paparazzi3/trunk/conf/autopilot/tiny.h
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny.h      2010-11-01 11:35:15 UTC (rev 
6316)
+++ paparazzi3/trunk/conf/autopilot/tiny.h      2010-11-01 11:35:31 UTC (rev 
6317)
@@ -1,127 +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) 
-
-#define LED_1_BANK 1
-#define LED_1_PIN 28
-
-#define LED_2_BANK 1
-#define LED_2_PIN 19
-
-/* p0.21 aka PWM5 */
-#define SERV0_CLOCK_PIN 21
-#define SERV0_CLOCK_PINSEL PINSEL1
-#define SERV0_CLOCK_PINSEL_VAL 0x01
-#define SERV0_CLOCK_PINSEL_BIT 10
-/* p1.20          */
-#define SERV0_DATA_PIN  20
-/* p1.21          */
-#define SERV0_RESET_PIN 21
-
-/* P0.7 aka PWM2  */
-#define SERV1_CLOCK_PIN  7
-#define SERV1_CLOCK_PINSEL PINSEL0
-#define SERV1_CLOCK_PINSEL_VAL 0x02
-#define SERV1_CLOCK_PINSEL_BIT 14
-/* p1.30          */
-#define SERV1_DATA_PIN  30
-/* p1.29          */
-#define SERV1_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) Used for VSUPPLY */
-
-#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(7)
-#ifndef USE_AD1
-#define USE_AD1
-#endif
-#define USE_AD1_7
-
-
-#define DefaultVoltageOfAdc(adc) (0.01787109375*adc)
-
-
-#endif /* CONFIG_TINY_H */

Deleted: paparazzi3/trunk/conf/autopilot/tiny.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny.makefile       2010-11-01 11:35:15 UTC 
(rev 6316)
+++ paparazzi3/trunk/conf/autopilot/tiny.makefile       2010-11-01 11:35:31 UTC 
(rev 6317)
@@ -1,72 +0,0 @@
-# Makefile for the Tiny board (1 arm7tdmi, 1 LEA-LA)
-
-#
-# can we remove this file?
-# the makefiles under conf/boards/ should be used now
-#
-
-ARCHI=lpc21
-ARCH=lpc21
-
-ap.ARCHDIR = $(ARCHI)
-
-fbw.ARCHDIR = $(ARCHI)
-
-LPC21ISP_BAUD = 38400
-LPC21ISP_XTAL = 12000
-
-
-### default settings for tiny_2 and twog
-GPS_UART_NR    = 0
-GPS_BAUD       = 38400
-MODEM_UART_NR = 1
-MODEM_BAUD = 57600
-
-ADC_IR1 = ADC_1
-ADC_IR2 = ADC_2
-ADC_IR_TOP = ADC_0
-ADC_IR_NB_SAMPLES = 16
-ADC_GYRO_ROLL = ADC_3
-ADC_GYRO_NB_SAMPLES = 16
-
-# a test program to setup actuators
-setup_actuators.ARCHDIR = $(ARCHI)
-
-setup_actuators.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny.h\" -DLED -DTIME_LED=1 
-DACTUATORS=\"servos_4015_hw.h\" -DSERVOS_4015 -DUSE_UART0 -DUART0_BAUD=B9600 
-DDATALINK=PPRZ -DPPRZ_UART=Uart0
-setup_actuators.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c pprz_transport.c setup_actuators.c $(SRC_ARCH)/uart_hw.c 
$(SRC_ARCH)/servos_4015_hw.c main.c
-
-
-# a test program to tunnel between both uart
-tunnel.ARCHDIR = $(ARCHI)
-
-tunnel.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DLED
-tunnel.srcs += $(SRC_ARCH)/uart_tunnel.c
-
-
-# A test program to monitor the ADC values
-test_adcs.ARCHDIR = $(ARCHI)
-
-test_adcs.CFLAGS += -DBOARD_CONFIG=$(CONFIG) -DLED -DTIME_LED=1 -DADC 
-DUSE_ADC_0 -DUSE_ADC_1 -DUSE_ADC_2 -DUSE_ADC_3 -DUSE_ADC_4 -DUSE_ADC_5 
-DUSE_ADC_6 -DUSE_ADC_7
-test_adcs.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport 
-DDOWNLINK_FBW_DEVICE=Uart0 -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 
-DDATALINK=XBEE -DUART0_BAUD=B9600
-test_adcs.srcs += downlink.c $(SRC_ARCH)/uart_hw.c xbee.c
-
-test_adcs.srcs += sys_time.c $(SRC_ARCH)/adc_hw.c $(SRC_ARCH)/sys_time_hw.c 
$(SRC_ARCH)/armVIC.c test_adcs.c
-# pprz_transport.c
-
-
-# a configuration program to access both uart through usb
-usb_tunnel_0.ARCHDIR = $(ARCHI)
-usb_tunnel_0.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART0 
-DUART0_BAUD=B115200
-usb_tunnel_0.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
-usb_tunnel_0.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c
-usb_tunnel_0.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c 
$(SRC_ARCH)/lpcusb/usbinit.c
-usb_tunnel_0.srcs += $(SRC_ARCH)/lpcusb/usbcontrol.c 
$(SRC_ARCH)/lpcusb/usbstdreq.c
-usb_tunnel_0.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c
-
-usb_tunnel_1.ARCHDIR = $(ARCHI)
-usb_tunnel_1.CFLAGS += -DFBW -DBOARD_CONFIG=\"tiny_2_1_1_usb.h\" -DUSE_UART1 
-DUART1_BAUD=B115200
-usb_tunnel_1.CFLAGS += -DUSE_USB_LINE_CODING -DUSE_USB_SERIAL -DLED
-usb_tunnel_1.srcs += $(SRC_ARCH)/usb_tunnel.c $(SRC_ARCH)/usb_ser_hw.c 
$(SRC_ARCH)/uart_hw.c
-usb_tunnel_1.srcs += $(SRC_ARCH)/lpcusb/usbhw_lpc.c 
$(SRC_ARCH)/lpcusb/usbinit.c
-usb_tunnel_1.srcs += $(SRC_ARCH)/lpcusb/usbcontrol.c 
$(SRC_ARCH)/lpcusb/usbstdreq.c
-usb_tunnel_1.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c

Deleted: paparazzi3/trunk/conf/autopilot/tiny_2_1_1_usb.h
===================================================================
--- paparazzi3/trunk/conf/autopilot/tiny_2_1_1_usb.h    2010-11-01 11:35:15 UTC 
(rev 6316)
+++ paparazzi3/trunk/conf/autopilot/tiny_2_1_1_usb.h    2010-11-01 11:35:31 UTC 
(rev 6317)
@@ -1,6 +0,0 @@
-#define USE_USB_HIGH_PCLK
-
-#include "tiny_2_1.h"
-
-#undef DefaultVoltageOfAdc
-#define DefaultVoltageOfAdc(adc) (0.0247311828*adc)
[Prev in Thread]
Current Thread
[Next in Thread]
[paparazzi-commits] [6317] moved some old tiny makefiles and headers to obsolete dir, Felix Ruess <=
Prev by Date: [paparazzi-commits] [6316] moved beth and olimex board headers to sw/airborne/boards
Next by Date: [paparazzi-commits] [6319] fix sim for now, board header for sim still needs to be updated
Previous by thread: [paparazzi-commits] [6316] moved beth and olimex board headers to sw/airborne/boards
Next by thread: [paparazzi-commits] [6319] fix sim for now, board header for sim still needs to be updated
Index(es):
- Date
- Thread