diff --git a/api/gpio.h b/api/gpio.h index ab9598f..18eb77e 100644 --- a/api/gpio.h +++ b/api/gpio.h @@ -1,28 +1,23 @@ /* - * Author: Thomas Ingleby + * Originally from mbed Microcontroller Library + * Copyright (c) 2006-2013 ARM Limited + * Copyright (c) 2014 Intel Corporation * - * Copyright © 2014 Intel Corporation + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: + * http://www.apache.org/licenses/LICENSE-2.0 * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ +#pragma once + #include #ifdef __cplusplus diff --git a/api/i2c.h b/api/i2c.h index 628a68a..b2acbec 100644 --- a/api/i2c.h +++ b/api/i2c.h @@ -1,26 +1,19 @@ /* - * Author: Brendan Le Foll + * Originally from mbed Microcontroller Library + * Copyright (c) 2006-2013 ARM Limited + * Copyright (c) 2014 Intel Corporation * - * Copyright © 2014 Intel Corporation + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: + * http://www.apache.org/licenses/LICENSE-2.0 * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #pragma once diff --git a/api/i2cslave.h b/api/i2cslave.h index 6674e5c..5d7cfd9 100644 --- a/api/i2cslave.h +++ b/api/i2cslave.h @@ -1,5 +1,7 @@ -/* mbed Microcontroller Library +/* + * Originally from mbed Microcontroller Library * Copyright (c) 2006-2013 ARM Limited + * Copyright (c) 2014 Intel Corporation * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/pwm.h b/api/pwm.h index d57fc7a..4b21f32 100644 --- a/api/pwm.h +++ b/api/pwm.h @@ -1,26 +1,19 @@ /* - * Author: Thomas Ingleby + * Originally from mbed Microcontroller Library + * Copyright (c) 2006-2013 ARM Limited + * Copyright (c) 2014 Intel Corporation * - * Copyright © 2014 Intel Corporation + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: + * http://www.apache.org/licenses/LICENSE-2.0 * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. */ #pragma once diff --git a/examples/blink-io8.cpp b/examples/blink-io8.cpp index 5eeae17..b24413d 100644 --- a/examples/blink-io8.cpp +++ b/examples/blink-io8.cpp @@ -1,3 +1,27 @@ +/* + * Author: Thomas Ingleby + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + #include "stdio.h" #include "maa.h" @@ -10,7 +34,7 @@ main(int argc, char **argv) gpio_init(&gpio, 26); gpio_dir(&gpio, "out"); - while(1){ + while (1){ gpio_write(&gpio, 0); sleep(1); gpio_write(&gpio, 1); diff --git a/examples/cycle-pwm3.cpp b/examples/cycle-pwm3.cpp index a24dce9..b59705c 100644 --- a/examples/cycle-pwm3.cpp +++ b/examples/cycle-pwm3.cpp @@ -1,3 +1,27 @@ +/* + * Author: Thomas Ingleby + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + #include #include "maa.h" @@ -5,20 +29,20 @@ int main () { - maa::PWM pwm(0, 3); - pwm.period_us(200); - pwm.enable(1); + maa::PWM pwm(0, 3); + pwm.period_us(200); + pwm.enable(1); - float value = 0.0f; + float value = 0.0f; - while(1) { - value = value + 0.01f; - pwm.write(value); - usleep(50000); - if (value >= 1.0f) { - value = 0.0f; + while(1) { + value = value + 0.01f; + pwm.write(value); + usleep(50000); + if (value >= 1.0f) { + value = 0.0f; + } + float output = pwm.read(); } - float output = pwm.read(); - } - return 0; + return 0; } diff --git a/examples/hellomaa.cpp b/examples/hellomaa.cpp index ba373ac..67db5a7 100644 --- a/examples/hellomaa.cpp +++ b/examples/hellomaa.cpp @@ -1,3 +1,27 @@ +/* + * Author: Brendan Le Foll + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + #include "stdio.h" #include "maa.h" diff --git a/examples/i2c_HMC5883L.cpp b/examples/i2c_HMC5883L.cpp index a6dee12..e1d8cd6 100644 --- a/examples/i2c_HMC5883L.cpp +++ b/examples/i2c_HMC5883L.cpp @@ -1,3 +1,27 @@ +/* + * Author: Brendan Le Foll + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + #include "maa.h" #include "math.h" @@ -54,41 +78,41 @@ int main () { - float direction = 0; - int16_t x = 0, y = 0, z = 0; - char rx_tx_buf[MAX_BUFFER_LENGTH]; + float direction = 0; + int16_t x = 0, y = 0, z = 0; + char rx_tx_buf[MAX_BUFFER_LENGTH]; - maa::I2CSlave i2c(26, 27); - - i2c.address(HMC5883L_I2C_ADDR); - rx_tx_buf[0] = HMC5883L_CONF_REG_B; - rx_tx_buf[1] = GA_1_3_REG; - i2c.write(rx_tx_buf, 2); - - i2c.address(HMC5883L_I2C_ADDR); - rx_tx_buf[0] = HMC5883L_MODE_REG; - rx_tx_buf[1] = HMC5883L_CONT_MODE; - i2c.write(rx_tx_buf, 2); - - for(;;) { - i2c.address(HMC5883L_I2C_ADDR); - i2c.write(HMC5883L_DATA_REG); + maa::I2CSlave i2c(26, 27); i2c.address(HMC5883L_I2C_ADDR); - i2c.read(rx_tx_buf, DATA_REG_SIZE); + rx_tx_buf[0] = HMC5883L_CONF_REG_B; + rx_tx_buf[1] = GA_1_3_REG; + i2c.write(rx_tx_buf, 2); - 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] ; - y = (rx_tx_buf[HMC5883L_Y_MSB_REG] << 8 ) | rx_tx_buf[HMC5883L_Y_LSB_REG] ; + i2c.address(HMC5883L_I2C_ADDR); + rx_tx_buf[0] = HMC5883L_MODE_REG; + rx_tx_buf[1] = HMC5883L_CONT_MODE; + i2c.write(rx_tx_buf, 2); - //scale and calculate direction - direction = atan2(y * SCALE_0_92_MG, x * SCALE_0_92_MG); + for(;;) { + i2c.address(HMC5883L_I2C_ADDR); + i2c.write(HMC5883L_DATA_REG); - //check if the signs are reversed - if (direction < 0) - direction += 2 * M_PI; + i2c.address(HMC5883L_I2C_ADDR); + i2c.read(rx_tx_buf, DATA_REG_SIZE); - printf("Compass scaled data x : %f, y : %f, z : %f\n", x * SCALE_0_92_MG, y * SCALE_0_92_MG, z * SCALE_0_92_MG) ; - printf("Heading : %f\n", direction * 180/M_PI) ; - } + 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] ; + y = (rx_tx_buf[HMC5883L_Y_MSB_REG] << 8 ) | rx_tx_buf[HMC5883L_Y_LSB_REG] ; + + //scale and calculate direction + direction = atan2(y * SCALE_0_92_MG, x * SCALE_0_92_MG); + + //check if the signs are reversed + if (direction < 0) + direction += 2 * M_PI; + + printf("Compass scaled data x : %f, y : %f, z : %f\n", x * SCALE_0_92_MG, y * SCALE_0_92_MG, z * SCALE_0_92_MG) ; + printf("Heading : %f\n", direction * 180/M_PI) ; + } } diff --git a/examples/javascript/example.js b/examples/javascript/example.js index 19aa624..3ca12a4 100644 --- a/examples/javascript/example.js +++ b/examples/javascript/example.js @@ -1,3 +1,27 @@ +/* + * Author: Brendan Le Foll + * Copyright (c) 2014 Intel Corporation. + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION + * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + var m = require("maajs") console.log("maa version: " + m.get_version()); diff --git a/examples/python/blink-io8.py b/examples/python/blink-io8.py index 3641283..26ebe3c 100644 --- a/examples/python/blink-io8.py +++ b/examples/python/blink-io8.py @@ -1,4 +1,26 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python + +# Author: Thomas Ingleby +# Copyright (c) 2014 Intel Corporation. +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# 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 time diff --git a/examples/python/cycle-pwm3.py b/examples/python/cycle-pwm3.py index e5f7a3b..290d16f 100644 --- a/examples/python/cycle-pwm3.py +++ b/examples/python/cycle-pwm3.py @@ -1,4 +1,26 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python + +# Author: Thomas Ingleby +# Copyright (c) 2014 Intel Corporation. +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# 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 time diff --git a/examples/python/hello_gpio.py b/examples/python/hello_gpio.py index c2c2831..022a528 100644 --- a/examples/python/hello_gpio.py +++ b/examples/python/hello_gpio.py @@ -1,4 +1,26 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python + +# Author: Thomas Ingleby +# Copyright (c) 2014 Intel Corporation. +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# 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 diff --git a/examples/python/readi2c.py b/examples/python/readi2c.py index e4234fb..438e259 100644 --- a/examples/python/readi2c.py +++ b/examples/python/readi2c.py @@ -1,10 +1,32 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python + +# Author: Brendan Le Foll +# Copyright (c) 2014 Intel Corporation. +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# 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 x = pymaa.I2CSlave(27,28) x.address(0x62) -y= " " +y= " " ret = x.read(y, 2) print(y) diff --git a/include/smbus.h b/include/smbus.h index d9eb7c8..469f0f9 100644 --- a/include/smbus.h +++ b/include/smbus.h @@ -44,7 +44,7 @@ typedef union i2c_smbus_data_union { uint8_t byte; ///< data byte unsigned short word; ///< data short word - uint8_t block[I2C_SMBUS_BLOCK_MAX + 2]; + uint8_t block[I2C_SMBUS_BLOCK_MAX + 2]; ///< block[0] is used for length and one more for PEC } i2c_smbus_data_t; @@ -60,11 +60,11 @@ typedef struct i2c_smbus_ioctl_data_struct // Prototypes // --------------------------------------------------------------------------- -extern int i2c_smbus_access(int fd, uint8_t read_write, uint8_t command, +extern int i2c_smbus_access(int fd, uint8_t read_write, uint8_t command, int size, i2c_smbus_data_t *data); extern int i2c_smbus_write_quick(int fd, uint8_t value); - + extern int i2c_smbus_read_byte(int fd); extern int i2c_smbus_write_byte(int fd, uint8_t value); diff --git a/src/gpio/gpio.c b/src/gpio/gpio.c index 1538956..dd62fac 100644 --- a/src/gpio/gpio.c +++ b/src/gpio/gpio.c @@ -1,7 +1,6 @@ /* * Author: Thomas Ingleby - * - * Copyright © 2014 Intel Corporation + * Copyright (c) 2014 Intel Corporation. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/src/i2c/i2c.cxx b/src/i2c/i2c.cxx index 44d82bd..e2f1912 100644 --- a/src/i2c/i2c.cxx +++ b/src/i2c/i2c.cxx @@ -1,6 +1,6 @@ /* * Author: Brendan Le Foll - * Copyright © 2014 Intel Corporation + * Copyright (c) 2014 Intel Corporation. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/src/i2c/i2cslave.cxx b/src/i2c/i2cslave.cxx index 3f700fd..92f08d2 100644 --- a/src/i2c/i2cslave.cxx +++ b/src/i2c/i2cslave.cxx @@ -1,6 +1,6 @@ /* * Author: Brendan Le Foll - * Copyright © 2014 Intel Corporation + * Copyright (c) 2014 Intel Corporation. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/src/i2c/smbus.c b/src/i2c/smbus.c index 68ceef7..4f8c12b 100644 --- a/src/i2c/smbus.c +++ b/src/i2c/smbus.c @@ -67,7 +67,7 @@ extern "C" { * Returns \h_ge 0 on success. * Else errno is set appropriately and -1 is returned. */ -int i2c_smbus_access(int fd, uint8_t read_write, uint8_t command, +int i2c_smbus_access(int fd, uint8_t read_write, uint8_t command, int size, i2c_smbus_data_t *data) { i2c_smbus_ioctl_data_t args; @@ -94,7 +94,7 @@ int i2c_smbus_write_quick(int fd, uint8_t value) { return i2c_smbus_access(fd, value, I2C_NOCMD, I2C_SMBUS_QUICK, NULL); } - + /*! * \brief Read an immediate byte from the SMBus. * diff --git a/src/maa.cxx b/src/maa.cxx index 56da190..5a80c0d 100644 --- a/src/maa.cxx +++ b/src/maa.cxx @@ -1,9 +1,6 @@ /* - * Copyright (C) Intel Corporation. - * - * Author: Brendan Le Foll - * - * Copyright © 2014 Intel Corporation + * Author: Brendan Le Foll + * Copyright (c) 2014 Intel Corporation. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the diff --git a/src/pwm/pwm.cxx b/src/pwm/pwm.cxx index bd1fecd..b29f149 100644 --- a/src/pwm/pwm.cxx +++ b/src/pwm/pwm.cxx @@ -1,7 +1,6 @@ /* * Author: Thomas Ingleby - * - * Copyright © 2014 Intel Corporation + * Copyright (c) 2014 Intel Corporation. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the