Skip to content
This repository has been archived by the owner on Nov 26, 2024. It is now read-only.

Commit

Permalink
Stupid GIT
Browse files Browse the repository at this point in the history
  • Loading branch information
arjo129 committed Feb 23, 2014
1 parent b88c943 commit b9df529
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions uspeech.h
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ class signal{
unsigned int complexity(int power);
};

<<<<<<< HEAD
class statCollector {
public:
//Note: May be necessary to change to double type.
Expand All @@ -71,8 +70,7 @@ class statCollector {

};

=======
>>>>>>> 427ae8b6cb8d6e772c5f0035507f6aaea02857ce

/**
* Simple Accumulator Vector. Stores simple syllables. Useful for basic word recognition.
*/
Expand All @@ -83,10 +81,6 @@ class syllable{
void reset(); /*!< Resets the accumulator so a new syllable can be formed. Call this when you detect silence*/
void classify(char c);
int* tointptr(); /*!< Returns the vector from the accumulators as an integer pointer */
<<<<<<< HEAD
void reset(); /*!< Resets Accumulator*/
=======
>>>>>>> 427ae8b6cb8d6e772c5f0035507f6aaea02857ce
#if ARDUINO_ENVIRONMENT > 0
void debugPrint(); /*!< Outputs the datain the accumulator vector. Only enabled for arduino.*/
#endif
Expand Down

0 comments on commit b9df529

Please sign in to comment.