Schoumi
/
microbit-dal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

microbit: whitespace changes to MicroBitButton.h and .cpp 

Cleared the files of trailing whitespace, and tabulated lines
master
James Devine 2016-01-13 14:07:10 +00:00
parent e46ca3fc34
commit d2df88417b
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
inc/MicroBitButton.h
View File

@ -17,8 +17,8 @@
#define MICROBIT_BUTTON_EVT_HOLD 5
#define MICROBIT_BUTTON_EVT_DOUBLE_CLICK 6
#define MICROBIT_BUTTON_LONG_CLICK_TIME 1000
#define MICROBIT_BUTTON_HOLD_TIME 1500
#define MICROBIT_BUTTON_LONG_CLICK_TIME 1000
#define MICROBIT_BUTTON_HOLD_TIME 1500
#define MICROBIT_BUTTON_STATE 1
#define MICROBIT_BUTTON_STATE_HOLD_TRIGGERED 2
@ -47,27 +47,27 @@ class MicroBitButton : public MicroBitComponent
{
PinName name; // mbed pin name of this pin.
DigitalIn pin; // The mbed object looking after this pin at any point in time (may change!).
unsigned long downStartTime; // used to store the current system clock when a button down event occurs
uint8_t sigma; // integration of samples over time. We use this for debouncing, and noise tolerance for touch sensing
MicroBitButtonEventConfiguration eventConfiguration; // Do we want to generate high level event (clicks), or defer this to another service.
public:
/**
* Constructor.
* Constructor.
* Create a pin representation with the given ID.
* @param id the ID of the new MicroBitButton object.
* @param name the physical pin on the processor that this butotn is connected to.
* @param mode the configuration of internal pullups/pulldowns, as define in the mbed PinMode class. PullNone by default.
*
* Example:
* @code
* @code
* buttonA(MICROBIT_ID_BUTTON_A,MICROBIT_PIN_BUTTON_A); //a number between 0 and 200 inclusive
* @endcode
*
* Possible Events:
* @code
* @code
* MICROBIT_BUTTON_EVT_DOWN
* MICROBIT_BUTTON_EVT_UP
* MICROBIT_BUTTON_EVT_CLICK
@ -77,25 +77,25 @@ class MicroBitButton : public MicroBitComponent
* @endcode
*/
MicroBitButton(uint16_t id, PinName name, MicroBitButtonEventConfiguration eventConfiguration = MICROBIT_BUTTON_ALL_EVENTS, PinMode mode = PullNone);
/**
* Tests if this Button is currently pressed.
* @return 1 if this button is pressed, 0 otherwise.
*
* Example:
* @code
* @code
* if(uBit.buttonA.isPressed())
* print("Pressed!");
* @endcode
*/
int isPressed();
/**
* periodic callback from MicroBit clock.
* Check for state change for this button, and fires a hold event if button is pressed.
*/
*/
virtual void systemTick();
};
#endif

34
source/MicroBitButton.cpp
View File

@ -1,19 +1,19 @@
#include "MicroBit.h"
/**
* Constructor.
* Constructor.
* Create a pin representation with the given ID.
* @param id the ID of the new MicroBitButton object.
* @param name the physical pin on the processor that this butotn is connected to.
* @param mode the configuration of internal pullups/pulldowns, as define in the mbed PinMode class. PullNone by default.
*
* Example:
* @code
* @code
* buttonA(MICROBIT_ID_BUTTON_A,MICROBIT_PIN_BUTTON_A); //a number between 0 and 200 inclusive
* @endcode
*
* Possible Events:
* @code
* @code
* MICROBIT_BUTTON_EVT_DOWN
* MICROBIT_BUTTON_EVT_UP
* MICROBIT_BUTTON_EVT_CLICK
@ -34,9 +34,9 @@ MicroBitButton::MicroBitButton(uint16_t id, PinName name, MicroBitButtonEventCon
/**
* periodic callback from MicroBit clock.
* Check for state change for this button, and fires a hold event if button is pressed.
*/
*/
void MicroBitButton::systemTick()
{
{
//
// If the pin is pulled low (touched), increment our culumative counter.
// otherwise, decrement it. We're essentially building a lazy follower here.
@ -45,37 +45,37 @@ void MicroBitButton::systemTick()
//
if(!pin)
{
if (sigma < MICROBIT_BUTTON_SIGMA_MAX)
sigma++;
if (sigma < MICROBIT_BUTTON_SIGMA_MAX)
sigma++;
}
else
{
if (sigma > MICROBIT_BUTTON_SIGMA_MIN)
if (sigma > MICROBIT_BUTTON_SIGMA_MIN)
sigma--;
}
// Check to see if we have off->on state change.
if(sigma > MICROBIT_BUTTON_SIGMA_THRESH_HI && !(status & MICROBIT_BUTTON_STATE))
{
// Record we have a state change, and raise an event.
status |= MICROBIT_BUTTON_STATE;
MicroBitEvent evt(id,MICROBIT_BUTTON_EVT_DOWN);
//Record the time the button was pressed.
downStartTime=ticks;
downStartTime=ticks;
}
// Check to see if we have on->off state change.
// Check to see if we have on->off state change.
if(sigma < MICROBIT_BUTTON_SIGMA_THRESH_LO && (status & MICROBIT_BUTTON_STATE))
{
status = 0;
MicroBitEvent evt(id,MICROBIT_BUTTON_EVT_UP);
if (eventConfiguration == MICROBIT_BUTTON_ALL_EVENTS)
{
{
//determine if this is a long click or a normal click and send event
if((ticks - downStartTime) >= MICROBIT_BUTTON_LONG_CLICK_TIME)
MicroBitEvent evt(id,MICROBIT_BUTTON_EVT_LONG_CLICK);
MicroBitEvent evt(id,MICROBIT_BUTTON_EVT_LONG_CLICK);
else
MicroBitEvent evt(id,MICROBIT_BUTTON_EVT_CLICK);
}
@ -86,7 +86,7 @@ void MicroBitButton::systemTick()
{
//set the hold triggered event flag
status |= MICROBIT_BUTTON_STATE_HOLD_TRIGGERED;
//fire hold event
MicroBitEvent evt(id,MICROBIT_BUTTON_EVT_HOLD);
}