moved rda1846 code to lib

4 files changed, 16 insertions, 36 deletions

diff --git a/software/rda1846dongle/rda1846.c b/software/avr.lib/rda1846.c
index eac7091..43e66ff 100644
--- a/software/rda1846dongle/rda1846.c
+++ b/software/avr.lib/rda1846.c
@@ -1,33 +1,23 @@
 /*
+ *  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-2014 Christian Pointner <equinox@spreadspace.org>
  *
- *  Please visit the project hompage at sat.mur.at for further information.
+ *  This file is part of spreadspace avr utils.
  *
- *
- *  Copyright (C) 2013-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
+ *  spreadspace avr 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.
  *
- *  mur.sat is distributed in the hope that it will be useful,
+ *  spreadspace avr 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 mur.sat. If not, see <http://www.gnu.org/licenses/>.
- *
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "LUFA/Drivers/Peripheral/TWI.h"
diff --git a/software/rda1846dongle/rda1846.h b/software/avr.lib/rda1846.h
index b11d6c1..d043f00 100644
--- a/software/rda1846dongle/rda1846.h
+++ b/software/avr.lib/rda1846.h
@@ -1,37 +1,27 @@
 /*
+ *  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-2015 Christian Pointner <equinox@spreadspace.org>
  *
- *  Please visit the project hompage at sat.mur.at for further information.
+ *  This file is part of spreadspace avr utils.
  *
- *
- *  Copyright (C) 2013-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
+ *  spreadspace avr 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.
  *
- *  mur.sat is distributed in the hope that it will be useful,
+ *  spreadspace avr 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 mur.sat. If not, see <http://www.gnu.org/licenses/>.
- *
+ *  along with spreadspace avr utils. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MURSAT_rda1846_h_INCLUDED
-#define MURSAT_rda1846_h_INCLUDED
+#ifndef SPREADAVR_rda1846_h_INCLUDED
+#define SPREADAVR_rda1846_h_INCLUDED
 
 typedef enum { b_2m, b_1m5, b_70cm } rf_band_t;
 char* rda1846_rf_band_to_string(rf_band_t);
diff --git a/software/rda1846dongle/rda1846_defines.h b/software/avr.lib/rda1846_defines.h
index 968475e..968475e 100644
--- a/software/rda1846dongle/rda1846_defines.h
+++ b/software/avr.lib/rda1846_defines.h
diff --git a/software/rda1846dongle/Makefile b/software/rda1846dongle/Makefile
index 6929699..95a5ece 100644
--- a/software/rda1846dongle/Makefile
+++ b/software/rda1846dongle/Makefile
@@ -30,8 +30,8 @@
 
 NAME := rda1846dongle
 BOARD_TYPE := rda1846dongle
-OBJ := $(NAME).o rda1846.o
-LIBS := util led lufa-descriptor-usbserial usbio
+OBJ := $(NAME).o
+LIBS := util led lufa-descriptor-usbserial usbio rda1846
 RESET_FUNC := ./reset.sh
 RESET_PARAM := /dev/ttyACM0