From d20e0d2a24cccd10c024c090099e0c8a472787cd Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@arduino.cc>
Date: Tue, 24 Mar 2015 17:39:03 +0100
Subject: [PATCH] removed leftovers from old pulseIn
---
cores/arduino/Arduino.h | 2 +-
cores/arduino/wiring_pulse.cpp.disabled | 61 -------------------------
cores/arduino/wiring_pulse.h | 39 ----------------
3 files changed, 1 insertion(+), 101 deletions(-)
delete mode 100644 cores/arduino/wiring_pulse.cpp.disabled
delete mode 100644 cores/arduino/wiring_pulse.h
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index a37ad3ff..fa362d28 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -71,7 +71,7 @@ void loop( void ) ;
#include "Tone.h"
#include "WMath.h"
#include "HardwareSerial.h"
- #include "wiring_pulse.h"
+// #include "wiring_pulse.h"
#include "delay.h"
#include "Uart.h"
#endif // __cplusplus
diff --git a/cores/arduino/wiring_pulse.cpp.disabled b/cores/arduino/wiring_pulse.cpp.disabled
deleted file mode 100644
index 1c1202d1..00000000
--- a/cores/arduino/wiring_pulse.cpp.disabled
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- Copyright (c) 2014 Arduino. All right reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-#include "Arduino.h"
-#include "wiring_private.h"
-
-/* Measures the length (in microseconds) of a pulse on the pin; state is HIGH
- * or LOW, the type of pulse to measure. Works on pulses from 2-3 microseconds
- * to 3 minutes in length, but must be called at least a few dozen microseconds
- * before the start of the pulse. */
-extern uint32_t pulseIn( uint32_t pin, uint32_t state, uint32_t timeout )
-{
- // cache the port and bit of the pin in order to speed up the
- // pulse width measuring loop and achieve finer resolution. calling
- // digitalRead() instead yields much coarser resolution.
- PinDescription p = g_APinDescription[pin];
- uint32_t width = 0; // keep initialization out of time critical area
-
- // convert the timeout from microseconds to a number of times through
- // the initial loop; it takes 22 clock cycles per iteration.
- uint32_t numloops = 0;
- uint32_t maxloops = microsecondsToClockCycles(timeout) / 22;
-
- // wait for any previous pulse to end
- while (PIO_Get(p.pPort, PIO_INPUT, p.ulPin) == state)
- if (numloops++ == maxloops)
- return 0;
-
- // wait for the pulse to start
- while (PIO_Get(p.pPort, PIO_INPUT, p.ulPin) != state)
- if (numloops++ == maxloops)
- return 0;
-
- // wait for the pulse to stop
- while (PIO_Get(p.pPort, PIO_INPUT, p.ulPin) == state) {
- if (numloops++ == maxloops)
- return 0;
- width++;
- }
-
- // convert the reading to microseconds. The loop has been determined
- // to be 52 clock cycles long and have about 16 clocks between the edge
- // and the start of the loop. There will be some error introduced by
- // the interrupt handlers.
- return clockCyclesToMicroseconds(width * 52 + 16);
-}
diff --git a/cores/arduino/wiring_pulse.h b/cores/arduino/wiring_pulse.h
deleted file mode 100644
index 1a1d4515..00000000
--- a/cores/arduino/wiring_pulse.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- Copyright (c) 2014 Arduino. All right reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library 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 Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-#ifndef _WIRING_PULSE_
-#define _WIRING_PULSE_
-
-#ifdef __cplusplus
- extern "C" {
-#endif
-
-/*
- * \brief Measures the length (in microseconds) of a pulse on the pin; state is HIGH
- * or LOW, the type of pulse to measure. Works on pulses from 2-3 microseconds
- * to 3 minutes in length, but must be called at least a few dozen microseconds
- * before the start of the pulse.
- */
-extern uint32_t pulseIn( uint32_t ulPin, uint32_t ulState, uint32_t ulTimeout = 1000000L ) ;
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _WIRING_PULSE_ */
--
GitLab