Permalink
Browse files

updating copyright to 2012-2016 for 1.1 release build

  • Loading branch information...
1 parent 46b9cce commit 2a651e332a783cd1dec37649a58ae62b1fbe2844 @savageautomate savageautomate committed Jul 26, 2016
View
@@ -9,7 +9,7 @@
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
View
@@ -3,7 +3,7 @@
=========================================================================
Pi4J Library
- Copyright (C) 2012-2015 Pi4J.com
+ Copyright (C) 2012-2016 Pi4J.com
This product includes software developed at:
The Pi4J Project (http://www.pi4j.com/).
@@ -13,15 +13,15 @@
This software is licensed under the GNU LGPLv3 license.
More information about licensing terms can be found at:
http://pi4j.com/license.html
-
+
Additional information about this project and its authors can be found at:
- http://www.pi4j.com/
- http://www.raspicentral.com
- http://www.savagehomeautomation.com
-
+
This software compiles against libraries from the WiringPi project.
The Wiring Pi project is provided by Gordon Henderson and is available
- from
+ from
http://wiringpi.com/
The WiringPi project is licensed under the GNU LGPLv3 license
@@ -30,4 +30,4 @@
=========================================================================
Subject to the terms of the software license, this NOTICE file must be
included in any Derivative Works that You distribute as a readable copy.
- (Section 4d)
+ (Section 4d)
@@ -1,18 +1,3 @@
-/*
- * Copyright 2015 Pi4J.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package com.pi4j.io.wdt;
/*
@@ -1,18 +1,3 @@
-/*
- * Copyright 2015 Pi4J.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package com.pi4j.io.wdt.impl;
/*
@@ -1,18 +1,3 @@
-/*
- * Copyright 2015 Pi4J.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package com.pi4j.jni;
/*
@@ -31,22 +31,6 @@
import com.pi4j.io.wdt.impl.WDTimerImpl;
import java.io.IOException;
-/*
- * Copyright 2015 Pi4J.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
/**
*
* @author zerog
@@ -12,7 +12,7 @@ set -e # exit on error
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -12,7 +12,7 @@ set -e # exit on error
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -12,7 +12,7 @@ set -e # exit on error
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -12,7 +12,7 @@ set -e # exit on error
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -12,7 +12,7 @@ set -e # exit on error
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -12,7 +12,7 @@ set -e # exit on error
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -12,7 +12,7 @@ set -e # exit on error
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -12,7 +12,7 @@ set -e # exit on error
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -10,7 +10,7 @@
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -10,7 +10,7 @@
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -10,7 +10,7 @@
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -10,7 +10,7 @@
# this project can be found here: http://www.pi4j.com/
# **********************************************************************
# %%
-# Copyright (C) 2012 - 2015 Pi4J
+# Copyright (C) 2012 - 2016 Pi4J
# %%
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Lesser General Public License as
@@ -5,13 +5,13 @@
* **********************************************************************
* ORGANIZATION : Pi4J
* PROJECT : Pi4J :: I2C Device Abstractions
- * FILENAME : BMP085.java
- *
- * This file is part of the Pi4J project. More information about
+ * FILENAME : BMP085.java
+ *
+ * This file is part of the Pi4J project. More information about
* this project can be found here: http://www.pi4j.com/
* **********************************************************************
* %%
- * Copyright (C) 2012 - 2015 Pi4J
+ * Copyright (C) 2012 - 2016 Pi4J
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
@@ -52,11 +52,11 @@
private int mc;
private int md;
private int oss;
-
+
public BMP085(I2CBus bus) throws IOException {
device = bus.getDevice(0x77);
}
-
+
public void init() {
try {
byte[] eepromData = new byte[22];
@@ -121,7 +121,7 @@ public int readUncompensatedPressure() throws IOException {
throw new IOException("Cannot read pressure; r=" + r);
}
- int up = ((p[0] & 0xff) << 16) + ((p[1] & 0xff) << 8) +(p[2] & 0xff) >> (8 - oss);
+ int up = ((p[0] & 0xff) << 16) + ((p[1] & 0xff) << 8) +(p[2] & 0xff) >> (8 - oss);
return up;
}
@@ -145,10 +145,10 @@ public int calculatePressure(int up) {
long b3 = (((ac1 * 4 + x3) << oss) + 2) >> 2;
System.out.println("b3=" + b3);
- x1 = (ac3 * b6) >> 13;
+ x1 = (ac3 * b6) >> 13;
System.out.println("x1=" + x1);
- x2 = (b1 * ((b6 * b6) >> 12)) >> 16;
+ x2 = (b1 * ((b6 * b6) >> 12)) >> 16;
System.out.println("x3=" + x2);
x3 = ((x1 + x2) + 2) >> 2;
@@ -209,7 +209,7 @@ public static void main(String[] args) throws Exception {
I2CBus bus = I2CFactory.getInstance(I2CBus.BUS_0);
BMP085 bmp085 = new BMP085(bus);
-
+
bmp085.init();
int t = bmp085.readTemperature();
System.out.println("Temperature is " + t + " in 0.1C");
@@ -5,13 +5,13 @@
* **********************************************************************
* ORGANIZATION : Pi4J
* PROJECT : Pi4J :: I2C Device Abstractions
- * FILENAME : PCF8574.java
- *
- * This file is part of the Pi4J project. More information about
+ * FILENAME : PCF8574.java
+ *
+ * This file is part of the Pi4J project. More information about
* this project can be found here: http://www.pi4j.com/
* **********************************************************************
* %%
- * Copyright (C) 2012 - 2015 Pi4J
+ * Copyright (C) 2012 - 2016 Pi4J
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as
@@ -40,15 +40,15 @@
private I2CDevice device;
private int lastRead;
-
+
public PCF8574(I2CBus bus) throws IOException {
this.device = bus.getDevice(0x27);
}
public void write(byte b) throws IOException {
device.write((byte)b);
}
-
+
public int read() throws IOException {
lastRead = device.read();
return lastRead;
@@ -68,17 +68,17 @@ public static void main(String[] args) throws Exception {
Thread.sleep(100);
i = io.read();
System.out.print(" x " + Integer.toHexString(i) + "\r");
-
+
Thread.sleep(1000);
-
+
io.write((byte)0);
Thread.sleep(100);
-
+
i = io.read();
System.out.print(" 0 " + Integer.toHexString(i) + "\r");
-
+
Thread.sleep(1000);
-
+
}
}
}

0 comments on commit 2a651e3

Please sign in to comment.