summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2015-02-24 18:52:34 +0100
committerChristian Pointner <equinox@spreadspace.org>2015-02-24 19:02:40 +0100
commitd9c06ab368608b29402db0236c90688a4aa78650 (patch)
treeb42e1d24cbf82e5668ec367bb6978dc4798c1b5e
parentadded SPREADAVR_PATH variable to all examples (diff)
fixed copyright header and paths after repo move
-rw-r--r--.gitignore4
-rw-r--r--dolmetsch-ctl/Makefile14
-rw-r--r--dolmetsch-ctl/dolmetsch-ctl.c12
-rw-r--r--dolmetsch-ctl/eventqueue.c12
-rw-r--r--dolmetsch-ctl/eventqueue.h12
-rw-r--r--dolmetsch-ctl/keypad.c12
-rw-r--r--dolmetsch-ctl/keypad.h12
7 files changed, 38 insertions, 40 deletions
diff --git a/.gitignore b/.gitignore
index c8712a5..841ba14 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,4 @@
*/*.d.*
*/*.hex
*/*.elf
-tools/reset_arduino
-contrib/LUFA-*
-tuer-rfid/update-keys
+contrib/avr-utils
diff --git a/dolmetsch-ctl/Makefile b/dolmetsch-ctl/Makefile
index 685405a..badf9a0 100644
--- a/dolmetsch-ctl/Makefile
+++ b/dolmetsch-ctl/Makefile
@@ -1,23 +1,23 @@
##
-## spreadspace avr utils
+## spreadspace avr projects
##
##
-## Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+## Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
##
-## This file is part of spreadspace avr utils.
+## This file is part of spreadspace avr projects.
##
-## spreadspace avr utils is free software: you can redistribute it and/or modify
+## spreadspace avr projects 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,
+## spreadspace avr projects 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 spreadspace avr projects. If not, see <http://www.gnu.org/licenses/>.
##
NAME := dolmetsch-ctl
@@ -25,7 +25,7 @@ BOARD_TYPE := teensy2
OBJ := $(NAME).o keypad.o eventqueue.o
LIBS := util led lufa-descriptor-midi
EXTERNAL_LIBS := lufa
-SPREADAVR_PATH := ..
+SPREADAVR_PATH := ../contrib/avr-utils
LUFA_PATH := $(SPREADAVR_PATH)/contrib/LUFA-120219
LUFA_OPTS = -D USB_DEVICE_ONLY
diff --git a/dolmetsch-ctl/dolmetsch-ctl.c b/dolmetsch-ctl/dolmetsch-ctl.c
index afc74b2..85aad6f 100644
--- a/dolmetsch-ctl/dolmetsch-ctl.c
+++ b/dolmetsch-ctl/dolmetsch-ctl.c
@@ -1,23 +1,23 @@
/*
- * spreadspace avr utils
+ * spreadspace avr projects
*
*
- * Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
*
- * This file is part of spreadspace avr utils.
+ * This file is part of spreadspace avr projects.
*
- * spreadspace avr utils is free software: you can redistribute it and/or modify
+ * spreadspace avr projects 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,
+ * spreadspace avr projects 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 spreadspace avr projects. If not, see <http://www.gnu.org/licenses/>.
*/
#include <avr/io.h>
diff --git a/dolmetsch-ctl/eventqueue.c b/dolmetsch-ctl/eventqueue.c
index b4637fd..40f1f21 100644
--- a/dolmetsch-ctl/eventqueue.c
+++ b/dolmetsch-ctl/eventqueue.c
@@ -1,23 +1,23 @@
/*
- * spreadspace avr utils
+ * spreadspace avr projects
*
*
- * Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
*
- * This file is part of spreadspace avr utils.
+ * This file is part of spreadspace avr projects.
*
- * spreadspace avr utils is free software: you can redistribute it and/or modify
+ * spreadspace avr projects 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,
+ * spreadspace avr projects 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 spreadspace avr projects. If not, see <http://www.gnu.org/licenses/>.
*/
#include <LUFA/Drivers/Misc/RingBuffer.h>
diff --git a/dolmetsch-ctl/eventqueue.h b/dolmetsch-ctl/eventqueue.h
index 1dc456e..a4ec40c 100644
--- a/dolmetsch-ctl/eventqueue.h
+++ b/dolmetsch-ctl/eventqueue.h
@@ -1,23 +1,23 @@
/*
- * spreadspace avr utils
+ * spreadspace avr projects
*
*
- * Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
*
- * This file is part of spreadspace avr utils.
+ * This file is part of spreadspace avr projects.
*
- * spreadspace avr utils is free software: you can redistribute it and/or modify
+ * spreadspace avr projects 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,
+ * spreadspace avr projects 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 spreadspace avr projects. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef DOLMETSCHCTL_eventqueue_h_INCLUDED
diff --git a/dolmetsch-ctl/keypad.c b/dolmetsch-ctl/keypad.c
index a4bcabc..973ce9b 100644
--- a/dolmetsch-ctl/keypad.c
+++ b/dolmetsch-ctl/keypad.c
@@ -1,23 +1,23 @@
/*
- * spreadspace avr utils
+ * spreadspace avr projects
*
*
- * Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
*
- * This file is part of spreadspace avr utils.
+ * This file is part of spreadspace avr projects.
*
- * spreadspace avr utils is free software: you can redistribute it and/or modify
+ * spreadspace avr projects 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,
+ * spreadspace avr projects 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 spreadspace avr projects. If not, see <http://www.gnu.org/licenses/>.
*/
#include <avr/io.h>
diff --git a/dolmetsch-ctl/keypad.h b/dolmetsch-ctl/keypad.h
index 8756458..a1202bc 100644
--- a/dolmetsch-ctl/keypad.h
+++ b/dolmetsch-ctl/keypad.h
@@ -1,23 +1,23 @@
/*
- * spreadspace avr utils
+ * spreadspace avr projects
*
*
- * Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>
+ * Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>
*
- * This file is part of spreadspace avr utils.
+ * This file is part of spreadspace avr projects.
*
- * spreadspace avr utils is free software: you can redistribute it and/or modify
+ * spreadspace avr projects 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,
+ * spreadspace avr projects 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 spreadspace avr projects. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef DOLMETSCHCTL_keypad_h_INCLUDED