From 7969282d81cc8e2cca1edec74dcc795817e6d999 Mon Sep 17 00:00:00 2001 From: Mike Duong Date: Thu, 28 Apr 2016 19:01:14 -0700 Subject: [PATCH 1/6] ATLEDGE-553: Modify library examples header info --- libraries/COPYRIGHT_INTEL.README | 18 +++++++++ .../BatteryMonitor/BatteryMonitor.ino | 18 +-------- .../CurieBLE/examples/ButtonLED/ButtonLED.ino | 21 +---------- .../examples/CallbackLED/CallbackLED.ino | 21 +---------- libraries/CurieBLE/examples/LED/LED.ino | 18 +-------- libraries/CurieBLE/src/BLEAttribute.cpp | 17 --------- libraries/CurieBLE/src/BLEAttribute.h | 16 -------- libraries/CurieBLE/src/BLECentral.cpp | 17 --------- libraries/CurieBLE/src/BLECentral.h | 16 -------- libraries/CurieBLE/src/BLECharacteristic.cpp | 16 -------- libraries/CurieBLE/src/BLECharacteristic.h | 16 -------- libraries/CurieBLE/src/BLECommon.h | 16 -------- libraries/CurieBLE/src/BLEDescriptor.cpp | 17 --------- libraries/CurieBLE/src/BLEDescriptor.h | 16 -------- libraries/CurieBLE/src/BLEPeripheral.cpp | 18 --------- libraries/CurieBLE/src/BLEPeripheral.h | 16 -------- libraries/CurieBLE/src/BLEService.cpp | 17 --------- libraries/CurieBLE/src/BLEService.h | 16 -------- .../CurieBLE/src/BLETypedCharacteristic.h | 16 -------- .../CurieBLE/src/BLETypedCharacteristics.cpp | 16 -------- .../CurieBLE/src/BLETypedCharacteristics.h | 16 -------- libraries/CurieBLE/src/BLEUuid.cpp | 16 -------- libraries/CurieBLE/src/BLEUuid.h | 16 -------- libraries/CurieBLE/src/CurieBLE.h | 16 -------- .../src/internal/COPYRIGHT_INTEL.README | 31 ++++++++++++++++ libraries/CurieBLE/src/internal/ble_client.c | 27 -------------- libraries/CurieBLE/src/internal/ble_client.h | 27 -------------- libraries/CurieEEPROM/src/CurieEEPROM.cpp | 15 -------- libraries/CurieEEPROM/src/CurieEEPROM.h | 22 ++--------- .../examples/Accelerometer/Accelerometer.ino | 19 +--------- .../AccelerometerOrientation.ino | 19 +--------- libraries/CurieIMU/examples/COPYRIGHT.README | 32 ++++++++++++++++ libraries/CurieIMU/examples/Gyro/Gyro.ino | 19 +--------- .../RawImuDataSerial/RawImuDataSerial.ino | 33 ++--------------- .../examples/ShockDetect/ShockDetect.ino | 19 +--------- .../CurieIMU/examples/StepCount/StepCount.ino | 19 +--------- .../CurieIMU/examples/TapDetect/TapDetect.ino | 19 +--------- libraries/CurieIMU/src/BMI160.cpp | 33 ++--------------- libraries/CurieIMU/src/BMI160.h | 32 +--------------- .../CurieIMU/src/COPYRIGHT_INTEL_BOSCH.README | 32 ++++++++++++++++ libraries/CurieIMU/src/CurieIMU.cpp | 16 -------- libraries/CurieIMU/src/CurieIMU.h | 16 -------- .../src/internal/COPYRIGHT_SYNOPSYS.README | 37 +++++++++++++++++++ libraries/CurieIMU/src/internal/ss_spi.c | 31 ---------------- libraries/CurieIMU/src/internal/ss_spi.h | 16 -------- libraries/CurieTime/src/CurieTime.cpp | 20 +--------- libraries/CurieTimerOne/src/CurieTimerOne.cpp | 19 ---------- libraries/CurieTimerOne/src/CurieTimerOne.h | 20 ---------- libraries/SPI/src/SPI.cpp | 15 -------- libraries/SPI/src/SPI_registers.h | 15 -------- libraries/Servo/src/Servo.cpp | 22 ++--------- libraries/Servo/src/Servo.h | 21 ++--------- libraries/Wire/src/Wire.cpp | 18 --------- libraries/Wire/src/Wire.h | 15 -------- 54 files changed, 188 insertions(+), 897 deletions(-) create mode 100644 libraries/COPYRIGHT_INTEL.README create mode 100644 libraries/CurieBLE/src/internal/COPYRIGHT_INTEL.README create mode 100644 libraries/CurieIMU/examples/COPYRIGHT.README create mode 100644 libraries/CurieIMU/src/COPYRIGHT_INTEL_BOSCH.README create mode 100644 libraries/CurieIMU/src/internal/COPYRIGHT_SYNOPSYS.README diff --git a/libraries/COPYRIGHT_INTEL.README b/libraries/COPYRIGHT_INTEL.README new file mode 100644 index 00000000..4fca0599 --- /dev/null +++ b/libraries/COPYRIGHT_INTEL.README @@ -0,0 +1,18 @@ +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + diff --git a/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino b/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino index f50bc51b..5dd61bc6 100644 --- a/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino +++ b/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino @@ -1,20 +1,6 @@ /* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ #include /* diff --git a/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino b/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino index 5251a967..aecb0a54 100644 --- a/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino +++ b/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino @@ -1,23 +1,6 @@ /* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110- - 1301 USA -*/ - - + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ #include const int ledPin = 13; // set ledPin to on-board LED diff --git a/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino b/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino index e918ddab..d53687fb 100644 --- a/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino +++ b/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino @@ -1,23 +1,6 @@ /* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110- - 1301 USA -*/ - - + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ #include const int ledPin = 13; // set ledPin to use on-board LED diff --git a/libraries/CurieBLE/examples/LED/LED.ino b/libraries/CurieBLE/examples/LED/LED.ino index bd9af1b0..49eeee56 100644 --- a/libraries/CurieBLE/examples/LED/LED.ino +++ b/libraries/CurieBLE/examples/LED/LED.ino @@ -1,20 +1,6 @@ /* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ #include BLEPeripheral blePeripheral; // BLE Peripheral Device (the board you're programming) diff --git a/libraries/CurieBLE/src/BLEAttribute.cpp b/libraries/CurieBLE/src/BLEAttribute.cpp index d6f46591..c711426f 100644 --- a/libraries/CurieBLE/src/BLEAttribute.cpp +++ b/libraries/CurieBLE/src/BLEAttribute.cpp @@ -1,24 +1,7 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #include "BLEAttribute.h" - #include "BLEUuid.h" unsigned char BLEAttribute::_numAttributes = 0; diff --git a/libraries/CurieBLE/src/BLEAttribute.h b/libraries/CurieBLE/src/BLEAttribute.h index 8aaca067..875fb722 100644 --- a/libraries/CurieBLE/src/BLEAttribute.h +++ b/libraries/CurieBLE/src/BLEAttribute.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _BLE_ATTRIBUTE_H_INCLUDED #define _BLE_ATTRIBUTE_H_INCLUDED diff --git a/libraries/CurieBLE/src/BLECentral.cpp b/libraries/CurieBLE/src/BLECentral.cpp index 73d0326d..17cd8703 100644 --- a/libraries/CurieBLE/src/BLECentral.cpp +++ b/libraries/CurieBLE/src/BLECentral.cpp @@ -1,24 +1,7 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #include "BLECentral.h" - #include "BLEPeripheral.h" diff --git a/libraries/CurieBLE/src/BLECentral.h b/libraries/CurieBLE/src/BLECentral.h index c51250d9..97eaee85 100644 --- a/libraries/CurieBLE/src/BLECentral.h +++ b/libraries/CurieBLE/src/BLECentral.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _BLE_CENTRAL_H_INCLUDED #define _BLE_CENTRAL_H_INCLUDED diff --git a/libraries/CurieBLE/src/BLECharacteristic.cpp b/libraries/CurieBLE/src/BLECharacteristic.cpp index a42b5f7b..562bf0f5 100644 --- a/libraries/CurieBLE/src/BLECharacteristic.cpp +++ b/libraries/CurieBLE/src/BLECharacteristic.cpp @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #include "BLECharacteristic.h" #include "internal/ble_client.h" diff --git a/libraries/CurieBLE/src/BLECharacteristic.h b/libraries/CurieBLE/src/BLECharacteristic.h index a5afaa36..5d907a39 100644 --- a/libraries/CurieBLE/src/BLECharacteristic.h +++ b/libraries/CurieBLE/src/BLECharacteristic.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _BLE_CHARACTERISTIC_H_INCLUDED #define _BLE_CHARACTERISTIC_H_INCLUDED diff --git a/libraries/CurieBLE/src/BLECommon.h b/libraries/CurieBLE/src/BLECommon.h index 20bf0e23..4fa15853 100644 --- a/libraries/CurieBLE/src/BLECommon.h +++ b/libraries/CurieBLE/src/BLECommon.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _BLE_COMMON_H_INCLUDED #define _BLE_COMMON_H_INCLUDED diff --git a/libraries/CurieBLE/src/BLEDescriptor.cpp b/libraries/CurieBLE/src/BLEDescriptor.cpp index 8e50120b..59ae08e0 100644 --- a/libraries/CurieBLE/src/BLEDescriptor.cpp +++ b/libraries/CurieBLE/src/BLEDescriptor.cpp @@ -1,24 +1,7 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #include "BLEDescriptor.h" - #include "internal/ble_client.h" BLEDescriptor::BLEDescriptor(const char* uuid, const unsigned char value[], unsigned short valueLength) : diff --git a/libraries/CurieBLE/src/BLEDescriptor.h b/libraries/CurieBLE/src/BLEDescriptor.h index 08e53f13..a81710fe 100644 --- a/libraries/CurieBLE/src/BLEDescriptor.h +++ b/libraries/CurieBLE/src/BLEDescriptor.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _BLE_DESCRIPTOR_H_INCLUDED #define _BLE_DESCRIPTOR_H_INCLUDED diff --git a/libraries/CurieBLE/src/BLEPeripheral.cpp b/libraries/CurieBLE/src/BLEPeripheral.cpp index f1218bcd..269828b5 100644 --- a/libraries/CurieBLE/src/BLEPeripheral.cpp +++ b/libraries/CurieBLE/src/BLEPeripheral.cpp @@ -1,30 +1,12 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #include "BLEPeripheral.h" - #include "BLECharacteristic.h" #include "BLEDescriptor.h" #include "BLEService.h" #include "BLEUuid.h" - #define BLE_DISCONNECT_REASON_LOCAL_TERMINATION 0x16 void diff --git a/libraries/CurieBLE/src/BLEPeripheral.h b/libraries/CurieBLE/src/BLEPeripheral.h index 054af330..f24edeab 100644 --- a/libraries/CurieBLE/src/BLEPeripheral.h +++ b/libraries/CurieBLE/src/BLEPeripheral.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _BLE_PERIPHERAL_H_INCLUDED #define _BLE_PERIPHERAL_H_INCLUDED diff --git a/libraries/CurieBLE/src/BLEService.cpp b/libraries/CurieBLE/src/BLEService.cpp index f7569e3b..84be5420 100644 --- a/libraries/CurieBLE/src/BLEService.cpp +++ b/libraries/CurieBLE/src/BLEService.cpp @@ -1,24 +1,7 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #include "internal/ble_client.h" - #include "BLEService.h" BLEService::BLEService(const char* uuid) : diff --git a/libraries/CurieBLE/src/BLEService.h b/libraries/CurieBLE/src/BLEService.h index 17311f72..f18bddd5 100644 --- a/libraries/CurieBLE/src/BLEService.h +++ b/libraries/CurieBLE/src/BLEService.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _BLE_SERVICE_H_INCLUDED #define _BLE_SERVICE_H_INCLUDED diff --git a/libraries/CurieBLE/src/BLETypedCharacteristic.h b/libraries/CurieBLE/src/BLETypedCharacteristic.h index 77828aae..d88f7fd2 100644 --- a/libraries/CurieBLE/src/BLETypedCharacteristic.h +++ b/libraries/CurieBLE/src/BLETypedCharacteristic.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _BLE_TYPED_CHARACTERISTIC_H_INCLUDED #define _BLE_TYPED_CHARACTERISTIC_H_INCLUDED diff --git a/libraries/CurieBLE/src/BLETypedCharacteristics.cpp b/libraries/CurieBLE/src/BLETypedCharacteristics.cpp index c9c89e24..de7e363c 100644 --- a/libraries/CurieBLE/src/BLETypedCharacteristics.cpp +++ b/libraries/CurieBLE/src/BLETypedCharacteristics.cpp @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #include "BLETypedCharacteristics.h" BLECharCharacteristic::BLECharCharacteristic(const char* uuid, unsigned char properties) : diff --git a/libraries/CurieBLE/src/BLETypedCharacteristics.h b/libraries/CurieBLE/src/BLETypedCharacteristics.h index fb76cfce..8353edd1 100644 --- a/libraries/CurieBLE/src/BLETypedCharacteristics.h +++ b/libraries/CurieBLE/src/BLETypedCharacteristics.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _BLE_TYPED_CHARACTERISTICS_H_INCLUDED #define _BLE_TYPED_CHARACTERISTICS_H_INCLUDED diff --git a/libraries/CurieBLE/src/BLEUuid.cpp b/libraries/CurieBLE/src/BLEUuid.cpp index f0764383..0a79ebae 100644 --- a/libraries/CurieBLE/src/BLEUuid.cpp +++ b/libraries/CurieBLE/src/BLEUuid.cpp @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #include "BLEUuid.h" BLEUuid::BLEUuid(const char * str) diff --git a/libraries/CurieBLE/src/BLEUuid.h b/libraries/CurieBLE/src/BLEUuid.h index 39b8aff5..7449c0b6 100644 --- a/libraries/CurieBLE/src/BLEUuid.h +++ b/libraries/CurieBLE/src/BLEUuid.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _BLE_UUID_H_INCLUDED #define _BLE_UUID_H_INCLUDED diff --git a/libraries/CurieBLE/src/CurieBLE.h b/libraries/CurieBLE/src/CurieBLE.h index fb51dd58..d8d5ee9c 100644 --- a/libraries/CurieBLE/src/CurieBLE.h +++ b/libraries/CurieBLE/src/CurieBLE.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #include "BLECharacteristic.h" #include "BLECommon.h" #include "BLEDescriptor.h" diff --git a/libraries/CurieBLE/src/internal/COPYRIGHT_INTEL.README b/libraries/CurieBLE/src/internal/COPYRIGHT_INTEL.README new file mode 100644 index 00000000..8b374a80 --- /dev/null +++ b/libraries/CurieBLE/src/internal/COPYRIGHT_INTEL.README @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2015, Intel Corporation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + + diff --git a/libraries/CurieBLE/src/internal/ble_client.c b/libraries/CurieBLE/src/internal/ble_client.c index a4f4cbc6..a72730fd 100644 --- a/libraries/CurieBLE/src/internal/ble_client.c +++ b/libraries/CurieBLE/src/internal/ble_client.c @@ -1,33 +1,6 @@ /* * Copyright (c) 2015, Intel Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. */ - #include #include "cfw/cfw.h" #include "cfw/cfw_debug.h" diff --git a/libraries/CurieBLE/src/internal/ble_client.h b/libraries/CurieBLE/src/internal/ble_client.h index 3fe47bd4..0488ee8c 100644 --- a/libraries/CurieBLE/src/internal/ble_client.h +++ b/libraries/CurieBLE/src/internal/ble_client.h @@ -1,33 +1,6 @@ /* * Copyright (c) 2015, Intel Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. */ - #ifndef _BLE_CLIENT_H_INCLUDED #define _BLE_CLIENT_H_INCLUDED diff --git a/libraries/CurieEEPROM/src/CurieEEPROM.cpp b/libraries/CurieEEPROM/src/CurieEEPROM.cpp index 3127f18f..119c513c 100644 --- a/libraries/CurieEEPROM/src/CurieEEPROM.cpp +++ b/libraries/CurieEEPROM/src/CurieEEPROM.cpp @@ -1,20 +1,5 @@ /* * Copyright (c) 2016 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ #include "CurieEEPROM.h" diff --git a/libraries/CurieEEPROM/src/CurieEEPROM.h b/libraries/CurieEEPROM/src/CurieEEPROM.h index cfbce2cb..22ed7364 100644 --- a/libraries/CurieEEPROM/src/CurieEEPROM.h +++ b/libraries/CurieEEPROM/src/CurieEEPROM.h @@ -1,28 +1,12 @@ /* * Copyright (c) 2016 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #define ROM_WR_CTRL 0xb0100004 #define ROM_WR_DATA 0xb0100008 #define FLASH_STTS 0xb0000014 -#define EEPROM_ADDR 0xfffff000 -#define EEPROM_OFFSET 0x00001000 -#define CTRL_REG 0xb0000018 +#define EEPROM_ADDR 0xfffff000 +#define EEPROM_OFFSET 0x00001000 +#define CTRL_REG 0xb0000018 #define EEPROM_SIZE 512 //EEPROM size in dwords diff --git a/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino b/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino index 89bb0052..d94ee8c5 100644 --- a/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino +++ b/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino @@ -1,21 +1,6 @@ /* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ /* This sketch example demonstrates how the BMI160 on the diff --git a/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino b/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino index a36ee612..b1966b6b 100644 --- a/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino +++ b/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino @@ -1,21 +1,6 @@ /* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ /* This sketch example demonstrates how the BMI160 on the diff --git a/libraries/CurieIMU/examples/COPYRIGHT.README b/libraries/CurieIMU/examples/COPYRIGHT.README new file mode 100644 index 00000000..40f63b87 --- /dev/null +++ b/libraries/CurieIMU/examples/COPYRIGHT.README @@ -0,0 +1,32 @@ +/* + =============================================== + Example sketch for CurieIMU library for Intel(R) Curie(TM) devices. + Copyright (c) 2015 Intel Corporation. All rights reserved. + + Based on I2C device class (I2Cdev) demonstration Arduino sketch for MPU6050 + class by Jeff Rowberg: https://github.com/jrowberg/i2cdevlib + + =============================================== + I2Cdev device library code is placed under the MIT license + Copyright (c) 2011 Jeff Rowberg + + 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. + =============================================== +*/ + diff --git a/libraries/CurieIMU/examples/Gyro/Gyro.ino b/libraries/CurieIMU/examples/Gyro/Gyro.ino index 81fa30d7..a746172c 100644 --- a/libraries/CurieIMU/examples/Gyro/Gyro.ino +++ b/libraries/CurieIMU/examples/Gyro/Gyro.ino @@ -1,21 +1,6 @@ /* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ /* This sketch example demonstrates how the BMI160 on the diff --git a/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino b/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino index d61da508..2a9f459e 100644 --- a/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino +++ b/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino @@ -1,34 +1,7 @@ /* - =============================================== - Example sketch for CurieIMU library for Intel(R) Curie(TM) devices. - Copyright (c) 2015 Intel Corporation. All rights reserved. - - Based on I2C device class (I2Cdev) demonstration Arduino sketch for MPU6050 - class by Jeff Rowberg: https://github.com/jrowberg/i2cdevlib - - =============================================== - I2Cdev device library code is placed under the MIT license - Copyright (c) 2011 Jeff Rowberg - - 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. - =============================================== -*/ + * Example sketch for CurieIMU library for Intel(R) Curie(TM) devices. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ #include "CurieIMU.h" int ax, ay, az; // accelerometer values diff --git a/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino b/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino index 06c4a2e5..bf6525aa 100644 --- a/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino +++ b/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino @@ -1,21 +1,6 @@ /* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ /* This sketch example demonstrates how the BMI160 accelerometer on the diff --git a/libraries/CurieIMU/examples/StepCount/StepCount.ino b/libraries/CurieIMU/examples/StepCount/StepCount.ino index d2096dff..9ebe49f3 100644 --- a/libraries/CurieIMU/examples/StepCount/StepCount.ino +++ b/libraries/CurieIMU/examples/StepCount/StepCount.ino @@ -1,21 +1,6 @@ /* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ /* This sketch example demonstrates how the BMI160 accelerometer on the diff --git a/libraries/CurieIMU/examples/TapDetect/TapDetect.ino b/libraries/CurieIMU/examples/TapDetect/TapDetect.ino index 2ff8b3c0..a50e87d9 100644 --- a/libraries/CurieIMU/examples/TapDetect/TapDetect.ino +++ b/libraries/CurieIMU/examples/TapDetect/TapDetect.ino @@ -1,21 +1,6 @@ /* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -*/ + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ /* This sketch example demonstrates how the BMI160 accelerometer on the diff --git a/libraries/CurieIMU/src/BMI160.cpp b/libraries/CurieIMU/src/BMI160.cpp index 842222bd..143675a4 100644 --- a/libraries/CurieIMU/src/BMI160.cpp +++ b/libraries/CurieIMU/src/BMI160.cpp @@ -1,34 +1,7 @@ /* -=============================================== -BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. -Copyright (c) 2015 Intel Corporation. All rights reserved. - -Based on MPU6050 Arduino library provided by Jeff Rowberg as part of his -excellent I2Cdev device library: https://github.com/jrowberg/i2cdevlib - -=============================================== -I2Cdev device library code is placed under the MIT license -Copyright (c) 2012 Jeff Rowberg - -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. -=============================================== -*/ + * BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + */ #include "BMI160.h" #define BMI160_CHIP_ID 0xD1 diff --git a/libraries/CurieIMU/src/BMI160.h b/libraries/CurieIMU/src/BMI160.h index 2c9f3654..18bf304f 100644 --- a/libraries/CurieIMU/src/BMI160.h +++ b/libraries/CurieIMU/src/BMI160.h @@ -1,35 +1,7 @@ /* -=============================================== -BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. -Copyright (c) 2015 Intel Corporation. All rights reserved. - -Based on MPU6050 Arduino library provided by Jeff Rowberg as part of his -excellent I2Cdev device library: https://github.com/jrowberg/i2cdevlib - -=============================================== -I2Cdev device library code is placed under the MIT license -Copyright (c) 2012 Jeff Rowberg - -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. -=============================================== + * BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. + * Copyright (c) 2015 Intel Corporation. All rights reserved. */ - #ifndef _BMI160_H_ #define _BMI160_H_ diff --git a/libraries/CurieIMU/src/COPYRIGHT_INTEL_BOSCH.README b/libraries/CurieIMU/src/COPYRIGHT_INTEL_BOSCH.README new file mode 100644 index 00000000..86e46e2e --- /dev/null +++ b/libraries/CurieIMU/src/COPYRIGHT_INTEL_BOSCH.README @@ -0,0 +1,32 @@ +/* +=============================================== +BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. +Copyright (c) 2015 Intel Corporation. All rights reserved. + +Based on MPU6050 Arduino library provided by Jeff Rowberg as part of his +excellent I2Cdev device library: https://github.com/jrowberg/i2cdevlib + +=============================================== +I2Cdev device library code is placed under the MIT license +Copyright (c) 2012 Jeff Rowberg + +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. +=============================================== +*/ + diff --git a/libraries/CurieIMU/src/CurieIMU.cpp b/libraries/CurieIMU/src/CurieIMU.cpp index 12141325..579609f5 100644 --- a/libraries/CurieIMU/src/CurieIMU.cpp +++ b/libraries/CurieIMU/src/CurieIMU.cpp @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #include "CurieIMU.h" #include "internal/ss_spi.h" #include "interrupt.h" diff --git a/libraries/CurieIMU/src/CurieIMU.h b/libraries/CurieIMU/src/CurieIMU.h index 7f6c6968..1a9720a6 100644 --- a/libraries/CurieIMU/src/CurieIMU.h +++ b/libraries/CurieIMU/src/CurieIMU.h @@ -2,23 +2,7 @@ * BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. * * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _CURIEIMU_H_ #define _CURIEIMU_H_ diff --git a/libraries/CurieIMU/src/internal/COPYRIGHT_SYNOPSYS.README b/libraries/CurieIMU/src/internal/COPYRIGHT_SYNOPSYS.README new file mode 100644 index 00000000..f13cb9c3 --- /dev/null +++ b/libraries/CurieIMU/src/internal/COPYRIGHT_SYNOPSYS.README @@ -0,0 +1,37 @@ +/******************************************************************************* + * + * Synopsys DesignWare Sensor and Control IP Subsystem IO Software Driver and + * documentation (hereinafter, "Software") is an Unsupported proprietary work + * of Synopsys, Inc. unless otherwise expressly agreed to in writing between + * Synopsys and you. + * + * The Software IS NOT an item of Licensed Software or Licensed Product under + * any End User Software License Agreement or Agreement for Licensed Product + * with Synopsys or any supplement thereto. You are permitted to use and + * redistribute this Software in source and binary forms, with or without + * modification, provided that redistributions of source code must retain this + * notice. You may not view, use, disclose, copy or distribute this file or + * any information contained herein except pursuant to this license grant from + * Synopsys. If you do not agree with this notice, including the disclaimer + * below, then you are not authorized to use the Software. + * + * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + ******************************************************************************/ + +/******************************************************************************* + * + * Modifications Copyright (c) 2015, Intel Corporation. All rights reserved. + * + ******************************************************************************/ + diff --git a/libraries/CurieIMU/src/internal/ss_spi.c b/libraries/CurieIMU/src/internal/ss_spi.c index 9aafbb8e..7640b396 100644 --- a/libraries/CurieIMU/src/internal/ss_spi.c +++ b/libraries/CurieIMU/src/internal/ss_spi.c @@ -1,34 +1,3 @@ -/******************************************************************************* - * - * Synopsys DesignWare Sensor and Control IP Subsystem IO Software Driver and - * documentation (hereinafter, "Software") is an Unsupported proprietary work - * of Synopsys, Inc. unless otherwise expressly agreed to in writing between - * Synopsys and you. - * - * The Software IS NOT an item of Licensed Software or Licensed Product under - * any End User Software License Agreement or Agreement for Licensed Product - * with Synopsys or any supplement thereto. You are permitted to use and - * redistribute this Software in source and binary forms, with or without - * modification, provided that redistributions of source code must retain this - * notice. You may not view, use, disclose, copy or distribute this file or - * any information contained herein except pursuant to this license grant from - * Synopsys. If you do not agree with this notice, including the disclaimer - * below, then you are not authorized to use the Software. - * - * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - ******************************************************************************/ - /******************************************************************************* * * Modifications Copyright (c) 2015, Intel Corporation. All rights reserved. diff --git a/libraries/CurieIMU/src/internal/ss_spi.h b/libraries/CurieIMU/src/internal/ss_spi.h index 1d60b33a..428c7b3a 100644 --- a/libraries/CurieIMU/src/internal/ss_spi.h +++ b/libraries/CurieIMU/src/internal/ss_spi.h @@ -1,22 +1,6 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ - #ifndef _SS_SPI_H_ #define _SS_SPI_H_ diff --git a/libraries/CurieTime/src/CurieTime.cpp b/libraries/CurieTime/src/CurieTime.cpp index 8f6bdd00..b4fb073d 100644 --- a/libraries/CurieTime/src/CurieTime.cpp +++ b/libraries/CurieTime/src/CurieTime.cpp @@ -1,25 +1,7 @@ /* * CurieTime.cpp - Time library for Arduino101 - - Copyright (c) 2015 Intel Corporation. All rights reserved - This library is intended to be uses with Arduino Time.h library functions - - The library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - + * Copyright (c) 2015 Intel Corporation. All rights reserved */ - #include #include "CurieTime.h" diff --git a/libraries/CurieTimerOne/src/CurieTimerOne.cpp b/libraries/CurieTimerOne/src/CurieTimerOne.cpp index 9758a3d8..25dc3ce1 100644 --- a/libraries/CurieTimerOne/src/CurieTimerOne.cpp +++ b/libraries/CurieTimerOne/src/CurieTimerOne.cpp @@ -1,28 +1,11 @@ //*************************************************************** -// // Copyright (c) 2015 Intel Corporation. All rights reserved. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. - -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// //*************************************************************** //*************************************************************** -// // Module: CurieTimerOne // -// // Notes: // // - Arc has two timers, Timer-0 is used. Please check the file @@ -33,8 +16,6 @@ // is used here. // //*************************************************************** - - #include "CurieTimerOne.h" #include diff --git a/libraries/CurieTimerOne/src/CurieTimerOne.h b/libraries/CurieTimerOne/src/CurieTimerOne.h index b84704bc..910984e6 100644 --- a/libraries/CurieTimerOne/src/CurieTimerOne.h +++ b/libraries/CurieTimerOne/src/CurieTimerOne.h @@ -1,26 +1,8 @@ //*************************************************************** -// // Copyright (c) 2015 Intel Corporation. All rights reserved. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// //*************************************************************** - //*************************************************************** -// // File: CurieTimerOne.h // // Description: @@ -36,8 +18,6 @@ // is used here. // //*************************************************************** - - #ifndef CurieTimerOne_h #define CurieTimerOne_h diff --git a/libraries/SPI/src/SPI.cpp b/libraries/SPI/src/SPI.cpp index 9f24b834..245883f7 100644 --- a/libraries/SPI/src/SPI.cpp +++ b/libraries/SPI/src/SPI.cpp @@ -1,20 +1,5 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ #include "SPI.h" diff --git a/libraries/SPI/src/SPI_registers.h b/libraries/SPI/src/SPI_registers.h index 657de631..aaee5438 100644 --- a/libraries/SPI/src/SPI_registers.h +++ b/libraries/SPI/src/SPI_registers.h @@ -1,20 +1,5 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * */ #ifndef _SPI_REGISTERS_H_ #define _SPI_REGISTERS_H_ diff --git a/libraries/Servo/src/Servo.cpp b/libraries/Servo/src/Servo.cpp index a9166d15..c2dfd5da 100644 --- a/libraries/Servo/src/Servo.cpp +++ b/libraries/Servo/src/Servo.cpp @@ -1,24 +1,8 @@ /* - Servo.cpp - Interrupt driven Servo library for Arduino using ARC Timer 1 on Arduino 101 boards - Copyright (c) 2009 Michael Margolis. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Copyright (c) 2015 Intel Corporation. Implementation of Servo library for Arduino 101 + * Servo.cpp - Interrupt driven Servo library for Arduino using ARC Timer 1 on Arduino 101 boards + * Copyright (c) 2009 Michael Margolis. All right reserved. + * Copyright (c) 2015 Intel Corporation. Implementation of Servo library for Arduino 101 */ - #include "interrupt.h" #include "Arduino.h" #include "conf.h" diff --git a/libraries/Servo/src/Servo.h b/libraries/Servo/src/Servo.h index 31fb5f4e..b329f898 100644 --- a/libraries/Servo/src/Servo.h +++ b/libraries/Servo/src/Servo.h @@ -1,22 +1,7 @@ /* - Servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2 - Copyright (c) 2009 Michael Margolis. All right reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -*/ - + * Servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2 + * Copyright (c) 2009 Michael Margolis. All right reserved. + */ /* A servo is activated by creating an instance of the Servo class passing the desired pin to the attach() method. diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp index 423a9a3d..a1e796d5 100644 --- a/libraries/Wire/src/Wire.cpp +++ b/libraries/Wire/src/Wire.cpp @@ -2,25 +2,7 @@ * TwoWire.h - TWI/I2C library for Linux Userspace * Copyright (c) 2013 Parav https://github.com/meanbot. * All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Modifications to support Intel Arduino 101 - * Copyright (C) 2015 Intel Corporation */ - extern "C" { #include #include diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h index f055bb17..ae62d765 100644 --- a/libraries/Wire/src/Wire.h +++ b/libraries/Wire/src/Wire.h @@ -2,22 +2,7 @@ * TwoWire.h - TWI/I2C library for Linux Userspace * Copyright (c) 2013 Parav https://github.com/meanbot. * All rights reserved. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ - #ifndef TwoWire_h #define TwoWire_h From b5a10cead6cbfb0f3b4f645563691ccdd0ef2623 Mon Sep 17 00:00:00 2001 From: Mike Duong Date: Tue, 3 May 2016 17:29:29 -0700 Subject: [PATCH 2/6] Moved Copyright terms down to bottom of same file instead of in a separate file --- libraries/COPYRIGHT_INTEL.README | 18 ------- .../BatteryMonitor/BatteryMonitor.ino | 22 ++++++++- .../CurieBLE/examples/ButtonLED/ButtonLED.ino | 23 ++++++++- .../examples/CallbackLED/CallbackLED.ino | 23 ++++++++- libraries/CurieBLE/examples/LED/LED.ino | 21 +++++++- libraries/CurieBLE/src/BLEAttribute.cpp | 22 +++++++++ libraries/CurieBLE/src/BLEAttribute.h | 21 ++++++++ libraries/CurieBLE/src/BLECentral.cpp | 22 ++++++++- libraries/CurieBLE/src/BLECentral.h | 21 ++++++++ libraries/CurieBLE/src/BLECharacteristic.cpp | 21 ++++++++ libraries/CurieBLE/src/BLECharacteristic.h | 21 ++++++++ libraries/CurieBLE/src/BLECommon.h | 21 ++++++++ libraries/CurieBLE/src/BLEDescriptor.cpp | 21 ++++++++ libraries/CurieBLE/src/BLEDescriptor.h | 21 ++++++++ libraries/CurieBLE/src/BLEPeripheral.cpp | 21 ++++++++ libraries/CurieBLE/src/BLEPeripheral.h | 21 ++++++++ libraries/CurieBLE/src/BLEService.cpp | 21 ++++++++ libraries/CurieBLE/src/BLEService.h | 21 ++++++++ .../CurieBLE/src/BLETypedCharacteristic.h | 22 ++++++++- .../CurieBLE/src/BLETypedCharacteristics.cpp | 21 ++++++++ .../CurieBLE/src/BLETypedCharacteristics.h | 21 ++++++++ libraries/CurieBLE/src/BLEUuid.cpp | 21 ++++++++ libraries/CurieBLE/src/BLEUuid.h | 21 ++++++++ libraries/CurieBLE/src/CurieBLE.h | 16 +++++++ .../src/internal/COPYRIGHT_INTEL.README | 31 ------------ libraries/CurieBLE/src/internal/ble_client.c | 34 ++++++++++++- libraries/CurieBLE/src/internal/ble_client.h | 35 +++++++++++++- libraries/CurieEEPROM/src/CurieEEPROM.cpp | 23 ++++++++- libraries/CurieEEPROM/src/CurieEEPROM.h | 23 ++++++++- .../examples/Accelerometer/Accelerometer.ino | 22 ++++++++- .../AccelerometerOrientation.ino | 20 +++++++- libraries/CurieIMU/examples/COPYRIGHT.README | 32 ------------- libraries/CurieIMU/examples/Gyro/Gyro.ino | 21 +++++++- .../RawImuDataSerial/RawImuDataSerial.ino | 34 ++++++++++++- .../examples/ShockDetect/ShockDetect.ino | 22 ++++++++- .../CurieIMU/examples/StepCount/StepCount.ino | 22 ++++++++- .../CurieIMU/examples/TapDetect/TapDetect.ino | 22 ++++++++- libraries/CurieIMU/src/BMI160.cpp | 35 +++++++++++++- libraries/CurieIMU/src/BMI160.h | 37 +++++++++++++- .../CurieIMU/src/COPYRIGHT_INTEL_BOSCH.README | 32 ------------- libraries/CurieIMU/src/CurieIMU.cpp | 21 ++++++++ libraries/CurieIMU/src/CurieIMU.h | 25 +++++++++- .../src/internal/COPYRIGHT_SYNOPSYS.README | 37 -------------- libraries/CurieIMU/src/internal/ss_spi.c | 48 ++++++++++++++++--- libraries/CurieIMU/src/internal/ss_spi.h | 16 +++++++ libraries/CurieTime/src/CurieTime.cpp | 28 +++++++++-- libraries/CurieTimerOne/src/CurieTimerOne.cpp | 19 ++++++++ libraries/CurieTimerOne/src/CurieTimerOne.h | 20 ++++++++ libraries/SPI/src/SPI.cpp | 21 ++++++++ libraries/SPI/src/SPI.h | 27 ++++++----- libraries/SPI/src/SPI_registers.h | 21 ++++++++ libraries/Servo/src/Servo.cpp | 27 +++++++++-- libraries/Servo/src/Servo.h | 24 +++++++++- libraries/Wire/src/Wire.cpp | 29 +++++++++-- libraries/Wire/src/Wire.h | 25 ++++++++-- 55 files changed, 1133 insertions(+), 204 deletions(-) delete mode 100644 libraries/COPYRIGHT_INTEL.README delete mode 100644 libraries/CurieBLE/src/internal/COPYRIGHT_INTEL.README delete mode 100644 libraries/CurieIMU/examples/COPYRIGHT.README delete mode 100644 libraries/CurieIMU/src/COPYRIGHT_INTEL_BOSCH.README delete mode 100644 libraries/CurieIMU/src/internal/COPYRIGHT_SYNOPSYS.README diff --git a/libraries/COPYRIGHT_INTEL.README b/libraries/COPYRIGHT_INTEL.README deleted file mode 100644 index 4fca0599..00000000 --- a/libraries/COPYRIGHT_INTEL.README +++ /dev/null @@ -1,18 +0,0 @@ -/* - Copyright (c) 2015 Intel Corporation. All rights reserved. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - diff --git a/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino b/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino index 5dd61bc6..fea4c863 100644 --- a/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino +++ b/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino @@ -1,6 +1,8 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include /* @@ -84,3 +86,21 @@ void updateBatteryLevel() { oldBatteryLevel = batteryLevel; // save the level for next comparison } } + +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ diff --git a/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino b/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino index aecb0a54..6f68f231 100644 --- a/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino +++ b/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino @@ -1,6 +1,8 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include const int ledPin = 13; // set ledPin to on-board LED @@ -66,3 +68,22 @@ void loop() { } } } + +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110- + 1301 USA +*/ diff --git a/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino b/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino index d53687fb..24674120 100644 --- a/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino +++ b/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino @@ -1,6 +1,8 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include const int ledPin = 13; // set ledPin to use on-board LED @@ -67,3 +69,22 @@ void switchCharacteristicWritten(BLECentral& central, BLECharacteristic& charact digitalWrite(ledPin, LOW); } } + +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110- + 1301 USA +*/ diff --git a/libraries/CurieBLE/examples/LED/LED.ino b/libraries/CurieBLE/examples/LED/LED.ino index 49eeee56..afc87571 100644 --- a/libraries/CurieBLE/examples/LED/LED.ino +++ b/libraries/CurieBLE/examples/LED/LED.ino @@ -1,6 +1,8 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include BLEPeripheral blePeripheral; // BLE Peripheral Device (the board you're programming) @@ -65,3 +67,20 @@ void loop() { } } +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ diff --git a/libraries/CurieBLE/src/BLEAttribute.cpp b/libraries/CurieBLE/src/BLEAttribute.cpp index c711426f..3c0572ed 100644 --- a/libraries/CurieBLE/src/BLEAttribute.cpp +++ b/libraries/CurieBLE/src/BLEAttribute.cpp @@ -1,7 +1,10 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "BLEAttribute.h" + #include "BLEUuid.h" unsigned char BLEAttribute::_numAttributes = 0; @@ -46,3 +49,22 @@ unsigned char BLEAttribute::numAttributes() { return _numAttributes; } + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLEAttribute.h b/libraries/CurieBLE/src/BLEAttribute.h index 875fb722..548b843f 100644 --- a/libraries/CurieBLE/src/BLEAttribute.h +++ b/libraries/CurieBLE/src/BLEAttribute.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_ATTRIBUTE_H_INCLUDED #define _BLE_ATTRIBUTE_H_INCLUDED @@ -45,3 +47,22 @@ class BLEAttribute { }; #endif // _BLE_ATTRIBUTE_H_INCLUDED + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLECentral.cpp b/libraries/CurieBLE/src/BLECentral.cpp index 17cd8703..f29243cb 100644 --- a/libraries/CurieBLE/src/BLECentral.cpp +++ b/libraries/CurieBLE/src/BLECentral.cpp @@ -1,10 +1,11 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "BLECentral.h" #include "BLEPeripheral.h" - BLECentral::BLECentral(BLEPeripheral* peripheral) : _peripheral(peripheral) { @@ -84,3 +85,22 @@ void BLECentral::clearAddress() { memset(&_address, 0x00, sizeof(_address)); } + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLECentral.h b/libraries/CurieBLE/src/BLECentral.h index 97eaee85..922c87c1 100644 --- a/libraries/CurieBLE/src/BLECentral.h +++ b/libraries/CurieBLE/src/BLECentral.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_CENTRAL_H_INCLUDED #define _BLE_CENTRAL_H_INCLUDED @@ -52,3 +54,22 @@ class BLECentral { }; #endif + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLECharacteristic.cpp b/libraries/CurieBLE/src/BLECharacteristic.cpp index 562bf0f5..dfc3e7dc 100644 --- a/libraries/CurieBLE/src/BLECharacteristic.cpp +++ b/libraries/CurieBLE/src/BLECharacteristic.cpp @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "BLECharacteristic.h" #include "internal/ble_client.h" @@ -247,3 +249,22 @@ BLECharacteristic::_setValue(const uint8_t value[], uint16_t length) memcpy(_value, value, length); _value_length = length; } + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLECharacteristic.h b/libraries/CurieBLE/src/BLECharacteristic.h index 5d907a39..05ee9ed6 100644 --- a/libraries/CurieBLE/src/BLECharacteristic.h +++ b/libraries/CurieBLE/src/BLECharacteristic.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_CHARACTERISTIC_H_INCLUDED #define _BLE_CHARACTERISTIC_H_INCLUDED @@ -166,3 +168,22 @@ class BLECharacteristic : public BLEAttribute { }; #endif // _BLE_CHARACTERISTIC_H_INCLUDED + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLECommon.h b/libraries/CurieBLE/src/BLECommon.h index 4fa15853..1d8c45a0 100644 --- a/libraries/CurieBLE/src/BLECommon.h +++ b/libraries/CurieBLE/src/BLECommon.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_COMMON_H_INCLUDED #define _BLE_COMMON_H_INCLUDED @@ -27,3 +29,22 @@ typedef ble_status_t BleStatus; #endif // _BLE_COMMON_H_INCLUDED + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLEDescriptor.cpp b/libraries/CurieBLE/src/BLEDescriptor.cpp index 59ae08e0..9a480298 100644 --- a/libraries/CurieBLE/src/BLEDescriptor.cpp +++ b/libraries/CurieBLE/src/BLEDescriptor.cpp @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "BLEDescriptor.h" #include "internal/ble_client.h" @@ -66,3 +68,22 @@ BLEDescriptor::add(uint16_t serviceHandle) return (ble_client_gatts_add_descriptor(serviceHandle, &desc, &handle) == BLE_STATUS_SUCCESS); } + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLEDescriptor.h b/libraries/CurieBLE/src/BLEDescriptor.h index a81710fe..72ee2621 100644 --- a/libraries/CurieBLE/src/BLEDescriptor.h +++ b/libraries/CurieBLE/src/BLEDescriptor.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_DESCRIPTOR_H_INCLUDED #define _BLE_DESCRIPTOR_H_INCLUDED @@ -59,3 +61,22 @@ class BLEDescriptor : public BLEAttribute { }; #endif // _BLE_DESCRIPTOR_H_INCLUDED + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLEPeripheral.cpp b/libraries/CurieBLE/src/BLEPeripheral.cpp index 269828b5..9219fa34 100644 --- a/libraries/CurieBLE/src/BLEPeripheral.cpp +++ b/libraries/CurieBLE/src/BLEPeripheral.cpp @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "BLEPeripheral.h" #include "BLECharacteristic.h" #include "BLEDescriptor.h" @@ -457,3 +459,22 @@ BLEPeripheral::handleGattsEvent(ble_client_gatts_event_t event, struct ble_gatts } } } + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLEPeripheral.h b/libraries/CurieBLE/src/BLEPeripheral.h index f24edeab..8ac7fe60 100644 --- a/libraries/CurieBLE/src/BLEPeripheral.h +++ b/libraries/CurieBLE/src/BLEPeripheral.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_PERIPHERAL_H_INCLUDED #define _BLE_PERIPHERAL_H_INCLUDED @@ -240,3 +242,22 @@ class BLEPeripheral { }; #endif // _BLE_DEVICE_H_INCLUDED + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLEService.cpp b/libraries/CurieBLE/src/BLEService.cpp index 84be5420..549b228f 100644 --- a/libraries/CurieBLE/src/BLEService.cpp +++ b/libraries/CurieBLE/src/BLEService.cpp @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "internal/ble_client.h" #include "BLEService.h" @@ -21,3 +23,22 @@ BLEService::add() { return (BLE_STATUS_SUCCESS == status); } + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLEService.h b/libraries/CurieBLE/src/BLEService.h index f18bddd5..aa70d3f0 100644 --- a/libraries/CurieBLE/src/BLEService.h +++ b/libraries/CurieBLE/src/BLEService.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_SERVICE_H_INCLUDED #define _BLE_SERVICE_H_INCLUDED @@ -26,3 +28,22 @@ class BLEService : public BLEAttribute { }; #endif // _BLE_SERVICE_H_INCLUDED + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLETypedCharacteristic.h b/libraries/CurieBLE/src/BLETypedCharacteristic.h index d88f7fd2..64218ab7 100644 --- a/libraries/CurieBLE/src/BLETypedCharacteristic.h +++ b/libraries/CurieBLE/src/BLETypedCharacteristic.h @@ -1,11 +1,12 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_TYPED_CHARACTERISTIC_H_INCLUDED #define _BLE_TYPED_CHARACTERISTIC_H_INCLUDED #include "Arduino.h" - #include "BLECharacteristic.h" template class BLETypedCharacteristic : public BLECharacteristic @@ -76,3 +77,22 @@ template T BLETypedCharacteristic::byteSwap(T value) { } #endif // _BLE_TYPED_CHARACTERISTIC_H_INCLUDED + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLETypedCharacteristics.cpp b/libraries/CurieBLE/src/BLETypedCharacteristics.cpp index de7e363c..bdd5f944 100644 --- a/libraries/CurieBLE/src/BLETypedCharacteristics.cpp +++ b/libraries/CurieBLE/src/BLETypedCharacteristics.cpp @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "BLETypedCharacteristics.h" BLECharCharacteristic::BLECharCharacteristic(const char* uuid, unsigned char properties) : @@ -42,3 +44,22 @@ BLEFloatCharacteristic::BLEFloatCharacteristic(const char* uuid, unsigned char p BLEDoubleCharacteristic::BLEDoubleCharacteristic(const char* uuid, unsigned char properties) : BLETypedCharacteristic(uuid, properties) { } + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLETypedCharacteristics.h b/libraries/CurieBLE/src/BLETypedCharacteristics.h index 8353edd1..bfd16a8b 100644 --- a/libraries/CurieBLE/src/BLETypedCharacteristics.h +++ b/libraries/CurieBLE/src/BLETypedCharacteristics.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_TYPED_CHARACTERISTICS_H_INCLUDED #define _BLE_TYPED_CHARACTERISTICS_H_INCLUDED @@ -62,3 +64,22 @@ class BLEDoubleCharacteristic : public BLETypedCharacteristic { }; #endif // _BLE_TYPED_CHARACTERISTICS_H_INCLUDED + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLEUuid.cpp b/libraries/CurieBLE/src/BLEUuid.cpp index 0a79ebae..9551b7c1 100644 --- a/libraries/CurieBLE/src/BLEUuid.cpp +++ b/libraries/CurieBLE/src/BLEUuid.cpp @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "BLEUuid.h" BLEUuid::BLEUuid(const char * str) @@ -36,3 +38,22 @@ bt_uuid BLEUuid::uuid() const { return _uuid; } + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/BLEUuid.h b/libraries/CurieBLE/src/BLEUuid.h index 7449c0b6..9329c97f 100644 --- a/libraries/CurieBLE/src/BLEUuid.h +++ b/libraries/CurieBLE/src/BLEUuid.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_UUID_H_INCLUDED #define _BLE_UUID_H_INCLUDED @@ -18,3 +20,22 @@ class BLEUuid }; #endif // _BLE_UUID_H_INCLUDED + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieBLE/src/CurieBLE.h b/libraries/CurieBLE/src/CurieBLE.h index d8d5ee9c..fb51dd58 100644 --- a/libraries/CurieBLE/src/CurieBLE.h +++ b/libraries/CurieBLE/src/CurieBLE.h @@ -1,6 +1,22 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * */ + #include "BLECharacteristic.h" #include "BLECommon.h" #include "BLEDescriptor.h" diff --git a/libraries/CurieBLE/src/internal/COPYRIGHT_INTEL.README b/libraries/CurieBLE/src/internal/COPYRIGHT_INTEL.README deleted file mode 100644 index 8b374a80..00000000 --- a/libraries/CurieBLE/src/internal/COPYRIGHT_INTEL.README +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2015, Intel Corporation. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * 3. Neither the name of the copyright holder nor the names of its contributors - * may be used to endorse or promote products derived from this software without - * specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - - diff --git a/libraries/CurieBLE/src/internal/ble_client.c b/libraries/CurieBLE/src/internal/ble_client.c index a72730fd..6766790b 100644 --- a/libraries/CurieBLE/src/internal/ble_client.c +++ b/libraries/CurieBLE/src/internal/ble_client.c @@ -1,6 +1,8 @@ /* - * Copyright (c) 2015, Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include #include "cfw/cfw.h" #include "cfw/cfw_debug.h" @@ -856,3 +858,33 @@ BleStatus ble_client_dtm_cmd(const struct ble_test_cmd *test_cmd, #ifdef __cplusplus } #endif + +/* + * Copyright (c) 2015, Intel Corporation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ diff --git a/libraries/CurieBLE/src/internal/ble_client.h b/libraries/CurieBLE/src/internal/ble_client.h index 0488ee8c..d98a100d 100644 --- a/libraries/CurieBLE/src/internal/ble_client.h +++ b/libraries/CurieBLE/src/internal/ble_client.h @@ -1,6 +1,8 @@ /* - * Copyright (c) 2015, Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _BLE_CLIENT_H_INCLUDED #define _BLE_CLIENT_H_INCLUDED @@ -122,5 +124,34 @@ BleStatus ble_client_dtm_cmd(const struct ble_test_cmd *test_cmd, } #endif - #endif // _BLE_CLIENT_H_INCLUDED + +/* + * Copyright (c) 2015, Intel Corporation. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ diff --git a/libraries/CurieEEPROM/src/CurieEEPROM.cpp b/libraries/CurieEEPROM/src/CurieEEPROM.cpp index 119c513c..22b330bf 100644 --- a/libraries/CurieEEPROM/src/CurieEEPROM.cpp +++ b/libraries/CurieEEPROM/src/CurieEEPROM.cpp @@ -1,6 +1,8 @@ /* - * Copyright (c) 2016 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "CurieEEPROM.h" CurieEEPROM EEPROM; @@ -205,3 +207,22 @@ int CurieEEPROM::end() { return length(); } + +/* + * Copyright (c) 2016 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieEEPROM/src/CurieEEPROM.h b/libraries/CurieEEPROM/src/CurieEEPROM.h index 22ed7364..77b3b98e 100644 --- a/libraries/CurieEEPROM/src/CurieEEPROM.h +++ b/libraries/CurieEEPROM/src/CurieEEPROM.h @@ -1,6 +1,8 @@ /* - * Copyright (c) 2016 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #define ROM_WR_CTRL 0xb0100004 #define ROM_WR_DATA 0xb0100008 #define FLASH_STTS 0xb0000014 @@ -160,3 +162,22 @@ class CurieEEPROM }; extern CurieEEPROM EEPROM; + +/* + * Copyright (c) 2016 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino b/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino index d94ee8c5..3ec7662c 100644 --- a/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino +++ b/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino @@ -1,5 +1,6 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ /* @@ -53,3 +54,22 @@ float convertRawAcceleration(int aRaw) { return a; } +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +*/ + diff --git a/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino b/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino index b1966b6b..370e48f3 100644 --- a/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino +++ b/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino @@ -1,5 +1,6 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ /* @@ -82,4 +83,21 @@ int orientation = - 1; // the board's orientation } } +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +*/ diff --git a/libraries/CurieIMU/examples/COPYRIGHT.README b/libraries/CurieIMU/examples/COPYRIGHT.README deleted file mode 100644 index 40f63b87..00000000 --- a/libraries/CurieIMU/examples/COPYRIGHT.README +++ /dev/null @@ -1,32 +0,0 @@ -/* - =============================================== - Example sketch for CurieIMU library for Intel(R) Curie(TM) devices. - Copyright (c) 2015 Intel Corporation. All rights reserved. - - Based on I2C device class (I2Cdev) demonstration Arduino sketch for MPU6050 - class by Jeff Rowberg: https://github.com/jrowberg/i2cdevlib - - =============================================== - I2Cdev device library code is placed under the MIT license - Copyright (c) 2011 Jeff Rowberg - - 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. - =============================================== -*/ - diff --git a/libraries/CurieIMU/examples/Gyro/Gyro.ino b/libraries/CurieIMU/examples/Gyro/Gyro.ino index a746172c..34d76773 100644 --- a/libraries/CurieIMU/examples/Gyro/Gyro.ino +++ b/libraries/CurieIMU/examples/Gyro/Gyro.ino @@ -1,5 +1,6 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ /* @@ -53,3 +54,21 @@ float convertRawGyro(int gRaw) { return g; } +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +*/ diff --git a/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino b/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino index 2a9f459e..628951e5 100644 --- a/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino +++ b/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino @@ -1,6 +1,6 @@ /* - * Example sketch for CurieIMU library for Intel(R) Curie(TM) devices. * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ #include "CurieIMU.h" @@ -119,3 +119,35 @@ void loop() { blinkState = !blinkState; digitalWrite(ledPin, blinkState); } + +/* + =============================================== + Example sketch for CurieIMU library for Intel(R) Curie(TM) devices. + Copyright (c) 2015 Intel Corporation. All rights reserved. + + Based on I2C device class (I2Cdev) demonstration Arduino sketch for MPU6050 + class by Jeff Rowberg: https://github.com/jrowberg/i2cdevlib + + =============================================== + I2Cdev device library code is placed under the MIT license + Copyright (c) 2011 Jeff Rowberg + + 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. + =============================================== +*/ diff --git a/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino b/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino index bf6525aa..1532bb2c 100644 --- a/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino +++ b/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino @@ -1,5 +1,6 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ /* @@ -51,3 +52,22 @@ static void eventCallback(void) Serial.println("Positive shock detected on Z-axis"); } } + +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +*/ diff --git a/libraries/CurieIMU/examples/StepCount/StepCount.ino b/libraries/CurieIMU/examples/StepCount/StepCount.ino index 9ebe49f3..53bd1b5d 100644 --- a/libraries/CurieIMU/examples/StepCount/StepCount.ino +++ b/libraries/CurieIMU/examples/StepCount/StepCount.ino @@ -1,5 +1,6 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ /* @@ -71,3 +72,22 @@ static void eventCallback(void) { if (CurieIMU.stepsDetected()) updateStepCount(); } + +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +*/ diff --git a/libraries/CurieIMU/examples/TapDetect/TapDetect.ino b/libraries/CurieIMU/examples/TapDetect/TapDetect.ino index a50e87d9..7809f2f4 100644 --- a/libraries/CurieIMU/examples/TapDetect/TapDetect.ino +++ b/libraries/CurieIMU/examples/TapDetect/TapDetect.ino @@ -1,5 +1,6 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ /* @@ -53,3 +54,22 @@ static void eventCallback() Serial.println("Double Tap detected on positive Z-axis"); } } + +/* + Copyright (c) 2015 Intel Corporation. All rights reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +*/ diff --git a/libraries/CurieIMU/src/BMI160.cpp b/libraries/CurieIMU/src/BMI160.cpp index 143675a4..59f16df9 100644 --- a/libraries/CurieIMU/src/BMI160.cpp +++ b/libraries/CurieIMU/src/BMI160.cpp @@ -1,7 +1,8 @@ /* - * BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "BMI160.h" #define BMI160_CHIP_ID 0xD1 @@ -2356,3 +2357,35 @@ uint8_t BMI160Class::getRegister(uint8_t reg) { void BMI160Class::setRegister(uint8_t reg, uint8_t data) { reg_write(reg, data); } + +/* +=============================================== +BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. +Copyright (c) 2015 Intel Corporation. All rights reserved. + +Based on MPU6050 Arduino library provided by Jeff Rowberg as part of his +excellent I2Cdev device library: https://github.com/jrowberg/i2cdevlib + +=============================================== +I2Cdev device library code is placed under the MIT license +Copyright (c) 2012 Jeff Rowberg + +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. +=============================================== +*/ diff --git a/libraries/CurieIMU/src/BMI160.h b/libraries/CurieIMU/src/BMI160.h index 18bf304f..a4418788 100644 --- a/libraries/CurieIMU/src/BMI160.h +++ b/libraries/CurieIMU/src/BMI160.h @@ -1,7 +1,8 @@ /* - * BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. * Copyright (c) 2015 Intel Corporation. All rights reserved. -*/ + * See the bottom of this file for the license terms. + */ + #ifndef _BMI160_H_ #define _BMI160_H_ @@ -633,3 +634,35 @@ class BMI160Class { }; #endif /* _BMI160_H_ */ + +/* +=============================================== +BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. +Copyright (c) 2015 Intel Corporation. All rights reserved. + +Based on MPU6050 Arduino library provided by Jeff Rowberg as part of his +excellent I2Cdev device library: https://github.com/jrowberg/i2cdevlib + +=============================================== +I2Cdev device library code is placed under the MIT license +Copyright (c) 2012 Jeff Rowberg + +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. +=============================================== +*/ diff --git a/libraries/CurieIMU/src/COPYRIGHT_INTEL_BOSCH.README b/libraries/CurieIMU/src/COPYRIGHT_INTEL_BOSCH.README deleted file mode 100644 index 86e46e2e..00000000 --- a/libraries/CurieIMU/src/COPYRIGHT_INTEL_BOSCH.README +++ /dev/null @@ -1,32 +0,0 @@ -/* -=============================================== -BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. -Copyright (c) 2015 Intel Corporation. All rights reserved. - -Based on MPU6050 Arduino library provided by Jeff Rowberg as part of his -excellent I2Cdev device library: https://github.com/jrowberg/i2cdevlib - -=============================================== -I2Cdev device library code is placed under the MIT license -Copyright (c) 2012 Jeff Rowberg - -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. -=============================================== -*/ - diff --git a/libraries/CurieIMU/src/CurieIMU.cpp b/libraries/CurieIMU/src/CurieIMU.cpp index 579609f5..60f7a62c 100644 --- a/libraries/CurieIMU/src/CurieIMU.cpp +++ b/libraries/CurieIMU/src/CurieIMU.cpp @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "CurieIMU.h" #include "internal/ss_spi.h" #include "interrupt.h" @@ -1745,3 +1747,22 @@ void CurieIMUClass::detachInterrupt(void) /* Pre-instantiated Object for this class */ CurieIMUClass CurieIMU; + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieIMU/src/CurieIMU.h b/libraries/CurieIMU/src/CurieIMU.h index 1a9720a6..dce3541b 100644 --- a/libraries/CurieIMU/src/CurieIMU.h +++ b/libraries/CurieIMU/src/CurieIMU.h @@ -1,8 +1,8 @@ /* - * BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. - * * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _CURIEIMU_H_ #define _CURIEIMU_H_ @@ -222,3 +222,24 @@ class CurieIMUClass : public BMI160Class { extern CurieIMUClass CurieIMU; #endif /* _CURIEIMU_H_ */ + +/* + * BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. + * + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/CurieIMU/src/internal/COPYRIGHT_SYNOPSYS.README b/libraries/CurieIMU/src/internal/COPYRIGHT_SYNOPSYS.README deleted file mode 100644 index f13cb9c3..00000000 --- a/libraries/CurieIMU/src/internal/COPYRIGHT_SYNOPSYS.README +++ /dev/null @@ -1,37 +0,0 @@ -/******************************************************************************* - * - * Synopsys DesignWare Sensor and Control IP Subsystem IO Software Driver and - * documentation (hereinafter, "Software") is an Unsupported proprietary work - * of Synopsys, Inc. unless otherwise expressly agreed to in writing between - * Synopsys and you. - * - * The Software IS NOT an item of Licensed Software or Licensed Product under - * any End User Software License Agreement or Agreement for Licensed Product - * with Synopsys or any supplement thereto. You are permitted to use and - * redistribute this Software in source and binary forms, with or without - * modification, provided that redistributions of source code must retain this - * notice. You may not view, use, disclose, copy or distribute this file or - * any information contained herein except pursuant to this license grant from - * Synopsys. If you do not agree with this notice, including the disclaimer - * below, then you are not authorized to use the Software. - * - * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - ******************************************************************************/ - -/******************************************************************************* - * - * Modifications Copyright (c) 2015, Intel Corporation. All rights reserved. - * - ******************************************************************************/ - diff --git a/libraries/CurieIMU/src/internal/ss_spi.c b/libraries/CurieIMU/src/internal/ss_spi.c index 7640b396..33507e97 100644 --- a/libraries/CurieIMU/src/internal/ss_spi.c +++ b/libraries/CurieIMU/src/internal/ss_spi.c @@ -1,8 +1,7 @@ -/******************************************************************************* - * - * Modifications Copyright (c) 2015, Intel Corporation. All rights reserved. - * - ******************************************************************************/ +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. + */ #include @@ -11,7 +10,6 @@ #include "common_spi.h" #include "soc_gpio.h" #include "portable.h" - #include "ss_spi.h" #ifdef __cplusplus @@ -96,3 +94,41 @@ int ss_spi_xfer(uint8_t *buf, unsigned tx_cnt, unsigned rx_cnt) #ifdef __cplusplus } #endif + +/******************************************************************************* + * + * Synopsys DesignWare Sensor and Control IP Subsystem IO Software Driver and + * documentation (hereinafter, "Software") is an Unsupported proprietary work + * of Synopsys, Inc. unless otherwise expressly agreed to in writing between + * Synopsys and you. + * + * The Software IS NOT an item of Licensed Software or Licensed Product under + * any End User Software License Agreement or Agreement for Licensed Product + * with Synopsys or any supplement thereto. You are permitted to use and + * redistribute this Software in source and binary forms, with or without + * modification, provided that redistributions of source code must retain this + * notice. You may not view, use, disclose, copy or distribute this file or + * any information contained herein except pursuant to this license grant from + * Synopsys. If you do not agree with this notice, including the disclaimer + * below, then you are not authorized to use the Software. + * + * THIS SOFTWARE IS BEING DISTRIBUTED BY SYNOPSYS SOLELY ON AN "AS IS" BASIS + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE HEREBY DISCLAIMED. IN NO EVENT SHALL SYNOPSYS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + * DAMAGE. + * + ******************************************************************************/ + +/******************************************************************************* + * + * Modifications Copyright (c) 2015, Intel Corporation. All rights reserved. + * + ******************************************************************************/ + diff --git a/libraries/CurieIMU/src/internal/ss_spi.h b/libraries/CurieIMU/src/internal/ss_spi.h index 428c7b3a..1d60b33a 100644 --- a/libraries/CurieIMU/src/internal/ss_spi.h +++ b/libraries/CurieIMU/src/internal/ss_spi.h @@ -1,6 +1,22 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * */ + #ifndef _SS_SPI_H_ #define _SS_SPI_H_ diff --git a/libraries/CurieTime/src/CurieTime.cpp b/libraries/CurieTime/src/CurieTime.cpp index b4fb073d..466b76e2 100644 --- a/libraries/CurieTime/src/CurieTime.cpp +++ b/libraries/CurieTime/src/CurieTime.cpp @@ -1,9 +1,9 @@ /* - * CurieTime.cpp - Time library for Arduino101 - * Copyright (c) 2015 Intel Corporation. All rights reserved + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ -#include +#include #include "CurieTime.h" #define YEAR_OFFSET 1900 @@ -127,3 +127,25 @@ void setTime(int hour, int minute, int second, int day, int month, int year) setTime(t); } + +/* + * CurieTime.cpp - Time library for Arduino101 + + Copyright (c) 2015 Intel Corporation. All rights reserved + This library is intended to be uses with Arduino Time.h library functions + + The library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + */ diff --git a/libraries/CurieTimerOne/src/CurieTimerOne.cpp b/libraries/CurieTimerOne/src/CurieTimerOne.cpp index 25dc3ce1..9758a3d8 100644 --- a/libraries/CurieTimerOne/src/CurieTimerOne.cpp +++ b/libraries/CurieTimerOne/src/CurieTimerOne.cpp @@ -1,11 +1,28 @@ //*************************************************************** +// // Copyright (c) 2015 Intel Corporation. All rights reserved. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. + +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +// //*************************************************************** //*************************************************************** +// // Module: CurieTimerOne // +// // Notes: // // - Arc has two timers, Timer-0 is used. Please check the file @@ -16,6 +33,8 @@ // is used here. // //*************************************************************** + + #include "CurieTimerOne.h" #include diff --git a/libraries/CurieTimerOne/src/CurieTimerOne.h b/libraries/CurieTimerOne/src/CurieTimerOne.h index 910984e6..b84704bc 100644 --- a/libraries/CurieTimerOne/src/CurieTimerOne.h +++ b/libraries/CurieTimerOne/src/CurieTimerOne.h @@ -1,8 +1,26 @@ //*************************************************************** +// // Copyright (c) 2015 Intel Corporation. All rights reserved. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +// //*************************************************************** + //*************************************************************** +// // File: CurieTimerOne.h // // Description: @@ -18,6 +36,8 @@ // is used here. // //*************************************************************** + + #ifndef CurieTimerOne_h #define CurieTimerOne_h diff --git a/libraries/SPI/src/SPI.cpp b/libraries/SPI/src/SPI.cpp index 245883f7..79dde693 100644 --- a/libraries/SPI/src/SPI.cpp +++ b/libraries/SPI/src/SPI.cpp @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "SPI.h" SPIClass SPI; @@ -148,3 +150,22 @@ void SPIClass::notUsingInterrupt(uint8_t interruptNumber) { } interrupts(); } + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h index 8a96b930..3b7ec947 100644 --- a/libraries/SPI/src/SPI.h +++ b/libraries/SPI/src/SPI.h @@ -1,15 +1,6 @@ /* - * Copyright (c) 2010 by Cristian Maglie - * Copyright (c) 2014 by Paul Stoffregen (Transaction API) - * Copyright (c) 2014 by Matthijs Kooijman (SPISettings AVR) - * Copyright (c) 2014 by Andrew J. Kroll (atomicity fixes) - * Copyright (c) 2015 by Intel Corporation (Arduino 101 support) - * SPI Master library for arduino. - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of either the GNU General Public License version 2 - * or the GNU Lesser General Public License version 2.1, both as - * published by the Free Software Foundation. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ #ifndef _SPI_H_INCLUDED @@ -283,3 +274,17 @@ class SPIClass { extern SPIClass SPI; #endif + +/* + * Copyright (c) 2010 by Cristian Maglie + * Copyright (c) 2014 by Paul Stoffregen (Transaction API) + * Copyright (c) 2014 by Matthijs Kooijman (SPISettings AVR) + * Copyright (c) 2014 by Andrew J. Kroll (atomicity fixes) + * Copyright (c) 2015 by Intel Corporation (Arduino 101 support) + * SPI Master library for arduino. + * + * This file is free software; you can redistribute it and/or modify + * it under the terms of either the GNU General Public License version 2 + * or the GNU Lesser General Public License version 2.1, both as + * published by the Free Software Foundation. + */ diff --git a/libraries/SPI/src/SPI_registers.h b/libraries/SPI/src/SPI_registers.h index aaee5438..be6713fa 100644 --- a/libraries/SPI/src/SPI_registers.h +++ b/libraries/SPI/src/SPI_registers.h @@ -1,6 +1,8 @@ /* * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef _SPI_REGISTERS_H_ #define _SPI_REGISTERS_H_ @@ -70,3 +72,22 @@ static inline uint32_t arc32_bit_reverse(register uint32_t src, register uint32_ #define SPI_REVERSE_32(b) arc32_bit_reverse((b), 32) #endif // _SPI_REGISTERS_H_ + +/* + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + */ diff --git a/libraries/Servo/src/Servo.cpp b/libraries/Servo/src/Servo.cpp index c2dfd5da..d902f9e9 100644 --- a/libraries/Servo/src/Servo.cpp +++ b/libraries/Servo/src/Servo.cpp @@ -1,8 +1,8 @@ /* - * Servo.cpp - Interrupt driven Servo library for Arduino using ARC Timer 1 on Arduino 101 boards - * Copyright (c) 2009 Michael Margolis. All right reserved. - * Copyright (c) 2015 Intel Corporation. Implementation of Servo library for Arduino 101 + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #include "interrupt.h" #include "Arduino.h" #include "conf.h" @@ -221,3 +221,24 @@ bool Servo::attached() { return servos[this->servoIndex].Pin.isActive; } + +/* + Servo.cpp - Interrupt driven Servo library for Arduino using ARC Timer 1 on Arduino 101 boards + Copyright (c) 2009 Michael Margolis. All right reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Copyright (c) 2015 Intel Corporation. Implementation of Servo library for Arduino 101 + */ diff --git a/libraries/Servo/src/Servo.h b/libraries/Servo/src/Servo.h index b329f898..94a221b2 100644 --- a/libraries/Servo/src/Servo.h +++ b/libraries/Servo/src/Servo.h @@ -1,7 +1,8 @@ /* - * Servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2 - * Copyright (c) 2009 Michael Margolis. All right reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + /* A servo is activated by creating an instance of the Servo class passing the desired pin to the attach() method. @@ -75,3 +76,22 @@ class Servo }; #endif + +/* + Servo.h - Interrupt driven Servo library for Arduino using 16 bit timers- Version 2 + Copyright (c) 2009 Michael Margolis. All right reserved. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +*/ diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp index a1e796d5..339c3390 100644 --- a/libraries/Wire/src/Wire.cpp +++ b/libraries/Wire/src/Wire.cpp @@ -1,8 +1,8 @@ /* - * TwoWire.h - TWI/I2C library for Linux Userspace - * Copyright (c) 2013 Parav https://github.com/meanbot. - * All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + extern "C" { #include #include @@ -161,3 +161,26 @@ void TwoWire::flush(void) // Preinstantiate Objects ////////////////////////////////////////////////////// TwoWire Wire = TwoWire(); + +/* + * TwoWire.h - TWI/I2C library for Linux Userspace + * Copyright (c) 2013 Parav https://github.com/meanbot. + * All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * + * Modifications to support Intel Arduino 101 + * Copyright (C) 2015 Intel Corporation + */ diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h index ae62d765..5d850058 100644 --- a/libraries/Wire/src/Wire.h +++ b/libraries/Wire/src/Wire.h @@ -1,8 +1,8 @@ /* - * TwoWire.h - TWI/I2C library for Linux Userspace - * Copyright (c) 2013 Parav https://github.com/meanbot. - * All rights reserved. + * Copyright (c) 2015 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. */ + #ifndef TwoWire_h #define TwoWire_h @@ -56,3 +56,22 @@ extern TwoWire Wire; #endif +/* + * TwoWire.h - TWI/I2C library for Linux Userspace + * Copyright (c) 2013 Parav https://github.com/meanbot. + * All rights reserved. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ From db5e3be32056d9c195a3213b8c569446db44ab7b Mon Sep 17 00:00:00 2001 From: Mike Duong Date: Wed, 25 May 2016 14:40:58 -0700 Subject: [PATCH 3/6] ATLEDGE-553: Modify library examples header info. Update Copyright 2016 --- libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino b/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino index fea4c863..688b147f 100644 --- a/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino +++ b/libraries/CurieBLE/examples/BatteryMonitor/BatteryMonitor.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -88,7 +88,7 @@ void updateBatteryLevel() { } /* - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public From 7a2670a5058904d53a4d77dbf07abc0c9b32ba16 Mon Sep 17 00:00:00 2001 From: Mike Duong Date: Wed, 25 May 2016 15:04:57 -0700 Subject: [PATCH 4/6] ATLEDGE-553: Modify library examples header info. Update Copyright 2016 --- .../CurieBLE/examples/ButtonLED/ButtonLED.ino | 4 +- .../examples/CallbackLED/CallbackLED.ino | 4 +- libraries/CurieBLE/examples/LED/LED.ino | 4 +- libraries/CurieBLE/src/BLEAttribute.cpp | 4 +- libraries/CurieBLE/src/BLEAttribute.h | 4 +- libraries/CurieBLE/src/BLECentral.cpp | 4 +- libraries/CurieBLE/src/BLECentral.h | 4 +- libraries/CurieBLE/src/BLECharacteristic.cpp | 6 +-- libraries/CurieBLE/src/BLECharacteristic.h | 4 +- libraries/CurieBLE/src/BLECommon.h | 4 +- libraries/CurieBLE/src/BLEDescriptor.cpp | 5 ++- libraries/CurieBLE/src/BLEDescriptor.h | 4 +- libraries/CurieBLE/src/BLEPeripheral.cpp | 6 ++- libraries/CurieBLE/src/BLEPeripheral.h | 4 +- libraries/CurieBLE/src/BLEService.cpp | 5 ++- libraries/CurieBLE/src/BLEService.h | 4 +- .../CurieBLE/src/BLETypedCharacteristic.h | 5 ++- .../CurieBLE/src/BLETypedCharacteristics.cpp | 4 +- .../CurieBLE/src/BLETypedCharacteristics.h | 4 +- libraries/CurieBLE/src/BLEUuid.cpp | 4 +- libraries/CurieBLE/src/BLEUuid.h | 4 +- libraries/CurieBLE/src/CurieBLE.h | 2 +- libraries/CurieBLE/src/internal/ble_client.c | 4 +- libraries/CurieBLE/src/internal/ble_client.h | 5 ++- libraries/CurieEEPROM/src/CurieEEPROM.cpp | 3 +- libraries/CurieEEPROM/src/CurieEEPROM.h | 2 +- .../examples/Accelerometer/Accelerometer.ino | 4 +- .../AccelerometerOrientation.ino | 4 +- libraries/CurieIMU/examples/Gyro/Gyro.ino | 4 +- .../RawImuDataSerial/RawImuDataSerial.ino | 4 +- .../examples/ShockDetect/ShockDetect.ino | 4 +- .../CurieIMU/examples/StepCount/StepCount.ino | 4 +- .../CurieIMU/examples/TapDetect/TapDetect.ino | 26 +++++------ libraries/CurieIMU/src/BMI160.cpp | 4 +- libraries/CurieIMU/src/BMI160.h | 5 +-- libraries/CurieIMU/src/CurieIMU.cpp | 4 +- libraries/CurieIMU/src/CurieIMU.h | 4 +- libraries/CurieIMU/src/internal/ss_spi.c | 5 ++- libraries/CurieIMU/src/internal/ss_spi.h | 2 +- libraries/CurieTime/src/CurieTime.cpp | 5 ++- libraries/CurieTimerOne/src/CurieTimerOne.cpp | 44 ++++++++++--------- libraries/CurieTimerOne/src/CurieTimerOne.h | 44 ++++++++++--------- libraries/SPI/src/SPI.cpp | 4 +- libraries/SPI/src/SPI.h | 4 +- libraries/SPI/src/SPI_registers.h | 4 +- libraries/Servo/src/Servo.cpp | 4 +- libraries/Servo/src/Servo.h | 2 +- libraries/Wire/src/Wire.cpp | 4 +- libraries/Wire/src/Wire.h | 2 +- 49 files changed, 154 insertions(+), 144 deletions(-) diff --git a/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino b/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino index 6f68f231..b4cd873a 100644 --- a/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino +++ b/libraries/CurieBLE/examples/ButtonLED/ButtonLED.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -70,7 +70,7 @@ void loop() { } /* - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino b/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino index 24674120..f8788731 100644 --- a/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino +++ b/libraries/CurieBLE/examples/CallbackLED/CallbackLED.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -71,7 +71,7 @@ void switchCharacteristicWritten(BLECentral& central, BLECharacteristic& charact } /* - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/examples/LED/LED.ino b/libraries/CurieBLE/examples/LED/LED.ino index afc87571..a55501dc 100644 --- a/libraries/CurieBLE/examples/LED/LED.ino +++ b/libraries/CurieBLE/examples/LED/LED.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -68,7 +68,7 @@ void loop() { } /* - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLEAttribute.cpp b/libraries/CurieBLE/src/BLEAttribute.cpp index 3c0572ed..29372c51 100644 --- a/libraries/CurieBLE/src/BLEAttribute.cpp +++ b/libraries/CurieBLE/src/BLEAttribute.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -51,7 +51,7 @@ BLEAttribute::numAttributes() { } /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLEAttribute.h b/libraries/CurieBLE/src/BLEAttribute.h index 548b843f..6f829c6e 100644 --- a/libraries/CurieBLE/src/BLEAttribute.h +++ b/libraries/CurieBLE/src/BLEAttribute.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -49,7 +49,7 @@ class BLEAttribute { #endif // _BLE_ATTRIBUTE_H_INCLUDED /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLECentral.cpp b/libraries/CurieBLE/src/BLECentral.cpp index f29243cb..a5ec3214 100644 --- a/libraries/CurieBLE/src/BLECentral.cpp +++ b/libraries/CurieBLE/src/BLECentral.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -87,7 +87,7 @@ BLECentral::clearAddress() { } /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLECentral.h b/libraries/CurieBLE/src/BLECentral.h index 922c87c1..9e4ecaa3 100644 --- a/libraries/CurieBLE/src/BLECentral.h +++ b/libraries/CurieBLE/src/BLECentral.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -56,7 +56,7 @@ class BLECentral { #endif /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLECharacteristic.cpp b/libraries/CurieBLE/src/BLECharacteristic.cpp index dfc3e7dc..105b6186 100644 --- a/libraries/CurieBLE/src/BLECharacteristic.cpp +++ b/libraries/CurieBLE/src/BLECharacteristic.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -23,7 +23,7 @@ BLECharacteristic::BLECharacteristic(const char* uuid, _presentation_format(NULL) { _value_size = maxLength > BLE_MAX_ATTR_DATA_LEN ? BLE_MAX_ATTR_DATA_LEN : maxLength; - _value = (unsigned char*)malloc(_value_length); + _value = (unsigned char*)malloc(_value_size); memset(_event_handlers, 0, sizeof(_event_handlers)); } @@ -251,7 +251,7 @@ BLECharacteristic::_setValue(const uint8_t value[], uint16_t length) } /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLECharacteristic.h b/libraries/CurieBLE/src/BLECharacteristic.h index 05ee9ed6..930c9de2 100644 --- a/libraries/CurieBLE/src/BLECharacteristic.h +++ b/libraries/CurieBLE/src/BLECharacteristic.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -170,7 +170,7 @@ class BLECharacteristic : public BLEAttribute { #endif // _BLE_CHARACTERISTIC_H_INCLUDED /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLECommon.h b/libraries/CurieBLE/src/BLECommon.h index 1d8c45a0..2029758e 100644 --- a/libraries/CurieBLE/src/BLECommon.h +++ b/libraries/CurieBLE/src/BLECommon.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -31,7 +31,7 @@ typedef ble_status_t BleStatus; #endif // _BLE_COMMON_H_INCLUDED /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLEDescriptor.cpp b/libraries/CurieBLE/src/BLEDescriptor.cpp index 9a480298..adfd0399 100644 --- a/libraries/CurieBLE/src/BLEDescriptor.cpp +++ b/libraries/CurieBLE/src/BLEDescriptor.cpp @@ -1,9 +1,10 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ #include "BLEDescriptor.h" + #include "internal/ble_client.h" BLEDescriptor::BLEDescriptor(const char* uuid, const unsigned char value[], unsigned short valueLength) : @@ -70,7 +71,7 @@ BLEDescriptor::add(uint16_t serviceHandle) } /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLEDescriptor.h b/libraries/CurieBLE/src/BLEDescriptor.h index 72ee2621..10e253ab 100644 --- a/libraries/CurieBLE/src/BLEDescriptor.h +++ b/libraries/CurieBLE/src/BLEDescriptor.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -63,7 +63,7 @@ class BLEDescriptor : public BLEAttribute { #endif // _BLE_DESCRIPTOR_H_INCLUDED /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLEPeripheral.cpp b/libraries/CurieBLE/src/BLEPeripheral.cpp index 9219fa34..569b4bdc 100644 --- a/libraries/CurieBLE/src/BLEPeripheral.cpp +++ b/libraries/CurieBLE/src/BLEPeripheral.cpp @@ -1,14 +1,16 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ #include "BLEPeripheral.h" + #include "BLECharacteristic.h" #include "BLEDescriptor.h" #include "BLEService.h" #include "BLEUuid.h" + #define BLE_DISCONNECT_REASON_LOCAL_TERMINATION 0x16 void @@ -461,7 +463,7 @@ BLEPeripheral::handleGattsEvent(ble_client_gatts_event_t event, struct ble_gatts } /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLEPeripheral.h b/libraries/CurieBLE/src/BLEPeripheral.h index 8ac7fe60..bd7fdfcb 100644 --- a/libraries/CurieBLE/src/BLEPeripheral.h +++ b/libraries/CurieBLE/src/BLEPeripheral.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -244,7 +244,7 @@ class BLEPeripheral { #endif // _BLE_DEVICE_H_INCLUDED /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLEService.cpp b/libraries/CurieBLE/src/BLEService.cpp index 549b228f..bf9824df 100644 --- a/libraries/CurieBLE/src/BLEService.cpp +++ b/libraries/CurieBLE/src/BLEService.cpp @@ -1,9 +1,10 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ #include "internal/ble_client.h" + #include "BLEService.h" BLEService::BLEService(const char* uuid) : @@ -25,7 +26,7 @@ BLEService::add() { } /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLEService.h b/libraries/CurieBLE/src/BLEService.h index aa70d3f0..a72b65b1 100644 --- a/libraries/CurieBLE/src/BLEService.h +++ b/libraries/CurieBLE/src/BLEService.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -30,7 +30,7 @@ class BLEService : public BLEAttribute { #endif // _BLE_SERVICE_H_INCLUDED /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLETypedCharacteristic.h b/libraries/CurieBLE/src/BLETypedCharacteristic.h index 64218ab7..6c24ecea 100644 --- a/libraries/CurieBLE/src/BLETypedCharacteristic.h +++ b/libraries/CurieBLE/src/BLETypedCharacteristic.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -7,6 +7,7 @@ #define _BLE_TYPED_CHARACTERISTIC_H_INCLUDED #include "Arduino.h" + #include "BLECharacteristic.h" template class BLETypedCharacteristic : public BLECharacteristic @@ -79,7 +80,7 @@ template T BLETypedCharacteristic::byteSwap(T value) { #endif // _BLE_TYPED_CHARACTERISTIC_H_INCLUDED /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLETypedCharacteristics.cpp b/libraries/CurieBLE/src/BLETypedCharacteristics.cpp index bdd5f944..8e820388 100644 --- a/libraries/CurieBLE/src/BLETypedCharacteristics.cpp +++ b/libraries/CurieBLE/src/BLETypedCharacteristics.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -46,7 +46,7 @@ BLEDoubleCharacteristic::BLEDoubleCharacteristic(const char* uuid, unsigned char } /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLETypedCharacteristics.h b/libraries/CurieBLE/src/BLETypedCharacteristics.h index bfd16a8b..5c0f29e0 100644 --- a/libraries/CurieBLE/src/BLETypedCharacteristics.h +++ b/libraries/CurieBLE/src/BLETypedCharacteristics.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -66,7 +66,7 @@ class BLEDoubleCharacteristic : public BLETypedCharacteristic { #endif // _BLE_TYPED_CHARACTERISTICS_H_INCLUDED /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLEUuid.cpp b/libraries/CurieBLE/src/BLEUuid.cpp index 9551b7c1..c8d12a5a 100644 --- a/libraries/CurieBLE/src/BLEUuid.cpp +++ b/libraries/CurieBLE/src/BLEUuid.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -40,7 +40,7 @@ bt_uuid BLEUuid::uuid() const } /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/BLEUuid.h b/libraries/CurieBLE/src/BLEUuid.h index 9329c97f..5b3157f2 100644 --- a/libraries/CurieBLE/src/BLEUuid.h +++ b/libraries/CurieBLE/src/BLEUuid.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -22,7 +22,7 @@ class BLEUuid #endif // _BLE_UUID_H_INCLUDED /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/CurieBLE.h b/libraries/CurieBLE/src/CurieBLE.h index fb51dd58..46a79e1d 100644 --- a/libraries/CurieBLE/src/CurieBLE.h +++ b/libraries/CurieBLE/src/CurieBLE.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieBLE/src/internal/ble_client.c b/libraries/CurieBLE/src/internal/ble_client.c index 6766790b..a47b229b 100644 --- a/libraries/CurieBLE/src/internal/ble_client.c +++ b/libraries/CurieBLE/src/internal/ble_client.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -860,7 +860,7 @@ BleStatus ble_client_dtm_cmd(const struct ble_test_cmd *test_cmd, #endif /* - * Copyright (c) 2015, Intel Corporation. All rights reserved. + * Copyright (c) 2016, Intel Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/libraries/CurieBLE/src/internal/ble_client.h b/libraries/CurieBLE/src/internal/ble_client.h index d98a100d..6bb700cb 100644 --- a/libraries/CurieBLE/src/internal/ble_client.h +++ b/libraries/CurieBLE/src/internal/ble_client.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -124,10 +124,11 @@ BleStatus ble_client_dtm_cmd(const struct ble_test_cmd *test_cmd, } #endif + #endif // _BLE_CLIENT_H_INCLUDED /* - * Copyright (c) 2015, Intel Corporation. All rights reserved. + * Copyright (c) 2016, Intel Corporation. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/libraries/CurieEEPROM/src/CurieEEPROM.cpp b/libraries/CurieEEPROM/src/CurieEEPROM.cpp index 22b330bf..ca8fe481 100644 --- a/libraries/CurieEEPROM/src/CurieEEPROM.cpp +++ b/libraries/CurieEEPROM/src/CurieEEPROM.cpp @@ -1,8 +1,7 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ - #include "CurieEEPROM.h" CurieEEPROM EEPROM; diff --git a/libraries/CurieEEPROM/src/CurieEEPROM.h b/libraries/CurieEEPROM/src/CurieEEPROM.h index 77b3b98e..136c58dc 100644 --- a/libraries/CurieEEPROM/src/CurieEEPROM.h +++ b/libraries/CurieEEPROM/src/CurieEEPROM.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ diff --git a/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino b/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino index 3ec7662c..22069c61 100644 --- a/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino +++ b/libraries/CurieIMU/examples/Accelerometer/Accelerometer.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -55,7 +55,7 @@ float convertRawAcceleration(int aRaw) { } /* - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino b/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino index 370e48f3..9a4ed069 100644 --- a/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino +++ b/libraries/CurieIMU/examples/AccelerometerOrientation/AccelerometerOrientation.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -84,7 +84,7 @@ int orientation = - 1; // the board's orientation } /* - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieIMU/examples/Gyro/Gyro.ino b/libraries/CurieIMU/examples/Gyro/Gyro.ino index 34d76773..a7752659 100644 --- a/libraries/CurieIMU/examples/Gyro/Gyro.ino +++ b/libraries/CurieIMU/examples/Gyro/Gyro.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -55,7 +55,7 @@ float convertRawGyro(int gRaw) { } /* - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino b/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino index 628951e5..40333f9a 100644 --- a/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino +++ b/libraries/CurieIMU/examples/RawImuDataSerial/RawImuDataSerial.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -123,7 +123,7 @@ void loop() { /* =============================================== Example sketch for CurieIMU library for Intel(R) Curie(TM) devices. - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. Based on I2C device class (I2Cdev) demonstration Arduino sketch for MPU6050 class by Jeff Rowberg: https://github.com/jrowberg/i2cdevlib diff --git a/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino b/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino index 1532bb2c..3d3bb656 100644 --- a/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino +++ b/libraries/CurieIMU/examples/ShockDetect/ShockDetect.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -54,7 +54,7 @@ static void eventCallback(void) } /* - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieIMU/examples/StepCount/StepCount.ino b/libraries/CurieIMU/examples/StepCount/StepCount.ino index 53bd1b5d..386121b0 100644 --- a/libraries/CurieIMU/examples/StepCount/StepCount.ino +++ b/libraries/CurieIMU/examples/StepCount/StepCount.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -74,7 +74,7 @@ static void eventCallback(void) { } /* - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieIMU/examples/TapDetect/TapDetect.ino b/libraries/CurieIMU/examples/TapDetect/TapDetect.ino index 7809f2f4..d0489a9a 100644 --- a/libraries/CurieIMU/examples/TapDetect/TapDetect.ino +++ b/libraries/CurieIMU/examples/TapDetect/TapDetect.ino @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -23,13 +23,10 @@ void setup() { // Reduce threshold to allow detection of weaker taps (>= 750mg) CurieIMU.setDetectionThreshold(CURIE_IMU_TAP, 750); // (750mg) - // Set the time window for 2 taps to be registered as a double-tap (<= 250 milliseconds) - CurieIMU.setDetectionDuration(CURIE_IMU_DOUBLE_TAP, 250); - // Enable Double-Tap detection - CurieIMU.interrupts(CURIE_IMU_DOUBLE_TAP); + CurieIMU.interrupts(CURIE_IMU_TAP); - Serial.println("IMU initialisation complete, waiting for events..."); + Serial.println("IMU initialization complete, waiting for events..."); } void loop() { @@ -39,24 +36,24 @@ void loop() { static void eventCallback() { - if (CurieIMU.getInterruptStatus(CURIE_IMU_DOUBLE_TAP)) { + if (CurieIMU.getInterruptStatus(CURIE_IMU_TAP)) { if (CurieIMU.tapDetected(X_AXIS, NEGATIVE)) - Serial.println("Double Tap detected on negative X-axis"); + Serial.println("Tap detected on negative X-axis"); if (CurieIMU.tapDetected(X_AXIS, POSITIVE)) - Serial.println("Double Tap detected on positive X-axis"); + Serial.println("Tap detected on positive X-axis"); if (CurieIMU.tapDetected(Y_AXIS, NEGATIVE)) - Serial.println("Double Tap detected on negative Y-axis"); + Serial.println("Tap detected on negative Y-axis"); if (CurieIMU.tapDetected(Y_AXIS, POSITIVE)) - Serial.println("Double Tap detected on positive Y-axis"); + Serial.println("Tap detected on positive Y-axis"); if (CurieIMU.tapDetected(Z_AXIS, NEGATIVE)) - Serial.println("Double Tap detected on negative Z-axis"); + Serial.println("Tap detected on negative Z-axis"); if (CurieIMU.tapDetected(Z_AXIS, POSITIVE)) - Serial.println("Double Tap detected on positive Z-axis"); + Serial.println("Tap detected on positive Z-axis"); } } /* - Copyright (c) 2015 Intel Corporation. All rights reserved. + Copyright (c) 2016 Intel Corporation. All rights reserved. This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -71,5 +68,4 @@ static void eventCallback() You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ diff --git a/libraries/CurieIMU/src/BMI160.cpp b/libraries/CurieIMU/src/BMI160.cpp index 59f16df9..7e897066 100644 --- a/libraries/CurieIMU/src/BMI160.cpp +++ b/libraries/CurieIMU/src/BMI160.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -2361,7 +2361,7 @@ void BMI160Class::setRegister(uint8_t reg, uint8_t data) { /* =============================================== BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. -Copyright (c) 2015 Intel Corporation. All rights reserved. +Copyright (c) 2016 Intel Corporation. All rights reserved. Based on MPU6050 Arduino library provided by Jeff Rowberg as part of his excellent I2Cdev device library: https://github.com/jrowberg/i2cdevlib diff --git a/libraries/CurieIMU/src/BMI160.h b/libraries/CurieIMU/src/BMI160.h index a4418788..2760a086 100644 --- a/libraries/CurieIMU/src/BMI160.h +++ b/libraries/CurieIMU/src/BMI160.h @@ -1,6 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. - * See the bottom of this file for the license terms. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ #ifndef _BMI160_H_ @@ -638,7 +637,7 @@ class BMI160Class { /* =============================================== BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. -Copyright (c) 2015 Intel Corporation. All rights reserved. +Copyright (c) 2016 Intel Corporation. All rights reserved. Based on MPU6050 Arduino library provided by Jeff Rowberg as part of his excellent I2Cdev device library: https://github.com/jrowberg/i2cdevlib diff --git a/libraries/CurieIMU/src/CurieIMU.cpp b/libraries/CurieIMU/src/CurieIMU.cpp index 60f7a62c..881b1bef 100644 --- a/libraries/CurieIMU/src/CurieIMU.cpp +++ b/libraries/CurieIMU/src/CurieIMU.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -1749,7 +1749,7 @@ void CurieIMUClass::detachInterrupt(void) CurieIMUClass CurieIMU; /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieIMU/src/CurieIMU.h b/libraries/CurieIMU/src/CurieIMU.h index dce3541b..176c2fdb 100644 --- a/libraries/CurieIMU/src/CurieIMU.h +++ b/libraries/CurieIMU/src/CurieIMU.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -226,7 +226,7 @@ extern CurieIMUClass CurieIMU; /* * BMI160 accelerometer/gyroscope library for Intel(R) Curie(TM) devices. * - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieIMU/src/internal/ss_spi.c b/libraries/CurieIMU/src/internal/ss_spi.c index 33507e97..fa0b6c4f 100644 --- a/libraries/CurieIMU/src/internal/ss_spi.c +++ b/libraries/CurieIMU/src/internal/ss_spi.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -10,6 +10,7 @@ #include "common_spi.h" #include "soc_gpio.h" #include "portable.h" + #include "ss_spi.h" #ifdef __cplusplus @@ -128,7 +129,7 @@ int ss_spi_xfer(uint8_t *buf, unsigned tx_cnt, unsigned rx_cnt) /******************************************************************************* * - * Modifications Copyright (c) 2015, Intel Corporation. All rights reserved. + * Modifications Copyright (c) 2016, Intel Corporation. All rights reserved. * ******************************************************************************/ diff --git a/libraries/CurieIMU/src/internal/ss_spi.h b/libraries/CurieIMU/src/internal/ss_spi.h index 1d60b33a..4832a887 100644 --- a/libraries/CurieIMU/src/internal/ss_spi.h +++ b/libraries/CurieIMU/src/internal/ss_spi.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/CurieTime/src/CurieTime.cpp b/libraries/CurieTime/src/CurieTime.cpp index 466b76e2..9d8cafed 100644 --- a/libraries/CurieTime/src/CurieTime.cpp +++ b/libraries/CurieTime/src/CurieTime.cpp @@ -1,9 +1,10 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ #include + #include "CurieTime.h" #define YEAR_OFFSET 1900 @@ -131,7 +132,7 @@ void setTime(int hour, int minute, int second, int day, int month, int year) /* * CurieTime.cpp - Time library for Arduino101 - Copyright (c) 2015 Intel Corporation. All rights reserved + Copyright (c) 2016 Intel Corporation. All rights reserved This library is intended to be uses with Arduino Time.h library functions The library is free software; you can redistribute it and/or diff --git a/libraries/CurieTimerOne/src/CurieTimerOne.cpp b/libraries/CurieTimerOne/src/CurieTimerOne.cpp index 9758a3d8..bee8e886 100644 --- a/libraries/CurieTimerOne/src/CurieTimerOne.cpp +++ b/libraries/CurieTimerOne/src/CurieTimerOne.cpp @@ -1,23 +1,7 @@ -//*************************************************************** -// -// Copyright (c) 2015 Intel Corporation. All rights reserved. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. - -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// -//*************************************************************** - +/* + * Copyright (c) 2016 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. + */ //*************************************************************** // // Module: CurieTimerOne @@ -295,3 +279,23 @@ inline void CurieTimer::timerIsr(void) } +//*************************************************************** +// +// Copyright (c) 2016 Intel Corporation. All rights reserved. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. + +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +// +//*************************************************************** + diff --git a/libraries/CurieTimerOne/src/CurieTimerOne.h b/libraries/CurieTimerOne/src/CurieTimerOne.h index b84704bc..1442966f 100644 --- a/libraries/CurieTimerOne/src/CurieTimerOne.h +++ b/libraries/CurieTimerOne/src/CurieTimerOne.h @@ -1,23 +1,7 @@ -//*************************************************************** -// -// Copyright (c) 2015 Intel Corporation. All rights reserved. -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -// -//*************************************************************** - +/* + * Copyright (c) 2016 Intel Corporation. All rights reserved. + * See the bottom of this file for the license terms. + */ //*************************************************************** // @@ -225,3 +209,23 @@ extern CurieTimer CurieTimerOne; #endif // CurieTimerOne_h +//*************************************************************** +// +// Copyright (c) 2016 Intel Corporation. All rights reserved. +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +// +//*************************************************************** + diff --git a/libraries/SPI/src/SPI.cpp b/libraries/SPI/src/SPI.cpp index 79dde693..d9d165b4 100644 --- a/libraries/SPI/src/SPI.cpp +++ b/libraries/SPI/src/SPI.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -152,7 +152,7 @@ void SPIClass::notUsingInterrupt(uint8_t interruptNumber) { } /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/SPI/src/SPI.h b/libraries/SPI/src/SPI.h index 3b7ec947..8360cc25 100644 --- a/libraries/SPI/src/SPI.h +++ b/libraries/SPI/src/SPI.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -280,7 +280,7 @@ extern SPIClass SPI; * Copyright (c) 2014 by Paul Stoffregen (Transaction API) * Copyright (c) 2014 by Matthijs Kooijman (SPISettings AVR) * Copyright (c) 2014 by Andrew J. Kroll (atomicity fixes) - * Copyright (c) 2015 by Intel Corporation (Arduino 101 support) + * Copyright (c) 2016 by Intel Corporation (Arduino 101 support) * SPI Master library for arduino. * * This file is free software; you can redistribute it and/or modify diff --git a/libraries/SPI/src/SPI_registers.h b/libraries/SPI/src/SPI_registers.h index be6713fa..544831a2 100644 --- a/libraries/SPI/src/SPI_registers.h +++ b/libraries/SPI/src/SPI_registers.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -74,7 +74,7 @@ static inline uint32_t arc32_bit_reverse(register uint32_t src, register uint32_ #endif // _SPI_REGISTERS_H_ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public diff --git a/libraries/Servo/src/Servo.cpp b/libraries/Servo/src/Servo.cpp index d902f9e9..33ffa5bd 100644 --- a/libraries/Servo/src/Servo.cpp +++ b/libraries/Servo/src/Servo.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -240,5 +240,5 @@ bool Servo::attached() License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Copyright (c) 2015 Intel Corporation. Implementation of Servo library for Arduino 101 + Copyright (c) 2016 Intel Corporation. Implementation of Servo library for Arduino 101 */ diff --git a/libraries/Servo/src/Servo.h b/libraries/Servo/src/Servo.h index 94a221b2..378967da 100644 --- a/libraries/Servo/src/Servo.h +++ b/libraries/Servo/src/Servo.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ diff --git a/libraries/Wire/src/Wire.cpp b/libraries/Wire/src/Wire.cpp index 339c3390..518c3811 100644 --- a/libraries/Wire/src/Wire.cpp +++ b/libraries/Wire/src/Wire.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ @@ -182,5 +182,5 @@ TwoWire Wire = TwoWire(); * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Modifications to support Intel Arduino 101 - * Copyright (C) 2015 Intel Corporation + * Copyright (C) 2016 Intel Corporation */ diff --git a/libraries/Wire/src/Wire.h b/libraries/Wire/src/Wire.h index 5d850058..231f4d46 100644 --- a/libraries/Wire/src/Wire.h +++ b/libraries/Wire/src/Wire.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Intel Corporation. All rights reserved. + * Copyright (c) 2016 Intel Corporation. All rights reserved. * See the bottom of this file for the license terms. */ From 2c7f034ea880175c476e63077df6ff4b5ee0e88f Mon Sep 17 00:00:00 2001 From: Mike Duong Date: Wed, 25 May 2016 18:32:05 -0700 Subject: [PATCH 5/6] ATLEDGE-586: String.compareTo() does not compute the same as Uno for POS values --- cores/arduino/WString.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp index ec03d1ae..1a1e65c3 100644 --- a/cores/arduino/WString.cpp +++ b/cores/arduino/WString.cpp @@ -492,7 +492,13 @@ int String::compareTo(const String &s) const if (buffer && len > 0) return *(unsigned char *)buffer; return 0; } - return strcmp(buffer, s.buffer); + const char *p1 = buffer; + const char *p2 = s.buffer; + + while (*p1 == *p2++) + if ('\0' == *p1++) + return 0; + return (*(const char *)p1 - *(const char *)(p2 - 1)); } unsigned char String::equals(const String &s2) const From 850b8b392cc1cd644454ee93e67e8ec17fdd0588 Mon Sep 17 00:00:00 2001 From: Mike Duong Date: Fri, 27 May 2016 18:43:31 -0700 Subject: [PATCH 6/6] Backed out fix for strcmp() bug as sugguested by team. To be investigated why strcmp was not working as expected. --- cores/arduino/WString.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/arduino/WString.cpp b/cores/arduino/WString.cpp index ec03d1ae..6bf552cf 100644 --- a/cores/arduino/WString.cpp +++ b/cores/arduino/WString.cpp @@ -477,7 +477,7 @@ StringSumHelper & operator + (const StringSumHelper &lhs, double num) StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHelper *rhs) { StringSumHelper &a = const_cast(lhs); - if (!a.concat(rhs)) a.invalidate(); + if (!a.concat(rhs)) a.invalidate(); return a; }