Skip to content
This repository has been archived by the owner on Apr 13, 2021. It is now read-only.

Commit

Permalink
Remove libopencm3 dependency. Use ChibiOS/HAL.
Browse files Browse the repository at this point in the history
  • Loading branch information
gsmcmullin authored and jacobmcnamee committed Mar 29, 2016
1 parent 25761a9 commit e6c2add
Show file tree
Hide file tree
Showing 41 changed files with 2,365 additions and 1,423 deletions.
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
[submodule "libopencm3"]
path = libopencm3
url = https://github.com/libopencm3/libopencm3.git
[submodule "libswiftnav"]
path = libswiftnav
url = https://github.com/swift-nav/libswiftnav.git
Expand Down
8 changes: 1 addition & 7 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ endif

all: firmware # tests

firmware: libopencm3/lib/libopencm3_stm32f4.a libsbp/c/build/src/libsbp-static.a libswiftnav/build/src/libswiftnav-static.a
firmware: libsbp/c/build/src/libsbp-static.a libswiftnav/build/src/libswiftnav-static.a
@printf "BUILD src\n"; \
$(MAKE) -r -C src $(MAKEFLAGS)

Expand All @@ -34,10 +34,6 @@ tests:
fi; \
done

libopencm3/lib/libopencm3_stm32f4.a:
@printf "BUILD libopencm3\n"; \
$(MAKE) -C libopencm3 $(MAKEFLAGS) lib/stm32/f4

libsbp/c/build/src/libsbp-static.a:
@printf "BUILD libsbp\n"; \
mkdir -p libsbp/c/build; cd libsbp/c/build; \
Expand All @@ -53,8 +49,6 @@ libswiftnav/build/src/libswiftnav-static.a: .FORCE
clean:
@printf "CLEAN src\n"; \
$(MAKE) -C src $(MAKEFLAGS) clean
@printf "CLEAN libopencm3\n"; \
$(MAKE) -C libopencm3 $(MAKEFLAGS) clean
@printf "CLEAN libsbp\n"; \
$(RM) -rf libsbp/c/build
@printf "CLEAN libswiftnav\n"; \
Expand Down
6 changes: 3 additions & 3 deletions ext/Makefile.include
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
-include $(SWIFTNAV_ROOT)/ext/*/Makefile.include

CSRC += $(SWIFTNAV_ROOT)/ext/ext.c
CSRC += $(SWIFTNAV_ROOT)/ext/external.c

$(SWIFTNAV_ROOT)/ext/ext.c: FORCE
@echo "Generating ext.c"
$(SWIFTNAV_ROOT)/ext/external.c: FORCE
@echo "Generating external.c"
-@rm $@
@for f in $(EXT_SETUP); do \
echo "extern void $$f(void);" >> $@; \
Expand Down
2 changes: 2 additions & 0 deletions ext/external.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
void ext_setup(void) {
}
1 change: 0 additions & 1 deletion libopencm3
Submodule libopencm3 deleted from 5830a1
20 changes: 12 additions & 8 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ PROJECT = piksi_firmware

# Imported source files and paths
CHIBIOS = ../ChibiOS-RT
include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk
include $(CHIBIOS)/os/hal/hal.mk
include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F4xx/port.mk
include $(CHIBIOS)/os/kernel/kernel.mk

Expand All @@ -87,6 +89,9 @@ LDSCRIPT= STM32F405xG.ld
# setting.
CSRC := $(PORTSRC) \
$(KERNSRC) \
$(HALSRC) \
$(PLATFORMSRC) \
$(SWIFTNAV_ROOT)/src/board/board.o \
$(SWIFTNAV_ROOT)/src/board/nap/nap_common.o \
$(SWIFTNAV_ROOT)/src/board/nap/nap_exti.o \
$(SWIFTNAV_ROOT)/src/board/nap/nap_conf.o \
Expand All @@ -97,10 +102,8 @@ CSRC := $(PORTSRC) \
$(SWIFTNAV_ROOT)/src/board/leds.o \
$(SWIFTNAV_ROOT)/src/peripherals/3drradio.o \
$(SWIFTNAV_ROOT)/src/peripherals/stm_flash.o \
$(SWIFTNAV_ROOT)/src/peripherals/spi.o \
$(SWIFTNAV_ROOT)/src/peripherals/spi_wrapper.o \
$(SWIFTNAV_ROOT)/src/peripherals/usart.o \
$(SWIFTNAV_ROOT)/src/peripherals/usart_tx.o \
$(SWIFTNAV_ROOT)/src/peripherals/usart_rx.o \
$(SWIFTNAV_ROOT)/src/peripherals/usart_chat.o \
$(SWIFTNAV_ROOT)/src/peripherals/random.o \
$(SWIFTNAV_ROOT)/src/peripherals/watchdog.o \
Expand Down Expand Up @@ -163,11 +166,13 @@ TCPPSRC =
# List ASM source files here
ASMSRC = $(PORTASM)

INCDIR = $(PORTINC) $(KERNINC) $(CHIBIOS)/os/various \
INCDIR = $(PORTINC) $(KERNINC) \
$(HALINC) $(PLATFORMINC) \
$(CHIBIOS)/os/various \
$(SWIFTNAV_ROOT)/libsbp/c/include \
$(SWIFTNAV_ROOT)/libswiftnav/include \
$(SWIFTNAV_ROOT)/src \
$(SWIFTNAV_ROOT)/libopencm3/include
$(SWIFTNAV_ROOT)/src/board \

#
# Project, sources and paths
Expand Down Expand Up @@ -224,8 +229,7 @@ DADEFS =
DINCDIR =

# List the default directory to look for the libraries here
DLIBDIR = $(SWIFTNAV_ROOT)/libopencm3/lib \
$(SWIFTNAV_ROOT)/libsbp/c/build/src \
DLIBDIR = $(SWIFTNAV_ROOT)/libsbp/c/build/src \
$(SWIFTNAV_ROOT)/libswiftnav/build/src \
$(SWIFTNAV_ROOT)/libswiftnav/build/CBLAS/src \
$(SWIFTNAV_ROOT)/libswiftnav/build/clapack-3.2.1-CMAKE/BLAS/SRC \
Expand All @@ -234,7 +238,7 @@ DLIBDIR = $(SWIFTNAV_ROOT)/libopencm3/lib \
$(SWIFTNAV_ROOT)/libswiftnav/build/src

# List all default libraries here
DLIBS = -lopencm3_stm32f4 -lsbp-static -lswiftnav-static \
DLIBS = -lsbp-static -lswiftnav-static \
-llapack -lcblas -lblas \
-lf2c -lm -lc -lnosys

Expand Down
66 changes: 66 additions & 0 deletions src/board/board.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*
ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

#include "ch.h"
#include "hal.h"

#if HAL_USE_PAL || defined(__DOXYGEN__)
/**
* @brief PAL setup.
* @details Digital I/O ports static configuration as defined in @p board.h.
* This variable is used by the HAL when initializing the PAL driver.
*/
const PALConfig pal_default_config =
{
{VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR,
VAL_GPIOA_ODR, VAL_GPIOA_AFRL, VAL_GPIOA_AFRH},
{VAL_GPIOB_MODER, VAL_GPIOB_OTYPER, VAL_GPIOB_OSPEEDR, VAL_GPIOB_PUPDR,
VAL_GPIOB_ODR, VAL_GPIOB_AFRL, VAL_GPIOB_AFRH},
{VAL_GPIOC_MODER, VAL_GPIOC_OTYPER, VAL_GPIOC_OSPEEDR, VAL_GPIOC_PUPDR,
VAL_GPIOC_ODR, VAL_GPIOC_AFRL, VAL_GPIOC_AFRH},
{VAL_GPIOD_MODER, VAL_GPIOD_OTYPER, VAL_GPIOD_OSPEEDR, VAL_GPIOD_PUPDR,
VAL_GPIOD_ODR, VAL_GPIOD_AFRL, VAL_GPIOD_AFRH},
{VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR,
VAL_GPIOE_ODR, VAL_GPIOE_AFRL, VAL_GPIOE_AFRH},
{VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR,
VAL_GPIOF_ODR, VAL_GPIOF_AFRL, VAL_GPIOF_AFRH},
{VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR,
VAL_GPIOG_ODR, VAL_GPIOG_AFRL, VAL_GPIOG_AFRH},
{VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR,
VAL_GPIOH_ODR, VAL_GPIOH_AFRL, VAL_GPIOH_AFRH},
{VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR,
VAL_GPIOI_ODR, VAL_GPIOI_AFRL, VAL_GPIOI_AFRH}
};
#endif

/**
* @brief Early initialization code.
* @details This initialization must be performed just after stack setup
* and before any other initialization.
*/
void __early_init(void)
{

}

/**
* @brief Board-specific initialization code.
* @todo Add your board-specific code, if any.
*/
void boardInit(void)
{

}
Loading

0 comments on commit e6c2add

Please sign in to comment.