From fecf900f7f83ee8f2c8b87e2a64c7b164721109f Mon Sep 17 00:00:00 2001 From: JudahSchad Date: Wed, 30 Jan 2019 18:27:46 -0600 Subject: [PATCH] Working examples in File->Examples-RoveEncoder dropdown --- RoveUsDigiMa3Pwm.cpp | 22 +++++++++---------- RoveUsDigiMa3Pwm.h | 2 +- .../RoveUsDigiMa3Pwm/RoveUsDigiMa3Pwm.ino | 6 ++--- library.properties | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/RoveUsDigiMa3Pwm.cpp b/RoveUsDigiMa3Pwm.cpp index a2d3d0b..158fc2d 100644 --- a/RoveUsDigiMa3Pwm.cpp +++ b/RoveUsDigiMa3Pwm.cpp @@ -1,5 +1,5 @@ //////////////////////////////////////////////////////////////////////////////////////////////////////////////// -// MRDT 2019 => Energia Texas Instruments Tiva C Todo... +// Last Updated Mrdt Spring 2019 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// #include "RoveUsDigiMa3Pwm.h" @@ -10,11 +10,11 @@ #include -////////////////////////////////////////////////////////////////////////// -void RoveUsDigiMa3Pwm::attach( const uint8_t pin, const int priority ) -{ this->EncoderCcpTimer.attach( pin, priority ); } +///////////////////////////////////////////////////////////////////// +void RoveUsDigiMa3Pwm::attach( uint8_t pin, int priority ) +{ this->EncoderCcpTimer.attach( pin, priority ); } -//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////////////////////// int RoveUsDigiMa3Pwm::readMillidegrees() { int width_min_decipercent = 330; // todo => debug, then constants @@ -31,19 +31,19 @@ int RoveUsDigiMa3Pwm::readMillidegrees() float RoveUsDigiMa3Pwm::readRadians() { return DEG_TO_RAD * ( this->readMillidegrees() / 1000.0 ); } // Todo -////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////// void RoveUsDigiMa3Pwm::start() { this->EncoderCcpTimer.start(); } void RoveUsDigiMa3Pwm::stop() { this->EncoderCcpTimer.stop(); } bool RoveUsDigiMa3Pwm::isWireBroken() { return this->EncoderCcpTimer.isWireBroken(); } -///////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////// void RoveUsDigiMa3PwmWireBreaks::attachMillis( uint8_t timer, int period_millis, int priority ) -{ this->AllWireBreaksTimer.attachMillis( timer, period_millis, priority ); } +{ this->AllWireBreaksTimer.attachMillis( timer, period_millis, priority ); } -/////////////////////////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////////////////////////// void RoveUsDigiMa3PwmWireBreaks::attachMicros( uint8_t timer, int period_micros, int priority ) -{ this->AllWireBreaksTimer.attachMicros( timer, period_micros, priority ); } +{ this->AllWireBreaksTimer.attachMicros( timer, period_micros, priority ); } -////////////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// void RoveUsDigiMa3PwmWireBreaks::start() { this->AllWireBreaksTimer.start(); } void RoveUsDigiMa3PwmWireBreaks::stop() { this->AllWireBreaksTimer.stop(); } \ No newline at end of file diff --git a/RoveUsDigiMa3Pwm.h b/RoveUsDigiMa3Pwm.h index 8e7a0ae..27094a0 100644 --- a/RoveUsDigiMa3Pwm.h +++ b/RoveUsDigiMa3Pwm.h @@ -13,7 +13,7 @@ class RoveUsDigiMa3Pwm { public: - void attach( uint8_t pin, const int priority=7 ); + void attach( uint8_t pin, int priority=7 ); void start(); void stop(); diff --git a/examples/RoveUsDigiMa3Pwm/RoveUsDigiMa3Pwm.ino b/examples/RoveUsDigiMa3Pwm/RoveUsDigiMa3Pwm.ino index 219bec5..1823652 100644 --- a/examples/RoveUsDigiMa3Pwm/RoveUsDigiMa3Pwm.ino +++ b/examples/RoveUsDigiMa3Pwm/RoveUsDigiMa3Pwm.ino @@ -22,11 +22,11 @@ void setup() Encoder_TimerT4APinPM4.start(); } -////////////////////////////////////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// void debugPrint() { - Serial.print( "Encoder_TimerT4APinPM4 angle degrees: "); Serial.println( Encoder_TimerT4APinPM4.readMillidegrees() / 1000.0 ); - Serial.print( "Encoder_TimerT4APinPM4 angle radians: "); Serial.println( Encoder_TimerT4APinPM4.readRadians() ); + Serial.print( "Encoder_TimerT4APinPM4 angle degrees: "); Serial.println( Encoder_TimerT4APinPM4.readMillidegrees() / 1000.0 ); + Serial.print( "Encoder_TimerT4APinPM4 angle radians: "); Serial.println( Encoder_TimerT4APinPM4.readRadians() ); } ////////////////////////////////////////////////////// diff --git a/library.properties b/library.properties index 39b1ed4..b7767f9 100644 --- a/library.properties +++ b/library.properties @@ -1,4 +1,4 @@ -name=RoveBoardTivaC +name=RoveEncoder version=1.0.0 author=MST MRDT maintainer=Judah