added led lib

git-svn-id: https://svn.spreadspace.org/mur.sat@401 7de4ea59-55d0-425e-a1af-a3118ea81d4c

5 files changed, 101 insertions, 7 deletions

diff --git a/software/hhd70dongle/Makefile b/software/hhd70dongle/Makefile
index 43355da..7a90422 100644
--- a/software/hhd70dongle/Makefile
+++ b/software/hhd70dongle/Makefile
@@ -21,7 +21,7 @@
 ##

 

 NAME := hhd70dongle

-OBJ := hhd70dongle.o spi.o

+OBJ := hhd70dongle.o led.o spi.o

 BOARD_TYPE := teensy2

 

 include ../teensy.include.mk

diff --git a/software/hhd70dongle/hhd70dongle.c b/software/hhd70dongle/hhd70dongle.c
index 83300cd..09205d1 100644
--- a/software/hhd70dongle/hhd70dongle.c
+++ b/software/hhd70dongle/hhd70dongle.c
@@ -32,6 +32,7 @@
 #include "avr/io.h"

 #include "util/delay.h"

 

+#include "led.h"

 #include "spi.h"

 

 #define CPU_PRESCALE(n)	(CLKPR = 0x80, CLKPR = (n))

@@ -39,14 +40,11 @@
 int main(void)

 { 

   CPU_PRESCALE(0);

-

+  led_init();

   spi_init();

-  PORTE = 0x00;

-  DDRE = 0x00;

 

   for(;;) {

     _delay_ms(250);

-    PORTE ^= 1<<PORTE6;

+    led_toggle();

   }

 }

-

diff --git a/software/hhd70dongle/led.c b/software/hhd70dongle/led.c
new file mode 100644
index 0000000..5f4cb02
--- /dev/null
+++ b/software/hhd70dongle/led.c
@@ -0,0 +1,55 @@
+/*
+ *
+ *  mur.sat
+ *
+ *  Somewhen in the year 2012, 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.
+ *
+ *  Please visit the project hompage at sat.mur.at for further information.
+ *
+ *
+ *  Copyright (C) 2011 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.
+ *
+ *  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 mur.sat. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#include "avr/io.h"
+
+#include "led.h"
+
+void led_init(void)
+{
+  PORTE = 0x00;
+  DDRE = 0x00;
+}
+
+void led_on(void)
+{
+  PORTE |= 1<<PORTE6;
+}
+
+void led_off(void)
+{
+  PORTE &= ~(1<<PORTE6);
+}
+
+void led_toggle(void)
+{
+  PORTE ^= 1<<PORTE6;
+}
diff --git a/software/hhd70dongle/led.h b/software/hhd70dongle/led.h
new file mode 100644
index 0000000..3d8eb6c
--- /dev/null
+++ b/software/hhd70dongle/led.h
@@ -0,0 +1,41 @@
+/*
+ *
+ *  mur.sat
+ *
+ *  Somewhen in the year 2012, 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.
+ *
+ *  Please visit the project hompage at sat.mur.at for further information.
+ *
+ *
+ *  Copyright (C) 2011 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.
+ *
+ *  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 mur.sat. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#ifndef MURSAT_led_h_INCLUDED
+#define MURSAT_led_h_INCLUDED
+
+void led_init(void);
+void led_on(void);
+void led_off(void);
+void led_toggle(void);
+
+#endif
diff --git a/software/hhd70dongle/spi.c b/software/hhd70dongle/spi.c
index 22b5e83..0732716 100644
--- a/software/hhd70dongle/spi.c
+++ b/software/hhd70dongle/spi.c
@@ -31,7 +31,7 @@
  */
 #include "spi.h"
 
-void spi_init()
+void spi_init(void)
 {
 
 }