Raspberries/mraa
Private
Public Access
2
0
Fork 0
Code Activity

mraa: rename from maa to mraa

Browse Source 
Signed-off-by: Thomas Ingleby <thomas.c.ingleby@intel.com>
This commit is contained in:
Thomas Ingleby
2014-06-24 17:24:54 +01:00
parent 79d0da4853
commit 6853997a92
74 changed files with 966 additions and 966 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
examples/CMakeLists.txt
View File

@@ -1,5 +1,5 @@
add_executable (i2c_HMC5883L i2c_HMC5883L.c)
add_executable (hellomaa hellomaa.c)
add_executable (hellomraa hellomraa.c)
add_executable (cycle-pwm3 cycle-pwm3.c)
add_executable (blink-io blink-io.c)
add_executable (analogin_a0 analogin_a0.c)
@@ -11,17 +11,17 @@ add_executable (blink_onboard blink_onboard.c)
include_directories(${PROJECT_SOURCE_DIR}/api)
target_link_libraries (hellomaa maa)
target_link_libraries (i2c_HMC5883L maa m)
target_link_libraries (cycle-pwm3 maa)
target_link_libraries (blink-io maa)
target_link_libraries (analogin_a0 maa)
target_link_libraries (isr_pin6 maa)
target_link_libraries (gpio_read6 maa)
target_link_libraries (spi_mcp4261 maa)
target_link_libraries (mmap-io2 maa)
target_link_libraries (blink_onboard maa)
target_link_libraries (hellomraa mraa)
target_link_libraries (i2c_HMC5883L mraa m)
target_link_libraries (cycle-pwm3 mraa)
target_link_libraries (blink-io mraa)
target_link_libraries (analogin_a0 mraa)
target_link_libraries (isr_pin6 mraa)
target_link_libraries (gpio_read6 mraa)
target_link_libraries (spi_mcp4261 mraa)
target_link_libraries (mmap-io2 mraa)
target_link_libraries (blink_onboard mraa)
add_subdirectory (c++)
install (DIRECTORY ${PROJECT_SOURCE_DIR}/examples/ DESTINATION share/maa/examples)
install (DIRECTORY ${PROJECT_SOURCE_DIR}/examples/ DESTINATION share/mraa/examples)

12
examples/analogin_a0.c
View File

@@ -24,25 +24,25 @@
#include <unistd.h>
//! [Interesting]
#include "maa/aio.h"
#include "mraa/aio.h"
int main ()
{
maa_aio_context adc_a0;
mraa_aio_context adc_a0;
uint16_t adc_value = 0;
adc_a0 = maa_aio_init(0);
adc_a0 = mraa_aio_init(0);
if (adc_a0 == NULL) {
return 1;
}
for(;;) {
adc_value = maa_aio_read(adc_a0);
adc_value = mraa_aio_read(adc_a0);
fprintf(stdout, "ADC A0 read %X - %d\n", adc_value, adc_value);
}
maa_aio_close(adc_a0);
mraa_aio_close(adc_a0);
return MAA_SUCCESS;
return MRAA_SUCCESS;
}
//! [Interesting]

38
examples/blink-io.c
View File

@@ -28,7 +28,7 @@
#include <signal.h>
#include <stdlib.h>
#include "maa.h"
#include "mraa.h"
#define DEFAULT_IOPIN 8
@@ -47,7 +47,7 @@ sig_handler(int signo)
int
main(int argc, char **argv)
{
maa_result_t r = MAA_SUCCESS;
mraa_result_t r = MRAA_SUCCESS;
iopin = DEFAULT_IOPIN;
if (argc < 2) {
@@ -56,12 +56,12 @@ main(int argc, char **argv)
iopin = strtol(argv[1], NULL, 10);
}
maa_init();
fprintf(stdout, "MAA Version: %s\nStarting Blinking on IO%d\n",
maa_get_version(), iopin);
mraa_init();
fprintf(stdout, "MRAA Version: %s\nStarting Blinking on IO%d\n",
mraa_get_version(), iopin);
maa_gpio_context gpio;
gpio = maa_gpio_init(iopin);
mraa_gpio_context gpio;
gpio = mraa_gpio_init(iopin);
if (gpio == NULL) {
fprintf(stderr, "Are you sure that pin%d you requested is valid on your platform?", iopin);
exit(1);
@@ -69,26 +69,26 @@ main(int argc, char **argv)
printf("Initialised pin%d\n", iopin);
// set direction to OUT
r = maa_gpio_dir(gpio, MAA_GPIO_OUT);
if (r != MAA_SUCCESS) {
maa_result_print(r);
r = mraa_gpio_dir(gpio, MRAA_GPIO_OUT);
if (r != MRAA_SUCCESS) {
mraa_result_print(r);
}
signal(SIGINT, sig_handler);
while (running == 0) {
r = maa_gpio_write(gpio, 0);
if (r != MAA_SUCCESS) {
maa_result_print(r);
r = mraa_gpio_write(gpio, 0);
if (r != MRAA_SUCCESS) {
mraa_result_print(r);
} else {
printf("off\n");
}
sleep(1);
r = maa_gpio_write(gpio, 1);
if (r != MAA_SUCCESS) {
maa_result_print(r);
r = mraa_gpio_write(gpio, 1);
if (r != MRAA_SUCCESS) {
mraa_result_print(r);
} else {
printf("on\n");
}
@@ -96,9 +96,9 @@ main(int argc, char **argv)
sleep(1);
}
r = maa_gpio_close(gpio);
if (r != MAA_SUCCESS) {
maa_result_print(r);
r = mraa_gpio_close(gpio);
if (r != MRAA_SUCCESS) {
mraa_result_print(r);
}
return r;

22
examples/blink_onboard.c
View File

@@ -24,34 +24,34 @@
#include "stdio.h"
#include <string.h>
#include "maa/gpio.h"
#include "mraa/gpio.h"
int
main(int argc, char **argv)
{
maa_platform_t platform = maa_get_platform_type();
maa_gpio_context gpio;
mraa_platform_t platform = mraa_get_platform_type();
mraa_gpio_context gpio;
char board_name[] = "Some weird devboard that isn't recognised...";
int ledstate = 0;
switch (platform) {
case MAA_INTEL_GALILEO_GEN1:
case MRAA_INTEL_GALILEO_GEN1:
strcpy(board_name, "Intel Galileo Gen1");
gpio = maa_gpio_init_raw(3);
gpio = mraa_gpio_init_raw(3);
break;
case MAA_INTEL_GALILEO_GEN2:
case MRAA_INTEL_GALILEO_GEN2:
strcpy(board_name, "Intel Galileo Gen2");
default:
gpio = maa_gpio_init(13);
gpio = mraa_gpio_init(13);
}
fprintf(stdout, "Welcome to libmaa\n Version: %s\n Running on %d",
maa_get_version(), board_name);
fprintf(stdout, "Welcome to libmraa\n Version: %s\n Running on %d",
mraa_get_version(), board_name);
maa_gpio_dir(gpio, MAA_GPIO_OUT);
mraa_gpio_dir(gpio, MRAA_GPIO_OUT);
for (;;) {
ledstate = !ledstate;
maa_gpio_write(gpio, !ledstate);
mraa_gpio_write(gpio, !ledstate);
sleep(1);
}

10
examples/c++/AioA0.cpp
View File

@@ -23,16 +23,16 @@
*/
//! [Interesting]
#include "maa.hpp"
#include "mraa.hpp"
int main ()
{
uint16_t adc_value;
maa::Aio* a0;
mraa::Aio* a0;
a0 = new maa::Aio(0);
a0 = new mraa::Aio(0);
if (a0 == NULL) {
return MAA_ERROR_UNSPECIFIED;
return MRAA_ERROR_UNSPECIFIED;
}
for(;;) {
@@ -40,6 +40,6 @@ int main ()
fprintf(stdout, "ADC A0 read %X - %d\n", adc_value, adc_value);
}
return MAA_SUCCESS;
return MRAA_SUCCESS;
}
//! [Interesting]

12
examples/c++/Blink-IO.cpp
View File

@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <unistd.h>
#include "maa.hpp"
#include "mraa.hpp"
#define DEFAULT_IOPIN 8
static int iopin;
@@ -55,13 +55,13 @@ int main (int argc, char **argv)
signal(SIGINT, sig_handler);
//! [Interesting]
maa::Gpio* gpio = new maa::Gpio(iopin);
mraa::Gpio* gpio = new mraa::Gpio(iopin);
if (gpio == NULL) {
return MAA_ERROR_UNSPECIFIED;
return MRAA_ERROR_UNSPECIFIED;
}
int response = gpio->dir(maa::DIR_OUT);
if (response != MAA_SUCCESS)
maa_result_print((maa_result_t) MAA_SUCCESS);
int response = gpio->dir(mraa::DIR_OUT);
if (response != MRAA_SUCCESS)
mraa_result_print((mraa_result_t) MRAA_SUCCESS);
while (running == 0) {
response = gpio->write(1);

10
examples/c++/CMakeLists.txt
View File

@@ -6,8 +6,8 @@ add_executable (Spi-pot Spi-pot.cpp)
include_directories(${PROJECT_SOURCE_DIR}/api)
target_link_libraries (AioA0 maa stdc++)
target_link_libraries (blink-io-cpp maa stdc++)
target_link_libraries (Pwm3-cycle maa stdc++)
target_link_libraries (I2c-compass maa stdc++ m)
target_link_libraries (Spi-pot maa stdc++)
target_link_libraries (AioA0 mraa stdc++)
target_link_libraries (blink-io-cpp mraa stdc++)
target_link_libraries (Pwm3-cycle mraa stdc++)
target_link_libraries (I2c-compass mraa stdc++ m)
target_link_libraries (Spi-pot mraa stdc++)

8
examples/c++/I2c-compass.cpp
View File

@@ -26,7 +26,7 @@
#include <unistd.h>
#include <signal.h>
#include "maa.hpp"
#include "mraa.hpp"
#include "math.h"
#define MAX_BUFFER_LENGTH 6
@@ -98,8 +98,8 @@ int main ()
uint8_t rx_tx_buf[MAX_BUFFER_LENGTH];
//! [Interesting]
maa::I2c* i2c;
i2c = new maa::I2c(0);
mraa::I2c* i2c;
i2c = new mraa::I2c(0);
i2c->address(HMC5883L_I2C_ADDR);
rx_tx_buf[0] = HMC5883L_CONF_REG_B;
@@ -138,5 +138,5 @@ int main ()
}
delete i2c;
return MAA_SUCCESS;
return MRAA_SUCCESS;
}

10
examples/c++/Pwm3-cycle.cpp
View File

@@ -25,7 +25,7 @@
#include <unistd.h>
#include <signal.h>
#include "maa.hpp"
#include "mraa.hpp"
int running = 0;
@@ -42,11 +42,11 @@ int main ()
{
signal(SIGINT, sig_handler);
//! [Interesting]
maa::Pwm* pwm;
mraa::Pwm* pwm;
pwm = new maa::Pwm(3);
pwm = new mraa::Pwm(3);
if (pwm == NULL) {
return MAA_ERROR_UNSPECIFIED;
return MRAA_ERROR_UNSPECIFIED;
}
fprintf(stdout, "Cycling PWM on IO3 (pwm3) \n");
@@ -62,5 +62,5 @@ int main ()
delete pwm;
//! [Interesting]
return MAA_SUCCESS;
return MRAA_SUCCESS;
}

8
examples/c++/Spi-pot.cpp
View File

@@ -26,7 +26,7 @@
#include <signal.h>
#include <stdint.h>
#include "maa.hpp"
#include "mraa.hpp"
int running = 0;
@@ -44,9 +44,9 @@ int main ()
signal(SIGINT, sig_handler);
//! [Interesting]
maa::Spi* spi;
mraa::Spi* spi;
spi = new maa::Spi(0);
spi = new mraa::Spi(0);
uint8_t data[] = {0x00, 100};
uint8_t *recv;
@@ -71,5 +71,5 @@ int main ()
delete spi;
//! [Interesting]
return MAA_SUCCESS;
return MRAA_SUCCESS;
}

16
examples/cycle-pwm3.c
View File

@@ -24,31 +24,31 @@
#include <unistd.h>
#include "maa.h"
#include "mraa.h"
int
main ()
{
maa_init();
mraa_init();
//! [Interesting]
maa_pwm_context pwm;
pwm = maa_pwm_init(3);
mraa_pwm_context pwm;
pwm = mraa_pwm_init(3);
if (pwm == NULL) {
return 1;
}
maa_pwm_period_us(pwm, 200);
maa_pwm_enable(pwm, 1);
mraa_pwm_period_us(pwm, 200);
mraa_pwm_enable(pwm, 1);
float value = 0.0f;
while (1) {
value = value + 0.01f;
maa_pwm_write(pwm, value);
mraa_pwm_write(pwm, value);
usleep(50000);
if (value >= 1.0f) {
value = 0.0f;
}
float output = maa_pwm_read(pwm);
float output = mraa_pwm_read(pwm);
}
//! [Interesting]
return 0;

18
examples/gpio_read6.c
View File

@@ -25,28 +25,28 @@
#include "stdio.h"
#include "unistd.h"
#include "maa.h"
#include "mraa.h"
int
main(int argc, char **argv)
{
maa_init();
fprintf(stdout, "MAA Version: %s\nStarting Read on IO6\n",
maa_get_version());
mraa_init();
fprintf(stdout, "MRAA Version: %s\nStarting Read on IO6\n",
mraa_get_version());
//! [Interesting]
maa_gpio_context gpio;
mraa_gpio_context gpio;
gpio = maa_gpio_init(6);
gpio = mraa_gpio_init(6);
maa_gpio_dir(gpio, MAA_GPIO_IN);
mraa_gpio_dir(gpio, MRAA_GPIO_IN);
for (;;) {
fprintf(stdout, "Gpio is %d\n", maa_gpio_read(gpio));
fprintf(stdout, "Gpio is %d\n", mraa_gpio_read(gpio));
sleep(1);
}
maa_gpio_close(gpio);
mraa_gpio_close(gpio);
//! [Interesting]
return 0;

4
examples/hellomaa.c → examples/hellomraa.c
View File

@@ -24,12 +24,12 @@
#include "stdio.h"
//! [Interesting]
#include "maa.h"
#include "mraa.h"
int
main(int argc, char **argv)
{
fprintf(stdout, "hello maa\n Version: %s\n", maa_get_version());
fprintf(stdout, "hello mraa\n Version: %s\n", mraa_get_version());
return 0;
}
//! [Interesting]

24
examples/i2c_HMC5883L.c
View File

@@ -22,7 +22,7 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "maa.h"
#include "mraa.h"
#include "math.h"
#define MAX_BUFFER_LENGTH 6
@@ -78,32 +78,32 @@
int
main(int argc, char **argv)
{
maa_init();
mraa_init();
float direction = 0;
int16_t x = 0, y = 0, z = 0;
char rx_tx_buf[MAX_BUFFER_LENGTH];
//! [Interesting]
maa_i2c_context i2c;
i2c = maa_i2c_init(0);
mraa_i2c_context i2c;
i2c = mraa_i2c_init(0);
maa_i2c_address(i2c, HMC5883L_I2C_ADDR);
mraa_i2c_address(i2c, HMC5883L_I2C_ADDR);
rx_tx_buf[0] = HMC5883L_CONF_REG_B;
rx_tx_buf[1] = GA_1_3_REG;
maa_i2c_write(i2c, rx_tx_buf, 2);
mraa_i2c_write(i2c, rx_tx_buf, 2);
//! [Interesting]
maa_i2c_address(i2c, HMC5883L_I2C_ADDR);
mraa_i2c_address(i2c, HMC5883L_I2C_ADDR);
rx_tx_buf[0] = HMC5883L_MODE_REG;
rx_tx_buf[1] = HMC5883L_CONT_MODE;
maa_i2c_write(i2c, rx_tx_buf, 2);
mraa_i2c_write(i2c, rx_tx_buf, 2);
for(;;) {
maa_i2c_address(i2c, HMC5883L_I2C_ADDR);
maa_i2c_write_byte(i2c, HMC5883L_DATA_REG);
mraa_i2c_address(i2c, HMC5883L_I2C_ADDR);
mraa_i2c_write_byte(i2c, HMC5883L_DATA_REG);
maa_i2c_address(i2c, HMC5883L_I2C_ADDR);
maa_i2c_read(i2c, rx_tx_buf, DATA_REG_SIZE);
mraa_i2c_address(i2c, HMC5883L_I2C_ADDR);
mraa_i2c_read(i2c, rx_tx_buf, DATA_REG_SIZE);
x = (rx_tx_buf[HMC5883L_X_MSB_REG] << 8 ) | rx_tx_buf[HMC5883L_X_LSB_REG] ;
z = (rx_tx_buf[HMC5883L_Z_MSB_REG] << 8 ) | rx_tx_buf[HMC5883L_Z_LSB_REG] ;

18
examples/isr_pin6.c
View File

@@ -24,7 +24,7 @@
#include <unistd.h>
#include "maa.h"
#include "mraa.h"
static volatile int counter = 0;
static volatile int oldcounter = 0;
@@ -35,19 +35,19 @@ void interrupt (void * args) {
int main ()
{
maa_init();
maa_gpio_context x;
mraa_init();
mraa_gpio_context x;
x = maa_gpio_init(6);
x = mraa_gpio_init(6);
if (x == NULL) {
return 1;
}
maa_gpio_dir(x, MAA_GPIO_IN);
mraa_gpio_dir(x, MRAA_GPIO_IN);
gpio_edge_t edge = MAA_GPIO_EDGE_BOTH;
gpio_edge_t edge = MRAA_GPIO_EDGE_BOTH;
maa_gpio_isr(x, edge, &interrupt, NULL);
mraa_gpio_isr(x, edge, &interrupt, NULL);
for(;;) {
if(counter != oldcounter) {
@@ -58,7 +58,7 @@ int main ()
sleep(1);
}
maa_gpio_close(x);
mraa_gpio_close(x);
return MAA_SUCCESS;
return MRAA_SUCCESS;
}

4
examples/javascript/example.js
View File

@@ -22,8 +22,8 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
var m = require("maajs")
console.log("maa version: " + m.getVersion());
var m = require("mraajs")
console.log("mraa version: " + m.getVersion());
var x = new m.Gpio(8)
x.dir(m.DIR_OUT)

14
examples/mmap-io2.c
View File

@@ -25,22 +25,22 @@
#include "stdio.h"
#include <unistd.h>
#include "maa.h"
#include "mraa.h"
int
main(int argc, char **argv)
{
//! [Interesting]
fprintf(stdout, "hello maa\n Version: %s\n", maa_get_version());
maa_gpio_context gpio;
gpio = maa_gpio_init(2);
fprintf(stdout, "hello mraa\n Version: %s\n", mraa_get_version());
mraa_gpio_context gpio;
gpio = mraa_gpio_init(2);
maa_gpio_use_mmaped(gpio, 1);
mraa_gpio_use_mmaped(gpio, 1);
for (;;) {
maa_gpio_write(gpio , 1);
mraa_gpio_write(gpio , 1);
usleep(50000);
maa_gpio_write(gpio, 0);
mraa_gpio_write(gpio, 0);
usleep(50000);
}
//! [Interesting]

6
examples/python/aio.py
View File

@@ -22,8 +22,8 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import pymaa as maa
import pymraa as mraa
print (maa.getVersion())
x = maa.Aio(0)
print (mraa.getVersion())
x = mraa.Aio(0)
print (x.read())

6
examples/python/blink-io8.py
View File

@@ -22,11 +22,11 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import pymaa as maa
import pymraa as mraa
import time
x = maa.Gpio(8)
x.dir(maa.DIR_OUT)
x = mraa.Gpio(8)
x.dir(mraa.DIR_OUT)
while True:
x.write(1)

4
examples/python/cycle-pwm3.py
View File

@@ -22,10 +22,10 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import pymaa as maa
import pymraa as mraa
import time
x = maa.PWM(0,3)
x = mraa.PWM(0,3)
x.enable(1);
x.period_us(20)
value= 0.0

8
examples/python/hello_gpio.py
View File

@@ -22,9 +22,9 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
import pymaa
import pymraa
print (pymaa.getVersion())
x = pymaa.Gpio(13)
x.dir(pymaa.DIR_OUT)
print (pymraa.getVersion())
x = pymraa.Gpio(13)
x.dir(pymraa.DIR_OUT)
x.write(1)

8
examples/python/hello_isr.py
View File

@@ -22,11 +22,11 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
import pymaa as maa
import pymraa as mraa
def test(args):
print("wooo")
x = maa.Gpio(6)
x.dir(maa.DIR_IN)
x.isr(maa.EDGE_BOTH, test, test)
x = mraa.Gpio(6)
x.dir(mraa.DIR_IN)
x.isr(mraa.EDGE_BOTH, test, test)

4
examples/python/rgblcd.py
View File

@@ -22,11 +22,11 @@
# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE
import pymaa as maa
import pymraa as mraa
# This example will change the LCD backlight on the Grove-LCD RGB backlight
# to a nice shade of purple
x = maa.I2c(0)
x = mraa.I2c(0)
x.address(0x62)
x.writeReg(0,0)
x.writeReg(1,0)

12
examples/spi_mcp4261.c
View File

@@ -22,17 +22,17 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "maa.h"
#include "mraa.h"
#include <unistd.h>
#include <stdint.h>
int
main(int argc, char **argv)
{
maa_init();
mraa_init();
//! [Interesting]
maa_spi_context spi;
spi = maa_spi_init(0);
mraa_spi_context spi;
spi = mraa_spi_init(0);
unsigned int response = 0;
printf("Hello, SPI initialised\n");
uint8_t data[] = {0x00, 100};
@@ -41,14 +41,14 @@ main(int argc, char **argv)
int i;
for (i = 90; i < 130; i++) {
data[1] = i;
recv = maa_spi_write_buf(spi, data, 2);
recv = mraa_spi_write_buf(spi, data, 2);
printf("Writing -%i",i);
printf("RECIVED-%i-%i\n",recv[0],recv[1]);
usleep(100000);
}
for (i = 130; i > 90; i--) {
data[1] = i;
recv = maa_spi_write_buf(spi, data, 2);
recv = mraa_spi_write_buf(spi, data, 2);
printf("Writing -%i",i);
printf("RECIVED-%i-%i\n",recv[0],recv[1]);
usleep(100000);