Skip to content

Rename CurieTimer to CurieTimerOne for Jira-532 #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 23, 2016
Merged

Rename CurieTimer to CurieTimerOne for Jira-532 #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libraries/CurieTimerOne/CurieTimer.cpp → libraries/CurieTimerOne/CurieTimerOne.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

//***************************************************************
//
// Module: CurieTimer
// Module: CurieTimerOne
//
//
// Notes:
Expand All @@ -35,7 +35,7 @@
//***************************************************************


#include "CurieTimer.h"
#include "CurieTimerOne.h"
#include <conf.h>

CurieTimer CurieTimerOne;
Expand Down
10 changes: 5 additions & 5 deletions libraries/CurieTimerOne/CurieTimer.h → libraries/CurieTimerOne/CurieTimerOne.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@

//***************************************************************
//
// File: CurieTimer.h
// File: CurieTimerOne.h
//
// Description:
// Class definitions for library CurieTimer.
// Class definitions for library CurieTimerOne.
//
// Notes:
//
Expand All @@ -38,8 +38,8 @@
//***************************************************************


#ifndef CurieTime_h
#define CurieTime_h
#ifndef CurieTimerOne_h
#define CurieTimerOne_h

#include <Arduino.h>
#include <aux_regs.h>
Expand Down Expand Up @@ -160,5 +160,5 @@ class CurieTimer
extern CurieTimer CurieTimerOne;


#endif // CurieTime_h
#endif // CurieTimerOne_h

2 changes: 1 addition & 1 deletion libraries/CurieTimerOne/examples/CurieTimer1Interrupt/CurieTimer1Interrupt.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// intervals (speed).
//

#include "CurieTimer.h"
#include "CurieTimerOne.h"

// Uncomment the following statement to enable logging on serial port.
// #define SERIAL_PORT_LOG_ENABLE 1
Expand Down
2 changes: 1 addition & 1 deletion libraries/CurieTimerOne/examples/CurieTimer1PWM/CurieTimer1PWM.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "CurieTimer.h"
#include "CurieTimerOne.h"

void setup() {
// Setup a PWM signal on pin 13, onboard LED, with a 25% duty cycle
Expand Down