cosmetic changes, new file 'abi.cpp'

Author: bombasticbob

cores/xmega/abi.cpp

@@ -0,0 +1,38 @@
+/*
+  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 <stdlib.h>
+
+extern "C" void __cxa_pure_virtual(void) __attribute__ ((__noreturn__));
+extern "C" void __cxa_deleted_virtual(void) __attribute__ ((__noreturn__));
+
+void __cxa_pure_virtual(void)
+{
+  // We might want to write some diagnostics to uart in this case
+  //std::terminate();
+  abort();
+}
+
+void __cxa_deleted_virtual(void)
+{
+  // We might want to write some diagnostics to uart in this case
+  //std::terminate();
+  abort();
+}
+
+

cores/xmega/wiring.c

@@ -435,8 +435,15 @@ register unsigned char c1;
     // enable DFLL auto-calibration of the 32Mhz internal oscillator
     // (it uses the reasonably precise 32.768KHz clock to do it)
 
-    OSC_DFLLCTRL = 0; // sect 6.10.7 - select 32.768KHz osc for everything, basically
-    DFLLRC32M_CTRL = 1; // set the bit to enable DFLL calibration - section 6.11.1
+#ifdef OSC_RC32MCREF_gm /* if this is present, the enum for OSC_RC32MCREF_enum is also present */
+    OSC_DFLLCTRL = OSC_RC32MCREF_RC32K_gc; // sect 6.10.7 - select 32.768KHz osc for everything, basically
+    // use the enumeration/constant if it's present
+#else // OSC_RC32MCREF_gm not present
+    OSC_DFLLCTRL = 0;                      // sect 6.10.7 - select 32.768KHz osc for everything, basically
+    // for header files that do not have the enumeration/constant defined, this will have to do
+#endif // OSC_RC32MCREF_gm
+
+    DFLLRC32M_CTRL = DFLL_ENABLE_bm; // set the bit to enable DFLL calibration - section 6.11.1
   }
 
   // I'll be using the 1.024khz clock (from the 32.768KHz clock) for the real-time counter

cores/xmega/wiring_pulse.c

@@ -29,6 +29,11 @@
  * 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. */
+
+// NOTE:  Arduino code now has a wiring_pulse.S that implements this function
+//        as assembly code.  For now, the C code will stay in the xmega version
+//        but at some point the assembly version should be implemented.
+
 unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout)
 {
   // cache the port and bit of the pin in order to speed up the
@@ -45,19 +50,31 @@ unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout)
   unsigned long maxloops = microsecondsToClockCycles(timeout) / 16;
 
   // wait for any previous pulse to end
-  while ((*portInputRegister(port) & bit) == stateMask)
-    if (numloops++ == maxloops)
+  while((*portInputRegister(port) & bit) == stateMask)
+  {
+    if(numloops++ == maxloops)
+    {
       return 0;
+    }
+  }
 
   // wait for the pulse to start
-  while ((*portInputRegister(port) & bit) != stateMask)
-    if (numloops++ == maxloops)
+  while((*portInputRegister(port) & bit) != stateMask)
+  {
+    if(numloops++ == maxloops)
+    {
       return 0;
+    }
+  }
 
   // wait for the pulse to stop
-  while ((*portInputRegister(port) & bit) == stateMask) {
-    if (numloops++ == maxloops)
+  while((*portInputRegister(port) & bit) == stateMask)
+  {
+    if(numloops++ == maxloops)
+    {
       return 0;
+    }
+
     width++;
   }
 
@@ -67,3 +84,56 @@ unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout)
   // the interrupt handlers.
   return clockCyclesToMicroseconds(width * 21 + 16);
 }
+
+// Added 11/10/2018 to bring it up to latest Arduino code
+
+/* 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.
+ *
+ * ATTENTION:
+ * this function relies on micros() so cannot be used in noInterrupt() context
+ */
+unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long 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.
+  uint8_t bit = digitalPinToBitMask(pin);
+  uint8_t port = digitalPinToPort(pin);
+  uint8_t stateMask = (state ? bit : 0);
+
+  unsigned long startMicros = micros();
+
+  // wait for any previous pulse to end
+  while((*portInputRegister(port) & bit) == stateMask)
+  {
+    if(micros() - startMicros > timeout)
+    {
+      return 0;
+    }
+  }
+
+  // wait for the pulse to start
+  while((*portInputRegister(port) & bit) != stateMask)
+  {
+    if(micros() - startMicros > timeout)
+    {
+      return 0;
+    }
+  }
+
+  unsigned long start = micros();
+  // wait for the pulse to stop
+  while((*portInputRegister(port) & bit) == stateMask)
+  {
+    if(micros() - startMicros > timeout)
+    {
+      return 0;
+    }
+  }
+
+  return micros() - start;
+}
+