mraa: change all existing code to use libmraa.

* Made CMake depend on 0.4 libmraa

Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2014-06-25 10:05:27 +01:00
parent 8d25ecacdd
commit 36be22cb90
53 changed files with 640 additions and 640 deletions

View File

@ -30,22 +30,22 @@
using namespace upm;
Buzzer::Buzzer (int pinNumber) {
m_pwm_context = maa_pwm_init (pinNumber);
m_pwm_context = mraa_pwm_init (pinNumber);
m_name = "Buzzer";
}
int Buzzer::playSound (int note, int delay) {
maa_pwm_enable (m_pwm_context, 1);
maa_pwm_period_us (m_pwm_context, note);
maa_pwm_pulsewidth_us (m_pwm_context, note / 2);
mraa_pwm_enable (m_pwm_context, 1);
mraa_pwm_period_us (m_pwm_context, note);
mraa_pwm_pulsewidth_us (m_pwm_context, note / 2);
usleep (delay);
maa_pwm_enable (m_pwm_context, 0);
mraa_pwm_enable (m_pwm_context, 0);
return note;
}
Buzzer::~Buzzer() {
maa_pwm_close(m_pwm_context);
std::cout << "executed maa_pwm_close" << std::endl;
mraa_pwm_close(m_pwm_context);
std::cout << "executed mraa_pwm_close" << std::endl;
}

View File

@ -24,7 +24,7 @@
#pragma once
#include <string>
#include <maa/pwm.h>
#include <mraa/pwm.h>
#define DO 3300 // 261 Hz 3830
#define RE 2930 // 294 Hz
@ -76,6 +76,6 @@ class Buzzer {
protected:
std::string m_name;
private:
maa_pwm_context m_pwm_context;
mraa_pwm_context m_pwm_context;
};
}