Revision 104:3f48daed532b, committed 2016-08-02

Comitter:

j3

Date:

Tue Aug 02 18:21:09 2016 +0000

Parent:

103:6dcbb5166da1

Child:

105:e6ba25711c05

Commit message:

removed "OneWire" from absolute paths

Changed in this revision

--- a/Masters/DS2465/DS2465.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/DS2465/DS2465.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -30,7 +30,7 @@
 * ownership rights.
 **********************************************************************/
 
-#include "DS2465.h"
+#include "Masters/DS2465/DS2465.h"
 #include "I2C.h"
 #include "wait_api.h"
 

--- a/Masters/DS2480B/DS2480B.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/DS2480B/DS2480B.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -30,7 +30,7 @@
 * ownership rights.
 **********************************************************************/
 
-#include "DS2480B.h"
+#include "Masters/DS2480B/DS2480B.h"
 #include "Serial.h"
 #include "Timer.h"
 #include "wait_api.h"

--- a/Masters/DS248x/DS2482EightChannel/DS2482EightChannel.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/DS248x/DS2482EightChannel/DS2482EightChannel.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -31,7 +31,7 @@
 **********************************************************************/
 
 
-#include "OneWire/Masters/DS248x/DS2482EightChannel/DS2482EightChannel.h"
+#include "Masters/DS248x/DS2482EightChannel/DS2482EightChannel.h"
 
 using OneWire::OneWireMaster;
 using OneWire::DS2482EightChannel;

--- a/Masters/DS248x/DS2482EightChannel/DS2482EightChannel.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/DS248x/DS2482EightChannel/DS2482EightChannel.h	Tue Aug 02 18:21:09 2016 +0000
@@ -35,7 +35,7 @@
 #define OneWire_Masters_DS2482_Eight_Channel
 
 
-#include "OneWire/Masters/DS248x/DS248x.h"
+#include "Masters/DS248x/DS248x.h"
 
 
 namespace OneWire

--- a/Masters/DS248x/DS2482SingleChannel/DS2482SingleChannel.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/DS248x/DS2482SingleChannel/DS2482SingleChannel.h	Tue Aug 02 18:21:09 2016 +0000
@@ -35,7 +35,7 @@
 #define OneWire_Masters_DS2482_Single_Channel
 
 
-#include "OneWire/Masters/DS248x/DS248x.h"
+#include "Masters/DS248x/DS248x.h"
 
 
 namespace OneWire

--- a/Masters/DS248x/DS2484/DS2484.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/DS248x/DS2484/DS2484.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -31,7 +31,7 @@
 **********************************************************************/
 
 
-#include "OneWire/Masters/DS248x/DS2484/DS2484.h"
+#include "Masters/DS248x/DS2484/DS2484.h"
 
 
 using OneWire::OneWireMaster;

--- a/Masters/DS248x/DS2484/DS2484.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/DS248x/DS2484/DS2484.h	Tue Aug 02 18:21:09 2016 +0000
@@ -35,7 +35,7 @@
 #define OneWire_Masters_DS2484
 
 
-#include "OneWire/Masters/DS248x/DS248x.h"
+#include "Masters/DS248x/DS248x.h"
 
 
 namespace OneWire

--- a/Masters/DS248x/DS248x.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/DS248x/DS248x.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -30,7 +30,7 @@
 * ownership rights.
 **********************************************************************/
 
-#include "DS248x.h"
+#include "Masters/DS248x/DS248x.h"
 #include "I2C.h"
 
 using OneWire::OneWireMaster;

--- a/Masters/Masters.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/Masters.h	Tue Aug 02 18:21:09 2016 +0000
@@ -35,15 +35,15 @@
 #define ONEWIRE_MASTERS_H
 
 
-#include "OneWire/Masters/DS248x/DS2484/DS2484.h"
-#include "OneWire/Masters/DS248x/DS2482EightChannel/DS2482EightChannel.h"
-#include "OneWire/Masters/DS248x/DS2482SingleChannel/DS2482SingleChannel.h"
-#include "OneWire/Masters/DS2480B/DS2480B.h"
-#include "OneWire/Masters/DS2465/DS2465.h"
+#include "Masters/DS248x/DS2484/DS2484.h"
+#include "Masters/DS248x/DS2482EightChannel/DS2482EightChannel.h"
+#include "Masters/DS248x/DS2482SingleChannel/DS2482SingleChannel.h"
+#include "Masters/DS2480B/DS2480B.h"
+#include "Masters/DS2465/DS2465.h"
 
 //Bit-Bang Master only supported on MAX32600MBED Board
 #if(TARGET_MAX32600)
-#include "OneWire/Masters/OwGpio/OwGpio.h"
+#include "Masters/OwGpio/OwGpio.h"
 #endif
 
 #endif /*ONEWIRE_MASTERS_H*/

--- a/Masters/OneWireMaster.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/OneWireMaster.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -30,7 +30,7 @@
 * ownership rights.
 **********************************************************************/
 
-#include "OneWireMaster.h"
+#include "Masters/OneWireMaster.h"
 #include "Utilities/crc.h"
 
 using namespace OneWire::crc;

--- a/Masters/OwGpio/OwGpio.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Masters/OwGpio/OwGpio.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -32,7 +32,7 @@
 
 #ifdef TARGET_MAX32600
 
-#include "OwGpio.h"
+#include "Masters/OwGpio/OwGpio.h"
 #include "gpio_regs.h"
 #include "clkman_regs.h"
 #include "owlink.h"

--- a/OneWire.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/OneWire.h	Tue Aug 02 18:21:09 2016 +0000
@@ -34,8 +34,8 @@
 #ifndef MBED_OneWire
 #define MBED_OneWire
 
-#include "OneWire/Masters/Masters.h"
-#include "OneWire/Slaves/Slaves.h"
-#include "OneWire/RomId/RomCommands.h"
+#include "Masters/Masters.h"
+#include "Slaves/Slaves.h"
+#include "RomId/RomCommands.h"
 
 #endif /* MBED_OneWire */

--- a/RomId/RomCommands.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/RomId/RomCommands.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -1,4 +1,36 @@
-#include "RomCommands.h"
+/******************************************************************//**
+* Copyright (C) 2016 Maxim Integrated Products, Inc., All Rights Reserved.
+*
+* 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 MAXIM INTEGRATED 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.
+*
+* Except as contained in this notice, the name of Maxim Integrated
+* Products, Inc. shall not be used except as stated in the Maxim Integrated
+* Products, Inc. Branding Policy.
+*
+* The mere transfer of this software does not imply any licenses
+* of trade secrets, proprietary technology, copyrights, patents,
+* trademarks, maskwork rights, or any other form of intellectual
+* property whatsoever. Maxim Integrated Products, Inc. retains all
+* ownership rights.
+**********************************************************************/
+
+#include "RomId/RomCommands.h"
 
 using namespace OneWire::crc;
 

--- a/RomId/RomCommands.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/RomId/RomCommands.h	Tue Aug 02 18:21:09 2016 +0000
@@ -1,10 +1,41 @@
 /// @file RomCommands.h
+/******************************************************************//**
+* Copyright (C) 2016 Maxim Integrated Products, Inc., All Rights Reserved.
+*
+* 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 MAXIM INTEGRATED 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.
+*
+* Except as contained in this notice, the name of Maxim Integrated
+* Products, Inc. shall not be used except as stated in the Maxim Integrated
+* Products, Inc. Branding Policy.
+*
+* The mere transfer of this software does not imply any licenses
+* of trade secrets, proprietary technology, copyrights, patents,
+* trademarks, maskwork rights, or any other form of intellectual
+* property whatsoever. Maxim Integrated Products, Inc. retains all
+* ownership rights.
+**********************************************************************/
 
 #ifndef OneWire_RomCommands
 #define OneWire_RomCommands
 
 #include <stdint.h>
-#include "RomId.h"
+#include "RomId/RomId.h"
 #include "Masters/OneWireMaster.h"
 
 namespace OneWire

--- a/RomId/RomIterator.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/RomId/RomIterator.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -30,7 +30,7 @@
 * ownership rights.
 **********************************************************************/
 
-#include "RomIterator.h"
+#include "RomId/RomIterator.h"
 #include "Masters/OneWireMaster.h"
 
 using namespace OneWire;

--- a/RomId/RomIterator.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/RomId/RomIterator.h	Tue Aug 02 18:21:09 2016 +0000
@@ -34,7 +34,7 @@
 #define OneWire_RomIterator
 
 #include <stdint.h>
-#include "RomCommands.h"
+#include "RomId/RomCommands.h"
 
 namespace OneWire
 {

--- a/Slaves/Authenticators/Authenticators.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Authenticators/Authenticators.h	Tue Aug 02 18:21:09 2016 +0000
@@ -34,6 +34,6 @@
 #ifndef ONEWIRE_AUTHENTICATORS_H
 #define ONEWIRE_AUTHENTICATORS_H
 
-#include "DS28E15_22_25/DS28E15_22_25.h"
+#include "Slaves/Authenticators/DS28E15_22_25/DS28E15_22_25.h"
 
 #endif /*ONEWIRE_AUTHENTICATORS_H*/

--- a/Slaves/Authenticators/DS28E15_22_25/DS28E15_22_25.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Authenticators/DS28E15_22_25/DS28E15_22_25.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -30,7 +30,7 @@
 * ownership rights.
 **********************************************************************/
 
-#include "DS28E15_22_25.h"
+#include "Slaves/Authenticators/DS28E15_22_25/DS28E15_22_25.h"
 #include "Masters/OneWireMaster.h"
 #include "Utilities/crc.h"
 #include "wait_api.h"

--- a/Slaves/Bridges/DS28E17/DS28E17.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Bridges/DS28E17/DS28E17.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -30,8 +30,8 @@
 * ownership rights.
 **********************************************************************/
 
-#include "DS28E17.h"
 #include "Masters/OneWireMaster.h"
+#include "Slaves/Bridges/DS28E17/DS28E17.h"
 #include "Utilities/crc.h"
 
 using OneWire::DS28E17;

--- a/Slaves/Bridges/DS28E17/DS28E17.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Bridges/DS28E17/DS28E17.h	Tue Aug 02 18:21:09 2016 +0000
@@ -35,7 +35,7 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include "OneWireSlave.h"
+#include "Slaves/OneWireSlave.h"
 
 namespace OneWire
 {

--- a/Slaves/Sensors/DS18B20/DS18B20.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Sensors/DS18B20/DS18B20.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -31,7 +31,7 @@
 **********************************************************************/
 
 
-#include "DS18B20.h"
+#include "Slaves/Sensors/DS18B20/DS18B20.h"
 #include "wait_api.h"
 
 

--- a/Slaves/Sensors/DS18B20/DS18B20.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Sensors/DS18B20/DS18B20.h	Tue Aug 02 18:21:09 2016 +0000
@@ -33,7 +33,7 @@
 #ifndef OneWire_Slaves_Sensors_DS18B20
 #define OneWire_Slaves_Sensors_DS18B20
 
-#include "OneWireSlave.h"
+#include "Slaves/OneWireSlave.h"
 
 namespace OneWire
 {

--- a/Slaves/Sensors/DS1920/DS1920.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Sensors/DS1920/DS1920.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -31,7 +31,7 @@
 **********************************************************************/
 
 
-#include "DS1920.h"
+#include "Slaves/Sensors/DS1920/DS1920.h"
 #include "wait_api.h"
 
 

--- a/Slaves/Sensors/DS1920/DS1920.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Sensors/DS1920/DS1920.h	Tue Aug 02 18:21:09 2016 +0000
@@ -33,7 +33,7 @@
 #ifndef OneWire_Temperature_DS1920
 #define OneWire_Temperature_DS1920
 
-#include "OneWireSlave.h"
+#include "Slaves/OneWireSlave.h"
 
 namespace OneWire
 {

--- a/Slaves/Sensors/Sensors.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Sensors/Sensors.h	Tue Aug 02 18:21:09 2016 +0000
@@ -34,7 +34,7 @@
 #ifndef ONEWIRE_SENSORS_H
 #define ONEWIRE_SENSORS_H
 
-#include "OneWire/Slaves/Sensors/DS1920/DS1920.h"
-#include "OneWire/Slaves/Sensors/DS18B20/DS18B20.h"
+#include "Slaves/Sensors/DS1920/DS1920.h"
+#include "Slaves/Sensors/DS18B20/DS18B20.h"
 
 #endif /*ONEWIRE_SENSORS_H*/

--- a/Slaves/Slaves.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Slaves.h	Tue Aug 02 18:21:09 2016 +0000
@@ -34,9 +34,9 @@
 #ifndef OneWire_Slaves
 #define OneWire_Slaves
 
-#include "OneWire/Slaves/Authenticators/Authenticators.h"
-#include "OneWire/Slaves/Bridges/Bridges.h"
-#include "OneWire/Slaves/Sensors/Sensors.h"
-#include "OneWire/Slaves/Switches/Switches.h"
+#include "Slaves/Authenticators/Authenticators.h"
+#include "Slaves/Bridges/Bridges.h"
+#include "Slaves/Sensors/Sensors.h"
+#include "Slaves/Switches/Switches.h"
 
 #endif /* OneWire_Slaves */
\ No newline at end of file

--- a/Slaves/Switches/DS2413/DS2413.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Switches/DS2413/DS2413.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -30,7 +30,7 @@
 * ownership rights.
 **********************************************************************/
 
-#include "DS2413.h"
+#include "Slaves/Switches/DS2413/DS2413.h"
 
 using OneWire::DS2413;
 using OneWire::OneWireMaster;

--- a/Slaves/Switches/DS2413/DS2413.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Switches/DS2413/DS2413.h	Tue Aug 02 18:21:09 2016 +0000
@@ -34,7 +34,7 @@
 #define OneWire_Switches_DS2413
 
 #include <stdint.h>
-#include "OneWireSlave.h"
+#include "Slaves/OneWireSlave.h"
 
 namespace OneWire
 {

--- a/Slaves/Switches/Switches.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Slaves/Switches/Switches.h	Tue Aug 02 18:21:09 2016 +0000
@@ -35,7 +35,7 @@
 #define ONEWIRE_SWITCHES_H
 
 
-#include "DS2413/DS2413.h"
+#include "Slaves/Switches/DS2413/DS2413.h"
 
 
 #endif /*ONEWIRE_SWITCHES_H*/

--- a/Utilities/crc.cpp	Thu Jul 07 13:56:44 2016 -0500
+++ b/Utilities/crc.cpp	Tue Aug 02 18:21:09 2016 +0000
@@ -1,4 +1,36 @@
-#include "crc.h"
+/******************************************************************//**
+* Copyright (C) 2016 Maxim Integrated Products, Inc., All Rights Reserved.
+*
+* 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 MAXIM INTEGRATED 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.
+*
+* Except as contained in this notice, the name of Maxim Integrated
+* Products, Inc. shall not be used except as stated in the Maxim Integrated
+* Products, Inc. Branding Policy.
+*
+* The mere transfer of this software does not imply any licenses
+* of trade secrets, proprietary technology, copyrights, patents,
+* trademarks, maskwork rights, or any other form of intellectual
+* property whatsoever. Maxim Integrated Products, Inc. retains all
+* ownership rights.
+**********************************************************************/
+
+#include "Utilities/crc.h"
 
 namespace OneWire
 {

--- a/Utilities/crc.h	Thu Jul 07 13:56:44 2016 -0500
+++ b/Utilities/crc.h	Tue Aug 02 18:21:09 2016 +0000
@@ -1,3 +1,35 @@
+/******************************************************************//**
+* Copyright (C) 2016 Maxim Integrated Products, Inc., All Rights Reserved.
+*
+* 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 MAXIM INTEGRATED 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.
+*
+* Except as contained in this notice, the name of Maxim Integrated
+* Products, Inc. shall not be used except as stated in the Maxim Integrated
+* Products, Inc. Branding Policy.
+*
+* The mere transfer of this software does not imply any licenses
+* of trade secrets, proprietary technology, copyrights, patents,
+* trademarks, maskwork rights, or any other form of intellectual
+* property whatsoever. Maxim Integrated Products, Inc. retains all
+* ownership rights.
+**********************************************************************/
+
 #ifndef OneWire_CRC
 #define OneWire_CRC