aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonald Delmar Davis <don@suspectdevices.com>2012-08-13 20:06:37 -0700
committerDonald Delmar Davis <don@suspectdevices.com>2012-08-13 20:06:37 -0700
commit4143841e524b315d2a7b24c367ab5b2a7a5d69ca (patch)
tree2bb4cfb16298d7a219253594c8a2ffb2ba18b1f0
parent6db50213679cc7e4369f50a18093ab568ee4c94f (diff)
remove cruft
-rw-r--r--dumblogger/LICENSE10
-rw-r--r--dumblogger/Makefile188
-rwxr-xr-xdumblogger/make-helper.sh3
-rw-r--r--dumblogger/old-code-main.cpp (renamed from dumblogger/main.cpp)0
4 files changed, 0 insertions, 201 deletions
diff --git a/dumblogger/LICENSE b/dumblogger/LICENSE
deleted file mode 100644
index fbc5cff..0000000
--- a/dumblogger/LICENSE
+++ /dev/null
@@ -1,10 +0,0 @@
-example-libmaple-project
-
-Written in 2012 by Marti Bolivar <mbolivar@leaflabs.com>
-
-All files in this project are released under the CC0 license:
-
-http://creativecommons.org/publicdomain/zero/1.0/
-
-In short, it's as public domain as possible, and you can do whatever
-you want with it.
diff --git a/dumblogger/Makefile b/dumblogger/Makefile
deleted file mode 100644
index 57f2762..0000000
--- a/dumblogger/Makefile
+++ /dev/null
@@ -1,188 +0,0 @@
-# Try "make help" first
-
-.DEFAULT_GOAL := sketch
-
-##
-## Useful paths, constants, etc.
-##
-
-BOARD := maple_mini
-
-ifeq ($(LIB_MAPLE_HOME),)
-SRCROOT := ../../libmaple
-else
-SRCROOT := $(LIB_MAPLE_HOME)
-endif
-BUILD_PATH = build
-LIBMAPLE_PATH := $(SRCROOT)/libmaple
-WIRISH_PATH := $(SRCROOT)/wirish
-SUPPORT_PATH := $(SRCROOT)/support
-# Support files for linker
-LDDIR := $(SUPPORT_PATH)/ld
-# Support files for this Makefile
-MAKEDIR := $(SUPPORT_PATH)/make
-
-# USB ID for DFU upload
-VENDOR_ID := 1EAF
-PRODUCT_ID := 0003
-
-##
-## Target-specific configuration. This determines some compiler and
-## linker options/flags.
-##
-
-# Try "make help" for more information on BOARD and MEMORY_TARGET;
-# these default to a Maple Flash build.
-BOARD ?= maple
-MEMORY_TARGET ?= flash
-
-# $(BOARD)- and $(MEMORY_TARGET)-specific configuration
-include $(MAKEDIR)/target-config.mk
-
-##
-## Compilation flags
-##
-
-GLOBAL_FLAGS := -D$(VECT_BASE_ADDR) \
- -DBOARD_$(BOARD) -DMCU_$(MCU) \
- -DERROR_LED_PORT=$(ERROR_LED_PORT) \
- -DERROR_LED_PIN=$(ERROR_LED_PIN) \
- -D$(DENSITY)
-GLOBAL_CFLAGS := -Os -g3 -gdwarf-2 -mcpu=cortex-m3 -mthumb -march=armv7-m \
- -nostdlib -ffunction-sections -fdata-sections \
- -Wl,--gc-sections $(GLOBAL_FLAGS)
-GLOBAL_CXXFLAGS := -fno-rtti -fno-exceptions -Wall $(GLOBAL_FLAGS)
-GLOBAL_ASFLAGS := -mcpu=cortex-m3 -march=armv7-m -mthumb \
- -x assembler-with-cpp $(GLOBAL_FLAGS)
-LDFLAGS = -T$(LDDIR)/$(LDSCRIPT) -L$(LDDIR) \
- -mcpu=cortex-m3 -mthumb -Xlinker \
- --gc-sections --print-gc-sections --march=armv7-m -Wall
-
-##
-## Build rules and useful templates
-##
-
-include $(SUPPORT_PATH)/make/build-rules.mk
-include $(SUPPORT_PATH)/make/build-templates.mk
-
-##
-## Set all submodules here
-##
-
-# Try to keep LIBMAPLE_MODULES a simply-expanded variable
-ifeq ($(LIBMAPLE_MODULES),)
- LIBMAPLE_MODULES := $(SRCROOT)/libmaple
-else
- LIBMAPLE_MODULES += $(SRCROOT)/libmaple
-endif
-LIBMAPLE_MODULES += $(SRCROOT)/wirish
-# Official libraries:
-LIBMAPLE_MODULES += $(SRCROOT)/libraries/Servo
-LIBMAPLE_MODULES += $(SRCROOT)/libraries/LiquidCrystal
-LIBMAPLE_MODULES += $(SRCROOT)/libraries/Wire
-
-# Experimental libraries:
-#LIBMAPLE_MODULES += $(SRCROOT)/libraries/FreeRTOS
-LIBMAPLE_MODULES += $(SRCROOT)/libraries/SDfat
-#LIBMAPLE_MODULES += $(SRCROOT)/libraries/EEPROM
-#LIBMAPLE_MODULES += $(SRCROOT)/libraries/RTC
-
-# Call each module's rules.mk:
-$(foreach m,$(LIBMAPLE_MODULES),$(eval $(call LIBMAPLE_MODULE_template,$(m))))
-
-##
-## Targets
-##
-
-# main target
-include $(SRCROOT)/build-targets.mk
-
-.PHONY: install sketch clean help debug cscope tags ctags ram flash jtag doxygen mrproper
-
-# Target upload commands
-UPLOAD_ram := $(SUPPORT_PATH)/scripts/reset.py && \
- sleep 1 && \
- $(DFU) -a0 -d $(VENDOR_ID):$(PRODUCT_ID) -D $(BUILD_PATH)/$(BOARD).bin -R
-UPLOAD_flash := which python &&\
- $(SUPPORT_PATH)/scripts/reset.py && \
- sleep 1 && \
- $(DFU) -a1 -d $(VENDOR_ID):$(PRODUCT_ID) -D $(BUILD_PATH)/$(BOARD).bin -R
-UPLOAD_jtag := $(OPENOCD_WRAPPER) flash
-
-# Conditionally upload to whatever the last build was
-install: INSTALL_TARGET = $(shell cat $(BUILD_PATH)/build-type 2>/dev/null)
-install: $(BUILD_PATH)/$(BOARD).bin
- @echo "Install target:" $(INSTALL_TARGET)
- $(UPLOAD_$(INSTALL_TARGET))
-
-# Force a rebuild if the target changed
-PREV_BUILD_TYPE = $(shell cat $(BUILD_PATH)/build-type 2>/dev/null)
-build-check:
-ifneq ($(PREV_BUILD_TYPE), $(MEMORY_TARGET))
- $(shell rm -rf $(BUILD_PATH))
-endif
-
-sketch: build-check MSG_INFO $(BUILD_PATH)/$(BOARD).bin
-
-clean:
- rm -rf build/../../libmaple
- rm -rf build
-
-mrproper: clean
- rm -rf doxygen
-
-help:
- @echo ""
- @echo " libmaple Makefile help"
- @echo " ----------------------"
- @echo " "
- @echo " Programming targets:"
- @echo " sketch: Compile for BOARD to MEMORY_TARGET (default)."
- @echo " install: Compile and upload code over USB, using Maple bootloader"
- @echo " "
- @echo " You *must* set BOARD if not compiling for Maple (e.g."
- @echo " use BOARD=maple_mini for mini, etc.), and MEMORY_TARGET"
- @echo " if not compiling to Flash."
- @echo " "
- @echo " Valid BOARDs:"
- @echo " maple, maple_mini, maple_RET6, maple_native"
- @echo " "
- @echo " Valid MEMORY_TARGETs (default=flash):"
- @echo " ram: Compile sketch code to ram"
- @echo " flash: Compile sketch code to flash"
- @echo " jtag: Compile sketch code for jtag; overwrites bootloader"
- @echo " "
- @echo " Other targets:"
- @echo " debug: Start OpenOCD gdb server on port 3333, telnet on port 4444"
- @echo " clean: Remove all build and object files"
- @echo " help: Show this message"
- @echo " doxygen: Build Doxygen HTML and XML documentation"
- @echo " mrproper: Remove all generated files"
- @echo " "
-
-debug:
- $(OPENOCD_WRAPPER) debug
-
-cscope:
- rm -rf *.cscope
- find . -name '*.[hcS]' -o -name '*.cpp' | xargs cscope -b
-
-tags:
- etags `find . -name "*.c" -o -name "*.cpp" -o -name "*.h"`
- @echo "Made TAGS file for EMACS code browsing"
-
-ctags:
- ctags-exuberant -R .
- @echo "Made tags file for VIM code browsing"
-
-ram:
- @$(MAKE) MEMORY_TARGET=ram --no-print-directory sketch
-
-flash:
- @$(MAKE) MEMORY_TARGET=flash --no-print-directory sketch
-
-jtag:
- @$(MAKE) MEMORY_TARGET=jtag --no-print-directory sketch
-
-doxygen:
- doxygen $(SUPPORT_PATH)/doxygen/Doxyfile
diff --git a/dumblogger/make-helper.sh b/dumblogger/make-helper.sh
deleted file mode 100755
index 80a551f..0000000
--- a/dumblogger/make-helper.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-LIB_MAPLE_HOME=`dirname ..` USER_MODULES=`pwd` BOARD=maple_mini make -d -f ../Makefile $@
diff --git a/dumblogger/main.cpp b/dumblogger/old-code-main.cpp
index 8f119a0..8f119a0 100644
--- a/dumblogger/main.cpp
+++ b/dumblogger/old-code-main.cpp