updated copyright header and ws-cleanup

4 files changed, 49 insertions, 29 deletions

diff --git a/ats-watch/Makefile b/ats-watch/Makefile
index d6d29a0..7419201 100644
--- a/ats-watch/Makefile
+++ b/ats-watch/Makefile
@@ -1,23 +1,23 @@
 ##

-##  spreadspace avr utils

+##  Radio Helsinki avr projects

 ##

 ##

-##  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

+##  Copyright (C) 2013-2015 Christian Pointner <equinox@helsini.at>

 ##

-##  This file is part of spreadspace avr utils.

+##  This file is part of Radio Helsinki avr projects.

 ##

-##  spreadspace avr utils is free software: you can redistribute it and/or modify

+##  Radio Helsinki 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,

+##  Radio Helsinki 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 Radio Helsinki avr projects. If not, see <http://www.gnu.org/licenses/>.

 ##

 

 NAME := ats-watch

@@ -25,7 +25,7 @@ BOARD_TYPE := teensy2
 OBJ := $(NAME).o

 LIBS := util led lufa-descriptor-usbserial anyio

 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/ats-watch/ats-watch.c b/ats-watch/ats-watch.c
index 12a97a2..69a72e1 100644
--- a/ats-watch/ats-watch.c
+++ b/ats-watch/ats-watch.c
@@ -1,26 +1,25 @@
 /*

- *  spreadspace avr utils

+ *  Radio Helsinki avr projects

  *

  *

- *  Copyright (C) 2013-2014 Christian Pointner <equinox@spreadspace.org>

+ *  Copyright (C) 2013-2015 Christian Pointner <equinox@helsini.at>

  *

- *  This file is part of spreadspace avr utils.

+ *  This file is part of Radio Helsinki avr projects.

  *

- *  spreadspace avr utils is free software: you can redistribute it and/or modify

+ *  Radio Helsinki 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,

+ *  Radio Helsinki 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 Radio Helsinki avr projects. If not, see <http://www.gnu.org/licenses/>.

  */

 

-

 #include <avr/io.h>

 #include <avr/wdt.h>

 #include <avr/interrupt.h>

@@ -74,7 +73,7 @@ inline char* ats_get_input_b(uint8_t stat)
 

 void ats_print_status(uint8_t stat)

 {

-  printf("Status: %s, Input %s is selected (A: %s, B: %s)\r\n", 

+  printf("Status: %s, Input %s is selected (A: %s, B: %s)\r\n",

          ats_get_ats_status(stat), ats_get_selected(stat), ats_get_input_a(stat), ats_get_input_b(stat));

 }

 

diff --git a/ats-watch/ats-watch.pl b/ats-watch/ats-watch.pl
index f374295..227f28c 100755
--- a/ats-watch/ats-watch.pl
+++ b/ats-watch/ats-watch.pl
@@ -1,15 +1,36 @@
 #!/usr/bin/perl -w
+##
+##  Radio Helsinki avr projects
+##
+##
+##  Copyright (C) 2013-2015 Christian Pointner <equinox@helsini.at>
+##
+##  This file is part of Radio Helsinki avr projects.
+##
+##  Radio Helsinki 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.
+##
+##  Radio Helsinki 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 Radio Helsinki avr projects. If not, see <http://www.gnu.org/licenses/>.
+##
 
 use strict;
 use Device::SerialPort;
 use Mail::Sendmail;
 
-my $port = new Device::SerialPort("/dev/ats-watch"); 
-$port->baudrate(38400); 
-$port->parity("none"); 
-$port->databits(8); 
-$port->stopbits(1); 
-$port->handshake("none"); 
+my $port = new Device::SerialPort("/dev/ats-watch");
+$port->baudrate(38400);
+$port->parity("none");
+$port->databits(8);
+$port->stopbits(1);
+$port->handshake("none");
 $port->read_const_time(500);
 $port->read_char_time(5);
 $port->write_settings;
@@ -36,7 +57,7 @@ while(1) {
     } else {
       $mail{Subject} = '[ATS-Watch] PDU0 state unknown';
       $mail{Message} = $line;
-    }      
+    }
     sendmail( %mail ) or print $Mail::Sendmail::error . "\n";
-  } 
+  }
 }
diff --git a/contrib/Makefile b/contrib/Makefile
index 9f79857..c841507 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -1,23 +1,23 @@
 ##

-##  spreadspace avr projects

+##  Radio Helsinki avr projects

 ##

 ##

-##  Copyright (C) 2013-2015 Christian Pointner <equinox@spreadspace.org>

+##  Copyright (C) 2015 Christian Pointner <equinox@helsini.at>

 ##

-##  This file is part of spreadspace avr projects.

+##  This file is part of Radio Helsinki avr projects.

 ##

-##  spreadspace avr projects is free software: you can redistribute it and/or modify

+##  Radio Helsinki 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 projects is distributed in the hope that it will be useful,

+##  Radio Helsinki 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 projects. If not, see <http://www.gnu.org/licenses/>.

+##  along with Radio Helsinki avr projects. If not, see <http://www.gnu.org/licenses/>.

 ##

 

 all: update-spreadavr