Revert "first work on PWM input to TeleScience, 'p' command displays timer 1"

PWM bits not suitable for master

This reverts commit e93c6bcc799d76d4ff425815e2601a25e6796229.

diff --git a/src/avr/ao_pwmin.c b/src/avr/ao_pwmin.c
deleted file mode 100644 (file)
index 4d96404..0000000
--- a/src/avr/ao_pwmin.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright © 2012 Robert D. Garbee <robert@gag.com>
- *
- * This program 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; version 2 of the License.
- *
- * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-#include "ao.h"
-#include "ao_pwmin.h"
-
-/* 
- * This code implements a PWM input using ICP3.  
- *
- * The initial use is to measure wind speed in the ULA/Ball summer intern 
- * project payload developed at Challenger Middle School.  
- */
-
-static void
-ao_pwmin_display(void) __reentrant
-{
-       uint8_t lo = TCNT1L; 
-       uint8_t hi = TCNT1H;
-       uint16_t value = (hi <<8) | lo;
-
-       /* now display the value we read */
-       printf("timer 1: %5u",  value);
-
-}
-
-__code struct ao_cmds ao_pwmin_cmds[] = {
-       { ao_pwmin_display,     "p\0PWM input" },
-       { 0, NULL },
-};
-
-void
-ao_pwmin_init(void)
-{
-       /* do hardware setup here */
-               /* set the spike filter bit in the TCCR3B register */
-
-       ao_cmd_register(&ao_pwmin_cmds[0]);
-}
-
-

diff --git a/src/avr/ao_pwmin.h b/src/avr/ao_pwmin.h
deleted file mode 100644 (file)
index bbab4dd..0000000
--- a/src/avr/ao_pwmin.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright © 2012 Robert D. Garbee <robert@gag.com>
- *
- * This program 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; version 2 of the License.
- *
- * This program 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 this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-void ao_pwmin_init(void);

diff --git a/src/product/ao_telescience.c b/src/product/ao_telescience.c
index 2d594d7fa411493d88007e8afaf5a40c680e3bb1..45b6d40e0c406ca1af29c1fadd69c5e65453bf33 100644 (file)
--- a/src/product/ao_telescience.c
+++ b/src/product/ao_telescience.c
@@ -16,7 +16,6 @@
  */
 
 #include "ao.h"
-#include "ao_pwmin.h"
 
 int
 main(void)
@@ -35,7 +34,6 @@ main(void)
        ao_usb_init();
        ao_adc_init();
        ao_log_single_init();
-       ao_pwmin_init();
        ao_start_scheduler();
        return 0;
 }

diff --git a/src/telescience-v0.1/Makefile b/src/telescience-v0.1/Makefile
index 5542913dc206e21419fdc33474fb434ed6024505..d24128ef53a2161e51e85b659126038045ae8e75 100644 (file)
--- a/src/telescience-v0.1/Makefile
+++ b/src/telescience-v0.1/Makefile
@@ -53,7 +53,6 @@ ALTOS_SRC = \
        ao_adc_avr.c \
        ao_science_slave.c \
        ao_spi_slave.c \
-       ao_pwmin.c \
        $(TELESCIENCE_STORAGE)\
        $(TELESCIENCE_LOG)