소스 검색

Pruned obsolete files.

Michael Hope 4 년 전
부모
커밋
058e29080c
7개의 변경된 파일1개의 추가작업 그리고 236개의 파일을 삭제
  1. 1 0
      .gitignore
  2. 0 130
      Makefile.am
  3. 0 12
      configure.ac
  4. 0 3
      etc/openocd-stm32-signalyzer-lite.cfg
  5. 0 40
      opuploadtool.mk
  6. 0 40
      tools/opuploadtool.mk
  7. 0 11
      tools/reboot.py

+ 1 - 0
.gitignore 파일 보기

@@ -1,6 +1,7 @@
1 1
 *.o
2 2
 *.ii
3 3
 *.a
4
+*.hex
4 5
 \#*
5 6
 .#*
6 7
 *.bin

+ 0 - 130
Makefile.am 파일 보기

@@ -1,130 +0,0 @@
1
-bin_PROGRAMS = roverif.elf
2
-
3
-blink_elf_SOURCES = \
4
-	experiments/blink.c
5
-
6
-roverif_elf_SOURCES = \
7
-	roverif/main.cc \
8
-	roverif/pwmin.cc \
9
-	roverif/supervisor.cc \
10
-	roverif/hal-posix.cc
11
-
12
-#roverif_elf_LDADD = libnppilot.a libmaple.a libmaple-usb.a
13
-roverif_elf_LDADD = libnppilot.a
14
-
15
-check_PROGRAMS = \
16
-	tests/runner
17
-
18
-tests_runner_LDADD = libnppilot.a -lstdc++
19
-
20
-lib_LIBRARIES = \
21
-	libnppilot.a \
22
-	libplatform-posix.a
23
-
24
-#	libmaple.a \
25
-#	libmaple-usb.a \
26
-#
27
-
28
-libnppilot_a_SOURCES = \
29
-	lib/cobs.cc \
30
-	lib/switcher.cc \
31
-	lib/timer.cc \
32
-	lib/blinker.cc \
33
-	lib/switch.cc \
34
-	lib/debug.cc \
35
-	platform/posix/bitarray.cc \
36
-	platform/posix/timer.cc \
37
-	platform/posix/usblink.cc
38
-
39
-libplatform_posix_a_SOURCES = \
40
-	platform/posix/bitarray.cc \
41
-	platform/posix/timer.cc \
42
-	platform/posix/usblink.cc
43
-
44
-libplatform_stm32_a_SOURCES = \
45
-	platform/stm32/bitarray.cc \
46
-	platform/stm32/timer.cc \
47
-	platform/stm32/usblink.cc
48
-
49
-#	platform/posix/bitarray.cc
50
-
51
-
52
-libmaple_a_SOURCES = \
53
-	external/libmaple/libmaple/adc.c \
54
-	external/libmaple/libmaple/dac.c \
55
-	external/libmaple/libmaple/dma.c \
56
-	external/libmaple/libmaple/exti.c \
57
-	external/libmaple/libmaple/flash.c \
58
-	external/libmaple/libmaple/gpio.c \
59
-	external/libmaple/libmaple/i2c.c \
60
-	external/libmaple/libmaple/iwdg.c \
61
-	external/libmaple/libmaple/nvic.c \
62
-	external/libmaple/libmaple/pwr.c \
63
-	external/libmaple/libmaple/rcc.c \
64
-	external/libmaple/libmaple/spi.c \
65
-	external/libmaple/libmaple/systick.c \
66
-	external/libmaple/libmaple/timer.c \
67
-	external/libmaple/libmaple/usart.c \
68
-	external/libmaple/libmaple/usart_private.c \
69
-	external/libmaple/libmaple/util.c \
70
-	external/libmaple/libmaple/stm32f1/adc.c \
71
-	external/libmaple/libmaple/stm32f1/bkp.c \
72
-	external/libmaple/libmaple/stm32f1/dma.c \
73
-	external/libmaple/libmaple/stm32f1/exti.c \
74
-	external/libmaple/libmaple/stm32f1/fsmc.c \
75
-	external/libmaple/libmaple/stm32f1/gpio.c \
76
-	external/libmaple/libmaple/stm32f1/i2c.c \
77
-	external/libmaple/libmaple/stm32f1/rcc.c \
78
-	external/libmaple/libmaple/stm32f1/spi.c \
79
-	external/libmaple/libmaple/stm32f1/timer.c \
80
-	external/libmaple/libmaple/stm32f1/usart.c
81
-
82
-libmaple_usb_a_SOURCES = \
83
-	external/libmaple/libmaple/usb/stm32f1/usb.c \
84
-	external/libmaple/libmaple/usb/stm32f1/usb_cdcacm.c \
85
-	external/libmaple/libmaple/usb/stm32f1/usb_reg_map.c \
86
-	external/libmaple/libmaple/usb/usb_lib/usb_core.c \
87
-	external/libmaple/libmaple/usb/usb_lib/usb_init.c \
88
-	external/libmaple/libmaple/usb/usb_lib/usb_mem.c \
89
-	external/libmaple/libmaple/usb/usb_lib/usb_regs.c
90
-
91
-LIBMAPLE = $(srcdir)/external/libmaple
92
-
93
-tests/runner.cc: $(wildcard $(srcdir)/tests/*.h)
94
-	$(srcdir)/external/cxxtest/bin/cxxtestgen --error-printer -o $@ $^
95
-
96
-#CROSS_COMPILE = arm-none-eabi-
97
-CC = $(CROSS_COMPILE)gcc
98
-CXX = $(CROSS_COMPILE)g++
99
-OBJCOPY = $(CROSS_COMPILE)objcopy
100
-
101
-FLAGS =
102
-FLAGS += -O1 -g -Wall -fno-common -fno-section-anchors -fno-exceptions
103
-#FLAGS += -ffunction-sections -fdata-sections -Wl,--gc-sections
104
-FLAGS += -I$(srcdir)/lib -I$(srcdir) -I$(srcdir)/external/cxxtest
105
-FLAGS += -save-temps=obj
106
-
107
-#FLAGS += -I$(LIBMAPLE)/libmaple/include -I$(LIBMAPLE)/libmaple -I$(LIBMAPLE)/libmaple/usb/usb_lib -I$(LIBMAPLE)/libmaple/stm32f1/include -I$(LIBMAPLE)  -I$(srcdir)/platform/stm32
108
-#FLAGS += -mcpu=cortex-m3 -mthumb
109
-#FLAGS += -DMCU_STM32F103CB
110
-#FLAGS += -nostartfiles -T$(srcdir)/platform/coptercontrol/flash.ld
111
-
112
-AM_CFLAGS = $(FLAGS) -std=gnu99
113
-AM_CXXFLAGS = $(FLAGS) -std=gnu++0x -fno-rtti
114
-
115
-%.bin: %.elf
116
-	$(OBJCOPY) -Obinary $< $@
117
-
118
-OPENOCD_CMD = nc -q 1 localhost 4444
119
-
120
-run-openocd: blink.bin
121
-	echo reset halt | $(OPENOCD_CMD)
122
-	echo flash probe 0 | $(OPENOCD_CMD)
123
-	echo stm32f1x mass_erase 0 | $(OPENOCD_CMD)
124
-	echo flash write_bank 0 $(PWD)/$< 0 | $(OPENOCD_CMD)
125
-	echo reset run | $(OPENOCD_CMD)
126
-
127
-run-cc: roverif.bin
128
-	-[ ! -e /dev/ttyACM0 ] || python $(srcdir)/tools/reboot.py /dev/ttyACM0
129
-	$(srcdir)/tools/opuploadtool -p $< -d 0
130
-	$(srcdir)/tools/opuploadtool -j

+ 0 - 12
configure.ac 파일 보기

@@ -1,12 +0,0 @@
1
-AC_PREREQ(2.59)
2
-AC_INIT(nppilot, 0.1, michaelh@juju.net.nz)
3
-AM_INIT_AUTOMAKE(foreign subdir-objects color-tests dist-bzip2)
4
-
5
-CFLAGS="-g -Os"
6
-AC_PROG_CC
7
-CXXFLAGS="-g -Os"
8
-AC_PROG_CXX
9
-AC_PROG_RANLIB
10
-AC_CONFIG_FILES([Makefile])
11
-AC_OUTPUT
12
-

+ 0 - 3
etc/openocd-stm32-signalyzer-lite.cfg 파일 보기

@@ -1,3 +0,0 @@
1
-# Olimex STM32-H103
2
-source [find interface/signalyzer-lite.cfg]
3
-source [find target/stm32f1x.cfg]

+ 0 - 40
opuploadtool.mk 파일 보기

@@ -1,40 +0,0 @@
1
-#
2
-# Builds the command line OpenPilot programmer
3
-#
4
-# A hack.  Copy to ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL
5
-# and run with `make -f opuploadtool.mk`
6
-#
7
-# Michael Hope <michaelh@juju.net.nz>
8
-#
9
-
10
-SSP_DIR = SSP
11
-SSP_SRC = port.cpp qssp.cpp qsspt.cpp
12
-
13
-RAWHID_DIR = ../../plugins/rawhid
14
-RAWHID_SRC = pjrc_rawhid_unix.cpp usbmonitor_linux.cpp musbmonitor.cpp mpjrc_rawhid.cpp
15
-
16
-QEXTSERIALPORT_DIR = ../../libs/qextserialport/src
17
-QEXTSERIALPORT_SRC = qextserialport.cpp qextserialenumerator_unix.cpp posix_qextserialport.cpp mqextserialport.cpp mqextserialenumerator.cpp
18
-
19
-SRC = main.cpp op_dfu.cpp
20
-
21
-CXXFLAGS = $(shell pkg-config --libs --cflags QtCore) -I.
22
-CXXFLAGS += -DQ_OS_UNIX -DRAWHID_LIBRARY
23
-CXXFLAGS += -O2
24
-
25
-ALL_SRC = \
26
-	$(SSP_SRC:%=$(SSP_DIR)/%) \
27
-	$(RAWHID_SRC:%=$(RAWHID_DIR)/%) \
28
-	$(QEXTSERIALPORT_SRC:%=$(QEXTSERIALPORT_DIR)/%) \
29
-	$(SRC:%=./%)
30
-
31
-ALL_OBJ = $(ALL_SRC:cpp=o)
32
-
33
-opuploadtool: $(ALL_OBJ)
34
-	$(CXX) $(CXXFLAGS) -o $@ $^ $(shell pkg-config --libs QtCore) -lusb -ludev
35
-
36
-m%.cpp: %.h
37
-	moc -o $@ $<
38
-
39
-clean:
40
-	rm -f $(ALL_OBJ)

+ 0 - 40
tools/opuploadtool.mk 파일 보기

@@ -1,40 +0,0 @@
1
-#
2
-# Builds the command line OpenPilot programmer
3
-#
4
-# A hack.  Copy to ground/openpilotgcs/src/experimental/USB_UPLOAD_TOOL
5
-# and run with `make -f opuploadtool.mk`
6
-#
7
-# Michael Hope <michaelh@juju.net.nz>
8
-#
9
-
10
-SSP_DIR = SSP
11
-SSP_SRC = port.cpp qssp.cpp qsspt.cpp
12
-
13
-RAWHID_DIR = ../../plugins/rawhid
14
-RAWHID_SRC = pjrc_rawhid_unix.cpp usbmonitor_linux.cpp musbmonitor.cpp mpjrc_rawhid.cpp
15
-
16
-QEXTSERIALPORT_DIR = ../../libs/qextserialport/src
17
-QEXTSERIALPORT_SRC = qextserialport.cpp qextserialenumerator_unix.cpp posix_qextserialport.cpp mqextserialport.cpp mqextserialenumerator.cpp
18
-
19
-SRC = main.cpp op_dfu.cpp
20
-
21
-CXXFLAGS = $(shell pkg-config --libs --cflags QtCore) -I.
22
-CXXFLAGS += -DQ_OS_UNIX -DRAWHID_LIBRARY
23
-CXXFLAGS += -O2
24
-
25
-ALL_SRC = \
26
-	$(SSP_SRC:%=$(SSP_DIR)/%) \
27
-	$(RAWHID_SRC:%=$(RAWHID_DIR)/%) \
28
-	$(QEXTSERIALPORT_SRC:%=$(QEXTSERIALPORT_DIR)/%) \
29
-	$(SRC:%=./%)
30
-
31
-ALL_OBJ = $(ALL_SRC:cpp=o)
32
-
33
-opuploadtool: $(ALL_OBJ)
34
-	$(CXX) $(CXXFLAGS) -o $@ $^ $(shell pkg-config --libs QtCore) -lusb -ludev
35
-
36
-m%.cpp: %.h
37
-	moc -o $@ $<
38
-
39
-clean:
40
-	rm -f $(ALL_OBJ)

+ 0 - 11
tools/reboot.py 파일 보기

@@ -1,11 +0,0 @@
1
-import serial
2
-import sys
3
-
4
-port = sys.argv[1]
5
-
6
-serial = serial.Serial(port, 115200)
7
-
8
-serial.setDTR(1)
9
-serial.setDTR(0)
10
-serial.write('1EAF')
11
-