summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--COPYING.BSD11
-rw-r--r--src/display.cc10
-rw-r--r--src/display.h10
-rw-r--r--src/fecmodem.cc10
-rw-r--r--src/fecmodem.h10
-rw-r--r--src/hamming.h10
-rw-r--r--src/main.cc10
-rw-r--r--src/modem.cc2
-rw-r--r--src/modem.h2
-rw-r--r--src/static_patterns.h10
-rw-r--r--src/storage.cc10
-rw-r--r--src/storage.h10
-rw-r--r--src/system.cc10
-rw-r--r--src/system.h10
14 files changed, 123 insertions, 2 deletions
diff --git a/COPYING.BSD b/COPYING.BSD
new file mode 100644
index 0000000..5e037a5
--- /dev/null
+++ b/COPYING.BSD
@@ -0,0 +1,11 @@
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/display.cc b/src/display.cc
index b7942e8..ed1880e 100644
--- a/src/display.cc
+++ b/src/display.cc
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/pgmspace.h>
diff --git a/src/display.h b/src/display.h
index 3a526b2..41b3c83 100644
--- a/src/display.h
+++ b/src/display.h
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#include <avr/io.h>
#include <stdlib.h>
diff --git a/src/fecmodem.cc b/src/fecmodem.cc
index 3e4af68..85221dc 100644
--- a/src/fecmodem.cc
+++ b/src/fecmodem.cc
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#include <avr/io.h>
#include <stdlib.h>
#include "fecmodem.h"
diff --git a/src/fecmodem.h b/src/fecmodem.h
index c9a942b..087aae4 100644
--- a/src/fecmodem.h
+++ b/src/fecmodem.h
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#include <avr/io.h>
#include <stdlib.h>
diff --git a/src/hamming.h b/src/hamming.h
index 9828baa..275185b 100644
--- a/src/hamming.h
+++ b/src/hamming.h
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#ifndef HAMMING_H_
#define HAMMING_H_
diff --git a/src/main.cc b/src/main.cc
index b42c12f..9e37b59 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#include <avr/io.h>
#include <stdlib.h>
diff --git a/src/modem.cc b/src/modem.cc
index a826306..e34910a 100644
--- a/src/modem.cc
+++ b/src/modem.cc
@@ -3,7 +3,7 @@
* Audio modem for Attiny85 & other AVR chips with modifications
*
* Author: Jari Tulilahti
- * Copyright: 2014 Rakettitiede Oy
+ * Copyright: 2014 Rakettitiede Oy and 2016 Daniel Friesel
* License: LGPLv3, see COPYING, and COPYING.LESSER -files for more info
*/
diff --git a/src/modem.h b/src/modem.h
index e3706f3..8efcfb0 100644
--- a/src/modem.h
+++ b/src/modem.h
@@ -1,6 +1,6 @@
/* Name: modem.h
* Author: Jari Tulilahti
- * Copyright: 2014 Rakettitiede Oy
+ * Copyright: 2014 Rakettitiede Oy and Daniel Friesel
* License: LGPLv3, see COPYING, and COPYING.LESSER -files for more info
*/
diff --git a/src/static_patterns.h b/src/static_patterns.h
index f590f60..9190180 100644
--- a/src/static_patterns.h
+++ b/src/static_patterns.h
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#ifndef STATIC_PATTERNS_H_
#define STATIC_PATTERNS_H_
diff --git a/src/storage.cc b/src/storage.cc
index d1c2ee1..fef0ee2 100644
--- a/src/storage.cc
+++ b/src/storage.cc
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#include <util/delay.h>
#include <avr/io.h>
#include <stdlib.h>
diff --git a/src/storage.h b/src/storage.h
index 0193b17..5485e3c 100644
--- a/src/storage.h
+++ b/src/storage.h
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#include <stdlib.h>
#define I2C_EEPROM_ADDR 0x50
diff --git a/src/system.cc b/src/system.cc
index 61a8f01..47ea436 100644
--- a/src/system.cc
+++ b/src/system.cc
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#include <avr/io.h>
#include <avr/interrupt.h>
#include <avr/wdt.h>
diff --git a/src/system.h b/src/system.h
index 279e680..3cb74b0 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,3 +1,13 @@
+/*
+ * Copyright (C) 2016 by Daniel Friesel
+ *
+ * License: You may use, redistribute and/or modify this file under the terms
+ * of either:
+ * * The GNU LGPL v3 (see COPYING and COPYING.LESSER), or
+ * * The 3-clause BSD License (see COPYING.BSD)
+ *
+ */
+
#include <stdlib.h>
#define SHUTDOWN_THRESHOLD 2048