Merge branch 'dev'

Author: i-make-robots

MSerial.ino MSerial.cppMSerial.ino renamed to MSerial.cpp

@@ -1,8 +1,7 @@
 //------------------------------------------------------------------------------
 // Makelangelo - firmware for various robot kinematic models
 // [email protected] 2013-12-26
-// Copyright at end of file.  Please see
-// http://www.github.com/MarginallyClever/makelangeloFirmware for more information.
+// Please see http://www.github.com/MarginallyClever/makelangeloFirmware for more information.
 //------------------------------------------------------------------------------
 
 /*
@@ -29,22 +28,4 @@ void serial_setup(long baud) {
 // serial receive interrupt
 ISR(USART0_RX_vect) {
 }
-*/
-
-
-/**
- * This file is part of makelangelo-firmware.
- *
- * makelangelo-firmware 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
- * (at your option) any later version.
- *
- * makelangelo-firmware 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 makelangelo-firmware.  If not, see <http://www.gnu.org/licenses/>.
- */
+*/

MServo.cpp

@@ -45,6 +45,8 @@
 
 #include "MServo.h"
 
+#ifndef ESP8266
+
 #define usToTicks(_us)    (( clockCyclesPerMicrosecond()* _us) / 8)     // converts microseconds to tick (assumes prescale of 8)  // 12 Aug 2009
 #define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds
 
@@ -333,3 +335,6 @@ bool Servo::attached()
 {
   return servos[this->servoIndex].Pin.isActive ;
 }
+
+
+#endif // ESP8266

MServo.h

@@ -45,6 +45,8 @@
 #ifndef Servo_h
 #define Servo_h
 
+#ifndef ESP8266
+
 #include <avr/interrupt.h>
 #include <Arduino.h>
 #include <inttypes.h>
@@ -86,10 +88,10 @@ typedef enum { _timer3, _Nbr_16timers } timer16_Sequence_t ;
 typedef enum { _timer3, _Nbr_16timers } timer16_Sequence_t ;
 
 #else  // everything else
-//#define _useTimer1
-#define _useTimer3
-//typedef enum { _timer1, _Nbr_16timers } timer16_Sequence_t ;
-typedef enum { _timer3, _Nbr_16timers } timer16_Sequence_t ;
+#define _useTimer1
+//#define _useTimer3
+typedef enum { _timer1, _Nbr_16timers } timer16_Sequence_t ;
+//typedef enum { _timer3, _Nbr_16timers } timer16_Sequence_t ;
 #endif
 
 #define Servo_VERSION           2      // software version of this library
@@ -132,4 +134,6 @@ class Servo
    int8_t max;                       // maximum is this value times 4 added to MAX_PULSE_WIDTH
 };
 
-#endif
+#endif // ESP8266
+
+#endif // Servo_h