summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@mur.at>2015-02-24 23:53:03 (GMT)
committerChristian Pointner <equinox@mur.at>2015-02-24 23:53:55 (GMT)
commit53ec16b2a54e7eeef741e4da1b52ebef69d617f3 (patch)
tree648f87b7913346a6c0e874b29d66e0a563757c4e
parentfa231e9696af24cb1b76a58ea1724129a00a4984 (diff)
moved to external pic utils
-rw-r--r--.gitignore2
-rw-r--r--contrib/Makefile31
-rw-r--r--software/ctr/Makefile9
-rw-r--r--software/idm/Makefile3
-rw-r--r--software/ihu/Makefile3
-rw-r--r--software/pic.include.mk68
-rw-r--r--software/ttx/Makefile7
7 files changed, 37 insertions, 86 deletions
diff --git a/.gitignore b/.gitignore
index bd9abc9..e648736 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
contrib/avr-utils
contrib/.spreadavr.prepared
+contrib/pic-utils
+contrib/.spreadpic.prepared
contrib/ChibiOS_*
contrib/kicad-libs/*.bak
contrib/kicad-libs/*.bck
diff --git a/contrib/Makefile b/contrib/Makefile
index a0593ea..b2dca84 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,29 +1,36 @@
##
-## spreadspace avr utils
+## mur.sat
##
+## Somewhen in the year 20xx, mur.at will have a nano satellite launched
+## into a low earth orbit (310 km above the surface of our planet). The
+## satellite itself is a TubeSat personal satellite kit, developed and
+## launched by interorbital systems. mur.sat is a joint venture of mur.at,
+## ESC im Labor and realraum.
##
-## Copyright (C) 2013 Christian Pointner <equinox@spreadspace.org>
-## Othmar Gsenger <otti@gsenger.com>
+## Please visit the project hompage at sat.mur.at for further information.
##
-## This file is part of spreadspace avr utils.
##
-## spreadspace avr utils is free software: you can redistribute it and/or modify
+## Copyright (C) 2011-2015 Christian Pointner <equinox@mur.at>
+##
+## This file is part of mur.sat.
+##
+## mur.sat 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 3 of the License, or
## any later version.
##
-## spreadspace avr utils is distributed in the hope that it will be useful,
+## mur.sat is distributed in the hope that it will be useful,
## but WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
## GNU General Public License for more details.
##
## You should have received a copy of the GNU General Public License
-## along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
+## along with mur.sat. If not, see <http://www.gnu.org/licenses/>.
##
CHIBIOS_VERSION := 2.6.6
-all: update-spreadavr download-chibios
+all: update-spreadavr update-spreadpic download-chibios
.spreadavr.prepared:
@@ -35,6 +42,14 @@ update-spreadavr: .spreadavr.prepared
$(MAKE) -C avr-utils/contrib/
+.spreadpic.prepared:
+ git clone git://git.spreadspace.org/pic-utils.git
+ touch $@
+
+update-spreadpic: .spreadpic.prepared
+ cd pic-utils/; git pull
+
+
download-chibios: ChibiOS_${CHIBIOS_VERSION}.zip
ChibiOS_${CHIBIOS_VERSION}.zip:
diff --git a/software/ctr/Makefile b/software/ctr/Makefile
index a96e463..cc9a49f 100644
--- a/software/ctr/Makefile
+++ b/software/ctr/Makefile
@@ -8,10 +8,10 @@
## ESC im Labor and realraum.
##
## Please visit the project hompage at sat.mur.at for further information.
-##
+##
##
## Copyright (C) 2011-2015 Christian Pointner <equinox@mur.at>
-##
+##
## This file is part of mur.sat.
##
## mur.sat is free software: you can redistribute it and/or modify
@@ -30,7 +30,6 @@
PROJECT := ctr
PROC_TYPE := 16F1847
+SPREADPIC_PATH := ../../contrib/pic-utils
-include ../pic.include.mk
-
-AFLAGS := $(AFLAGS) -y
+include $(SPREADPIC_PATH)/include.mk
diff --git a/software/idm/Makefile b/software/idm/Makefile
index f5bfa6c..fde1bf9 100644
--- a/software/idm/Makefile
+++ b/software/idm/Makefile
@@ -30,5 +30,6 @@
PROJECT := idm
PROC_TYPE := 16F1847
+SPREADPIC_PATH := ../../contrib/pic-utils
-include ../pic.include.mk
+include $(SPREADPIC_PATH)/include.mk
diff --git a/software/ihu/Makefile b/software/ihu/Makefile
index 8df9220..5989509 100644
--- a/software/ihu/Makefile
+++ b/software/ihu/Makefile
@@ -30,8 +30,9 @@
PROJECT := ihu
PROC_TYPE := 16F887
+SPREADPIC_PATH := ../../contrib/pic-utils
-include ../pic.include.mk
+include $(SPREADPIC_PATH)/include.mk
DOWNLOADER := ../pic.bootloader/downloader.py
BOOT_NAME := IHU
diff --git a/software/pic.include.mk b/software/pic.include.mk
deleted file mode 100644
index 5efadde..0000000
--- a/software/pic.include.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-##
-## spreadspace pic utils
-##
-##
-## Copyright (C) 2011-2013 Christian Pointner <equinox@spreadspace.org>
-##
-## This file is part of spreadspace pic utils.
-##
-## spreadspace pic utils 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 3 of the License, or
-## any later version.
-##
-## spreadspace pic utils is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-## GNU General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with spreadspace pic utils. If not, see <http://www.gnu.org/licenses/>.
-##
-
-SRCFILE := $(PROJECT).asm
-HEXFILE := $(PROJECT).hex
-
-ASM := gpasm
-AFLAGS :=
-PROG := usbpicprog
-
-.PHONY: clean distclean program verify erase run stop
-
-all: $(HEXFILE)
-
--include $(PROJECT).d
-
-$(HEXFILE): $(SRCFILE)
- $(ASM) $(AFLAGS) -M -o $@ $<
-
-
-distclean: clean
- find . -name *.hex -exec rm -f {} \;
- find . -name *.cod -exec rm -f {} \;
- find . -name *.lst -exec rm -f {} \;
- find . -name "*.\~*" -exec rm -rf {} \;
-
-clean:
- rm -f $(PROJECT).hex
- rm -f $(PROJECT).cod
- rm -f $(PROJECT).lst
- rm -f $(PROJECT).d
- rm -f $(HEXFILE)
-
-program: $(HEXFILE) stop erase write verify
-
-write: $(HEXFILE)
- @$(PROG) -p $(PROC_TYPE) -s -w -f $(HEXFILE)
-
-verify: $(HEXFILE)
- @$(PROG) -p $(PROC_TYPE) -s -v -f $(HEXFILE)
-
-erase:
- @$(PROG) -p $(PROC_TYPE) -e
-
-run:
- @$(PROG) --run
-
-stop:
- @$(PROG) --stop
diff --git a/software/ttx/Makefile b/software/ttx/Makefile
index 47f8ae9..6ab5314 100644
--- a/software/ttx/Makefile
+++ b/software/ttx/Makefile
@@ -8,10 +8,10 @@
## ESC im Labor and realraum.
##
## Please visit the project hompage at sat.mur.at for further information.
-##
+##
##
## Copyright (C) 2011-2015 Christian Pointner <equinox@mur.at>
-##
+##
## This file is part of mur.sat.
##
## mur.sat is free software: you can redistribute it and/or modify
@@ -30,5 +30,6 @@
PROJECT := ttx
PROC_TYPE := 12F635
+SPREADPIC_PATH := ../../contrib/pic-utils
-include ../pic.include.mk
+include $(SPREADPIC_PATH)/include.mk