Skip to content

Commit

Permalink
Merge pull request #61 from ps2/dev
Browse files Browse the repository at this point in the history
v2.2
  • Loading branch information
ps2 authored Jul 3, 2018
2 parents df23010 + de25f35 commit 5d1d7fb
Show file tree
Hide file tree
Showing 66 changed files with 2,830 additions and 3,458 deletions.
10 changes: 10 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
sudo: required
services:
- docker

before_install:
- docker pull ps2docker/sdcc_docker

script:
- docker run -v `pwd`:/subg_rfspy ps2docker/sdcc_docker /bin/sh -c "cd /subg_rfspy; make -f Makefile.test test"
- docker run -v `pwd`:/subg_rfspy ps2docker/sdcc_docker /bin/sh -c "cd /subg_rfspy; make -f Makefile.spi1_alt2"
4 changes: 4 additions & 0 deletions Makefile.spi1_alt2
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,8 @@ SERIAL_PARAMS := -DUSES_USART1_TX_ISR -DUSES_USART1_RX_ISR
BOARD_TYPE := RILEYLINK
BOARD_PARAMS :=

CC := sdcc

main_module = main.rel

include common.mk
36 changes: 0 additions & 36 deletions Makefile.srfstick

This file was deleted.

26 changes: 26 additions & 0 deletions Makefile.test
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
SERIAL_TYPE := spi1_alt2
SERIAL_PARAMS := -DUSES_USART1_TX_ISR -DUSES_USART1_RX_ISR

BOARD_TYPE := MOCK_HARDWARE
BOARD_PARAMS :=

CC := gcc

CFLAGS+=-DRUN_TESTS -g -pthread

LDFLAGS+=-g -pthread

main_module = tests.rel

extra_modules = mock_hardware.rel

include common.mk

output/${TARGET_BUILD}:
mkdir -p output/${TARGET_BUILD}

output/${TARGET_BUILD}/check_subg_rfspy: $(common_modules) $(extra_modules) $(REL) serial.rel
cd output/${TARGET_BUILD} && $(CC) $(LDFLAGS) $(CFLAGS) $(common_modules) $(extra_modules) $(REL) serial.rel -o check_subg_rfspy

test: output/${TARGET_BUILD} output/${TARGET_BUILD}/check_subg_rfspy
output/${TARGET_BUILD}/check_subg_rfspy
7 changes: 0 additions & 7 deletions Makefile.uart0_alt1

This file was deleted.

7 changes: 0 additions & 7 deletions Makefile.uart1_alt2

This file was deleted.

37 changes: 0 additions & 37 deletions Makefile.usb_ep0

This file was deleted.

Loading

0 comments on commit 5d1d7fb

Please sign in to comment.