examples: Remove heap allocation from C++ examples

Cleanup of UPM C++ examples.  Switched from heap allocation to
stack allocation when possible.  This simplifies the samples since it
removes the need for explicit memory management.  A script was used to
identify and replace pointer use.  To simplify the replace script, I
re-formatted the C++ examples using the UPM .clang-format file.
Unfortuantely this changes the look of the UPM C++ examples to a large
degree.  However, examples will now have a standard look/feel and
uniform formatting.

    * Ran clang-format w/provided UPM .clang-format file
    * Removed new's/delete's whenever possible (left those in interface
      examples)
    * Added IIO sensor library implementation of callback void* arg
    * Converted all sleeps to upm defined delays (added header when
      necessary)
    * Scrubbed CXX example includes

Signed-off-by: Noel Eck <noel.eck@intel.com>
This commit is contained in:
Noel Eck
2017-08-30 15:00:29 -07:00
committed by Mihai Tudor Panu
parent bd6e4ec786
commit 5cefe7f5f3
290 changed files with 7976 additions and 8520 deletions

View File

@ -22,91 +22,81 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <unistd.h>
#include <iostream>
#include <signal.h>
#include "zfm20.hpp"
using namespace std;
using namespace upm;
int main (int argc, char **argv)
int
main(int argc, char** argv)
{
//! [Interesting]
// Instantiate a ZFM20 Fingerprint reader on UART 0
//! [Interesting]
// Instantiate a ZFM20 Fingerprint reader on UART 0
upm::ZFM20* fp = new upm::ZFM20(0);
upm::ZFM20 fp(0);
// make sure port is initialized properly. 57600 baud is the default.
if (!fp->setupTty(B57600))
{
cerr << "Failed to setup tty port parameters" << endl;
return 1;
// make sure port is initialized properly. 57600 baud is the default.
if (!fp.setupTty(B57600)) {
cerr << "Failed to setup tty port parameters" << endl;
return 1;
}
// first, set the default password and address
fp->setPassword(ZFM20_DEFAULT_PASSWORD);
fp->setAddress(ZFM20_DEFAULT_ADDRESS);
// now verify the password. If this fails, any other commands
// will be ignored, so we just bail.
if (fp->verifyPassword())
{
cout << "Password verified." << endl;
}
else
{
cerr << "Password verification failed." << endl;
return 1;
// first, set the default password and address
fp.setPassword(ZFM20_DEFAULT_PASSWORD);
fp.setAddress(ZFM20_DEFAULT_ADDRESS);
// now verify the password. If this fails, any other commands
// will be ignored, so we just bail.
if (fp.verifyPassword()) {
cout << "Password verified." << endl;
} else {
cerr << "Password verification failed." << endl;
return 1;
}
// how many valid stored templates (fingerprints) do we have?
cout << "Total stored templates: " << fp->getNumTemplates() << endl;
cout << endl;
// how many valid stored templates (fingerprints) do we have?
cout << "Total stored templates: " << fp.getNumTemplates() << endl;
cout << endl;
// now spin waiting for a fingerprint to successfully image
cout << "Waiting for finger print..." << endl;
// now spin waiting for a fingerprint to successfully image
cout << "Waiting for finger print..." << endl;
while (fp->generateImage() == ZFM20::ERR_NO_FINGER)
;
while (fp.generateImage() == ZFM20::ERR_NO_FINGER)
;
// in theory, we have an image
cout << "Image captured, converting..." << endl;
// in theory, we have an image
cout << "Image captured, converting..." << endl;
uint8_t rv;
if ((rv = fp->image2Tz(1)) != ZFM20::ERR_OK)
{
cerr << "Image conversion failed with error code " << int(rv) <<endl;
return 1;
uint8_t rv;
if ((rv = fp.image2Tz(1)) != ZFM20::ERR_OK) {
cerr << "Image conversion failed with error code " << int(rv) << endl;
return 1;
}
cout << "Image conversion succeeded." << endl;
cout << "Searching database..." << endl;
cout << "Image conversion succeeded." << endl;
cout << "Searching database..." << endl;
uint16_t id = 0;
uint16_t score = 0;
uint16_t id = 0;
uint16_t score = 0;
// we search for a print matching slot 1, where we shored our last
// converted fingerprint
if ((rv = fp->search(1, &id, &score)) != ZFM20::ERR_OK)
{
if (rv == ZFM20::ERR_FP_NOTFOUND)
{
cout << "Finger Print not found" << endl;
return 0;
}
else
{
cerr << "Search failed with error code " << int(rv) <<endl;
return 1;
// we search for a print matching slot 1, where we shored our last
// converted fingerprint
if ((rv = fp.search(1, &id, &score)) != ZFM20::ERR_OK) {
if (rv == ZFM20::ERR_FP_NOTFOUND) {
cout << "Finger Print not found" << endl;
return 0;
} else {
cerr << "Search failed with error code " << int(rv) << endl;
return 1;
}
}
cout << "Fingerprint found!" << endl;
cout << "ID: " << int(id) << ", Score: " << int(score) << endl;
cout << "Fingerprint found!" << endl;
cout << "ID: " << int(id) << ", Score: " << int(score) << endl;
//! [Interesting]
//! [Interesting]
delete fp;
return 0;
return 0;
}