Skip to content

Removed Floating point math #20

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

Open
ShuzzDE wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Removed Floating point math #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a843da
Removed floating point math
ShuzzDE Jun 7, 2017
00eb90d
Changed datatypes
ShuzzDE Jun 7, 2017
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
10 changes: 5 additions & 5 deletions CapacitiveSensor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ CapacitiveSensor::CapacitiveSensor(uint8_t sendPin, uint8_t receivePin)
// initialize this instance's variables
// Serial.begin(9600); // for debugging
error = 1;
loopTimingFactor = 310; // determined empirically - a hack
loopTimingFactor = 310l; // determined empirically - a hack

CS_Timeout_Millis = (2000 * (float)loopTimingFactor * (float)F_CPU) / 16000000;
CS_Timeout_Millis = (2000l * loopTimingFactor * F_CPU) / 16000000l;
CS_AutocaL_Millis = 20000;

// Serial.print("timwOut = ");
Expand Down Expand Up @@ -74,7 +74,7 @@ long CapacitiveSensor::capacitiveSensor(uint8_t samples)
// only calibrate if time is greater than CS_AutocaL_Millis and total is less than 10% of baseline
// this is an attempt to keep from calibrating when the sensor is seeing a "touched" signal

if ( (millis() - lastCal > CS_AutocaL_Millis) && abs(total - leastTotal) < (int)(.10 * (float)leastTotal) ) {
if ( (millis() - lastCal > CS_AutocaL_Millis) && abs(total - leastTotal) < (leastTotal / 10) ) {

// Serial.println(); // debugging
// Serial.println("auto-calibrate");
Expand Down Expand Up @@ -127,8 +127,8 @@ void CapacitiveSensor::set_CS_AutocaL_Millis(unsigned long autoCal_millis){
CS_AutocaL_Millis = autoCal_millis;
}

void CapacitiveSensor::set_CS_Timeout_Millis(unsigned long timeout_millis){
CS_Timeout_Millis = (timeout_millis * (float)loopTimingFactor * (float)F_CPU) / 16000000; // floats to deal with large numbers
void CapacitiveSensor::set_CS_Timeout_Millis(long timeout_millis){
CS_Timeout_Millis = (timeout_millis * loopTimingFactor * F_CPU) / 16000000l;
}

// Private Methods /////////////////////////////////////////////////////////////
Expand Down
4 changes: 2 additions & 2 deletions CapacitiveSensor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,15 +81,15 @@ class CapacitiveSensor
CapacitiveSensor(uint8_t sendPin, uint8_t receivePin);
long capacitiveSensorRaw(uint8_t samples);
long capacitiveSensor(uint8_t samples);
void set_CS_Timeout_Millis(unsigned long timeout_millis);
void set_CS_Timeout_Millis(long timeout_millis);
void reset_CS_AutoCal();
void set_CS_AutocaL_Millis(unsigned long autoCal_millis);
// library-accessible "private" interface
private:
// variables
int error;
unsigned long leastTotal;
unsigned int loopTimingFactor;
long loopTimingFactor;
unsigned long CS_Timeout_Millis;
unsigned long CS_AutocaL_Millis;
unsigned long lastCal;
Expand Down