[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paparazzi-commits] [5317] removed obsolete test program
|
From: |
antoine drouin |
|
Subject: |
[paparazzi-commits] [5317] removed obsolete test program |
|
Date: |
Wed, 11 Aug 2010 19:10:58 +0000 |
Revision: 5317
http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5317
Author: poine
Date: 2010-08-11 19:10:58 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
removed obsolete test program
Modified Paths:
--------------
paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile
Removed Paths:
-------------
paparazzi3/trunk/sw/airborne/fms/overo_test_spi.c
Modified: paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile
===================================================================
--- paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile 2010-08-11
19:07:26 UTC (rev 5316)
+++ paparazzi3/trunk/conf/autopilot/lisa_test_progs.makefile 2010-08-11
19:10:58 UTC (rev 5317)
@@ -33,9 +33,6 @@
SRC_CSC=csc
-overo_test_spi.ARCHDIR = omap
-overo_test_spi.srcs=$(SRC_FMS)/overo_test_spi.c
-
# test spi link between overo and stm32
overo_test_spi_link.ARCHDIR = omap
overo_test_spi_link.CFLAGS += -I$(ACINCLUDE) -I.
-I$(PAPARAZZI_HOME)/var/include
@@ -43,13 +40,6 @@
overo_test_spi_link.srcs = $(SRC_FMS)/overo_test_spi_link.c
overo_test_spi_link.srcs += $(SRC_FMS)/fms_spi_link.c
-# same with crc enabled
-overo_test_spi_link_crc.ARCHDIR = omap
-overo_test_spi_link_crc.CFLAGS += -I$(ACINCLUDE) -I.
-I$(PAPARAZZI_HOME)/var/include
-overo_test_spi_link_crc.CFLAGS += -DOVERO_LINK_MSG_UP=AutopilotMessageFoo
-DOVERO_LINK_MSG_DOWN=AutopilotMessageFoo
-overo_test_spi_link_crc.srcs = $(SRC_FMS)/overo_test_spi_link_crc.c
-overo_test_spi_link_crc.srcs += $(SRC_FMS)/fms_spi_link_crc.c
-overo_test_spi_link_crc.srcs += $(SRC_FMS)/fms_crc.c
# test passthrough spi link between overo and stm32
@@ -114,8 +104,11 @@
################################################################################
ARCHI=stm32
-SRC_LISA=lisa
SRC_ARCH=$(ARCHI)
+SRC_LISA=lisa
+SRC_LISA_ARCH=$(SRC_LISA)/arch/$(ARCHI)
+SRC_BOOZ=booz
+SRC_BOOZ_ARCH=$(SRC_BOOZ)/arch/$(ARCHI)
#BOARD_CFG=\"boards/olimex_stm32-h103.h\"
BOARD_CFG=\"boards/lisa_0.99.h\"
@@ -837,7 +830,7 @@
stm_test_spi_link.ARCHDIR = $(ARCHI)
stm_test_spi_link.TARGET = stm_test_spi_link
stm_test_spi_link.TARGETDIR = stm_test_spi_link
-stm_test_spi_link.CFLAGS += -Ilisa -I$(ARCHI) -DPERIPHERALS_AUTO_INIT
+stm_test_spi_link.CFLAGS += -Ilisa -Ilisa/arch/$(ARCHI) -I$(ARCHI)
-DPERIPHERALS_AUTO_INIT
stm_test_spi_link.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
stm_test_spi_link.srcs += lisa/stm_test_spi_link.c \
$(SRC_ARCH)/stm32_exceptions.c \
@@ -854,38 +847,13 @@
stm_test_spi_link.srcs += $(SRC_ARCH)/uart_hw.c
stm_test_spi_link.CFLAGS += -DUSE_OVERO_LINK
-DOVERO_LINK_MSG_UP=AutopilotMessageFoo
-DOVERO_LINK_MSG_DOWN=AutopilotMessageFoo
-stm_test_spi_link.CFLAGS += -DOVERO_LINK_LED_OK=3 -DOVERO_LINK_LED_KO=4
-DUSE_DMA1_C2_IRQ
+stm_test_spi_link.CFLAGS += -DOVERO_LINK_LED_OK=3 -DOVERO_LINK_LED_KO=2
-DUSE_DMA1_C2_IRQ
stm_test_spi_link.srcs += lisa/lisa_overo_link.c
lisa/arch/stm32/lisa_overo_link_arch.c
-#
-# test spi link between overo and stm32 with crc enabled
-#
-stm_test_spi_link_crc.ARCHDIR = $(ARCHI)
-stm_test_spi_link_crc.TARGET = stm_test_spi_link_crc
-stm_test_spi_link_crc.TARGETDIR = stm_test_spi_link_crc
-stm_test_spi_link_crc.CFLAGS += -Ilisa -I$(ARCHI) -Ilisa/arch/$(ARCHI)
-DPERIPHERALS_AUTO_INIT
-stm_test_spi_link_crc.CFLAGS += -DBOARD_CONFIG=$(BOARD_CFG)
-stm_test_spi_link_crc.srcs += lisa/stm_test_spi_link_crc.c \
- $(SRC_ARCH)/stm32_exceptions.c \
- $(SRC_ARCH)/stm32_vector_table.c
-stm_test_spi_link_crc.CFLAGS += -DUSE_LED
-stm_test_spi_link_crc.srcs += $(SRC_ARCH)/led_hw.c
-stm_test_spi_link_crc.CFLAGS += -DUSE_SYS_TIME -DSYS_TIME_LED=1
-stm_test_spi_link_crc.CFLAGS +=
-DPERIODIC_TASK_PERIOD='SYS_TICS_OF_SEC(1./512.)'
-stm_test_spi_link_crc.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c
-stm_test_spi_link_crc.CFLAGS += -DUSE_UART2 -DUART2_BAUD=B57600
-stm_test_spi_link_crc.srcs += $(SRC_ARCH)/uart_hw.c
-stm_test_spi_link_crc.CFLAGS += -DUSE_OVERO_LINK
-DOVERO_LINK_MSG_UP=AutopilotMessageFoo
-DOVERO_LINK_MSG_DOWN=AutopilotMessageFoo
-stm_test_spi_link_crc.CFLAGS += -DOVERO_LINK_LED_OK=3 -DOVERO_LINK_LED_KO=4
-DUSE_DMA1_C2_IRQ
-stm_test_spi_link_crc.srcs += lisa/lisa_overo_link_crc.c
lisa/arch/stm32/lisa_overo_link_crc_arch.c
-
-
-
-
#
# test static
#
Deleted: paparazzi3/trunk/sw/airborne/fms/overo_test_spi.c
===================================================================
--- paparazzi3/trunk/sw/airborne/fms/overo_test_spi.c 2010-08-11 19:07:26 UTC
(rev 5316)
+++ paparazzi3/trunk/sw/airborne/fms/overo_test_spi.c 2010-08-11 19:10:58 UTC
(rev 5317)
@@ -1,206 +0,0 @@
-/*
- * SPI testing utility (using spidev driver)
- *
- * Copyright (c) 2007 MontaVista Software, Inc.
- * Copyright (c) 2007 Anton Vorontsov <address@hidden>
- *
- * 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; either version 2 of the License.
- *
- * Cross-compile with cross-gcc -I/path/to/cross-kernel/include
- */
-
-#include <stdint.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <fcntl.h>
-#include <sys/ioctl.h>
-#include <linux/types.h>
-#include <linux/spi/spidev.h>
-
-#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
-
-static void pabort(const char *s)
-{
- perror(s);
- abort();
-}
-
-static const char *device = "/dev/spidev1.1";
-static uint8_t mode;
-static uint8_t bits = 8;
-static uint32_t speed = 500000;
-static uint16_t delay;
-
-static void transfer(int fd)
-{
- int ret;
- uint8_t tx[] = {
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0x40, 0x00, 0x00, 0x00, 0x00, 0x95,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
- 0xDE, 0xAD, 0xBE, 0xEF, 0xBA, 0xAD,
- 0xF0, 0x0D,
- };
- uint8_t rx[ARRAY_SIZE(tx)] = {0, };
- struct spi_ioc_transfer tr = {
- .tx_buf = (unsigned long)tx,
- .rx_buf = (unsigned long)rx,
- .len = ARRAY_SIZE(tx),
- .delay_usecs = delay,
- .speed_hz = speed,
- .bits_per_word = bits,
- };
-
- ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr);
- if (ret == 1)
- pabort("can't send spi message");
-
- for (ret = 0; ret < ARRAY_SIZE(tx); ret++) {
- if (!(ret % 6))
- puts("");
- printf("%.2X ", rx[ret]);
- }
- puts("");
-}
-
-void print_usage(const char *prog)
-{
- printf("Usage: %s [-DsbdlHOLC3]\n", prog);
- puts(" -D --device device to use (default /dev/spidev1.1)\n"
- " -s --speed max speed (Hz)\n"
- " -d --delay delay (usec)\n"
- " -b --bpw bits per word \n"
- " -l --loop loopback\n"
- " -H --cpha clock phase\n"
- " -O --cpol clock polarity\n"
- " -L --lsb least significant bit first\n"
- " -C --cs-high chip select active high\n"
- " -3 --3wire SI/SO signals shared\n");
- exit(1);
-}
-
-void parse_opts(int argc, char *argv[])
-{
- while (1) {
- static const struct option lopts[] = {
- { "device", 1, 0, 'D' },
- { "speed", 1, 0, 's' },
- { "delay", 1, 0, 'd' },
- { "bpw", 1, 0, 'b' },
- { "loop", 0, 0, 'l' },
- { "cpha", 0, 0, 'H' },
- { "cpol", 0, 0, 'O' },
- { "lsb", 0, 0, 'L' },
- { "cs-high", 0, 0, 'C' },
- { "3wire", 0, 0, '3' },
- { NULL, 0, 0, 0 },
- };
- int c;
-
- c = getopt_long(argc, argv, "D:s:d:b:lHOLC3", lopts, NULL);
-
- if (c == -1)
- break;
-
- switch (c) {
- case 'D':
- device = optarg;
- break;
- case 's':
- speed = atoi(optarg);
- break;
- case 'd':
- delay = atoi(optarg);
- break;
- case 'b':
- bits = atoi(optarg);
- break;
- case 'l':
- mode |= SPI_LOOP;
- break;
- case 'H':
- mode |= SPI_CPHA;
- break;
- case 'O':
- mode |= SPI_CPOL;
- break;
- case 'L':
- mode |= SPI_LSB_FIRST;
- break;
- case 'C':
- mode |= SPI_CS_HIGH;
- break;
- case '3':
- mode |= SPI_3WIRE;
- break;
- default:
- print_usage(argv[0]);
- break;
- }
- }
-}
-
-int main(int argc, char *argv[])
-{
- int ret = 0;
- int fd;
-
- parse_opts(argc, argv);
-
- fd = open(device, O_RDWR);
- if (fd < 0)
- pabort("can't open device");
-
- /*
- * spi mode
- */
- ret = ioctl(fd, SPI_IOC_WR_MODE, &mode);
- if (ret == -1)
- pabort("can't set spi mode");
-
- ret = ioctl(fd, SPI_IOC_RD_MODE, &mode);
- if (ret == -1)
- pabort("can't get spi mode");
-
- /*
- * bits per word
- */
- ret = ioctl(fd, SPI_IOC_WR_BITS_PER_WORD, &bits);
- if (ret == -1)
- pabort("can't set bits per word");
-
- ret = ioctl(fd, SPI_IOC_RD_BITS_PER_WORD, &bits);
- if (ret == -1)
- pabort("can't get bits per word");
-
- /*
- * max speed hz
- */
- ret = ioctl(fd, SPI_IOC_WR_MAX_SPEED_HZ, &speed);
- if (ret == -1)
- pabort("can't set max speed hz");
-
- ret = ioctl(fd, SPI_IOC_RD_MAX_SPEED_HZ, &speed);
- if (ret == -1)
- pabort("can't get max speed hz");
-
- printf("spi mode: %d\n", mode);
- printf("bits per word: %d\n", bits);
- printf("max speed: %d Hz (%d KHz)\n", speed, speed/1000);
-
- int i;
- for (i=0; i<10; i++) {
- transfer(fd);
- usleep(1953);
- }
-
- close(fd);
-
- return ret;
-}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paparazzi-commits] [5317] removed obsolete test program,
antoine drouin <=