pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/open2300 Update to open2300-1.8.
details: https://anonhg.NetBSD.org/pkgsrc/rev/26dd14704a5d
branches: trunk
changeset: 484709:26dd14704a5d
user: martin <martin%pkgsrc.org@localhost>
date: Mon Nov 29 08:22:27 2004 +0000
description:
Update to open2300-1.8.
This removes a lot of the previous hacks, replacing them with a fixed setup
for the serial port.
diffstat:
misc/open2300/Makefile.common | 4 +-
misc/open2300/distinfo | 16 +-
misc/open2300/patches/patch-aa | 8 +-
misc/open2300/patches/patch-ab | 516 +----------------------------------------
misc/open2300/patches/patch-ac | 57 ----
misc/open2300/patches/patch-ad | 31 --
misc/open2300/patches/patch-ae | 13 -
misc/open2300/patches/patch-af | 13 -
misc/open2300/patches/patch-ag | 13 -
misc/open2300/patches/patch-ah | 13 -
10 files changed, 18 insertions(+), 666 deletions(-)
diffs (truncated from 757 to 300 lines):
diff -r 29f4cf5098cb -r 26dd14704a5d misc/open2300/Makefile.common
--- a/misc/open2300/Makefile.common Mon Nov 29 08:20:05 2004 +0000
+++ b/misc/open2300/Makefile.common Mon Nov 29 08:22:27 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.2 2004/11/11 10:19:29 martin Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/11/29 08:22:27 martin Exp $
#
-DISTNAME= open2300-1.7
+DISTNAME= open2300-1.8
CATEGORIES= misc
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=open2300/}
diff -r 29f4cf5098cb -r 26dd14704a5d misc/open2300/distinfo
--- a/misc/open2300/distinfo Mon Nov 29 08:20:05 2004 +0000
+++ b/misc/open2300/distinfo Mon Nov 29 08:22:27 2004 +0000
@@ -1,12 +1,6 @@
-$NetBSD: distinfo,v 1.3 2004/11/12 19:01:57 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2004/11/29 08:22:27 martin Exp $
-SHA1 (open2300-1.7.tar.gz) = 12227964e6a74f41c1efbbd58c4af67fc8ca3151
-Size (open2300-1.7.tar.gz) = 330103 bytes
-SHA1 (patch-aa) = f63fcb9632729e32750f6e1129e2011bbe5c4419
-SHA1 (patch-ab) = abf7bc87a25d1894ecc32d09ed48bd479f076fe3
-SHA1 (patch-ac) = 5ddd6e4c0ce2df718c4fcb7efed1d9553c415684
-SHA1 (patch-ad) = 68fe348565fbc7434d58613b9578d499513bf1e4
-SHA1 (patch-ae) = 062f9d02e839c3c01a31d8b5ac6824a688742c2b
-SHA1 (patch-af) = eaeda5057a9d268c0034c0edff080bb488861296
-SHA1 (patch-ag) = 1239d4d60865e75aa61bba1f04e760c74e84d68c
-SHA1 (patch-ah) = 00d5dfd3a86691f7b2c0cef6360fc52103be6f17
+SHA1 (open2300-1.8.tar.gz) = 86fd2dcdef995498ed17062dd4b8df5db6b3383d
+Size (open2300-1.8.tar.gz) = 330320 bytes
+SHA1 (patch-aa) = 3f2cc9994e45a77d2bfc6907515e5c7c4a6d13d3
+SHA1 (patch-ab) = 9437137a36e434fcabde6acc5373be04523357e9
diff -r 29f4cf5098cb -r 26dd14704a5d misc/open2300/patches/patch-aa
--- a/misc/open2300/patches/patch-aa Mon Nov 29 08:20:05 2004 +0000
+++ b/misc/open2300/patches/patch-aa Mon Nov 29 08:22:27 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2004/11/11 10:19:29 martin Exp $
+$NetBSD: patch-aa,v 1.3 2004/11/29 08:22:27 martin Exp $
---- Makefile.orig 2004-08-01 11:51:08.000000000 +0200
-+++ Makefile 2004-11-11 10:43:54.000000000 +0100
+--- Makefile.orig 2004-11-13 01:25:31.000000000 +0100
++++ Makefile 2004-11-29 09:12:16.000000000 +0100
@@ -4,7 +4,7 @@
# Default locations are
# 1. Path to config file including filename given as parameter
@@ -22,7 +22,7 @@
@@ -37,7 +37,7 @@
- VERSION = 1.7
+ VERSION = 1.8
-CFLAGS = -Wall -O3 -DVERSION=\"$(VERSION)\"
+CFLAGS += -DVERSION=\"$(VERSION)\" -DSYSCONFDIR=\"$(PKG_SYSCONFDIR)\" -I /usr/pkg/include/mysql
diff -r 29f4cf5098cb -r 26dd14704a5d misc/open2300/patches/patch-ab
--- a/misc/open2300/patches/patch-ab Mon Nov 29 08:20:05 2004 +0000
+++ b/misc/open2300/patches/patch-ab Mon Nov 29 08:22:27 2004 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2004/11/11 10:19:29 martin Exp $
+$NetBSD: patch-ab,v 1.3 2004/11/29 08:22:27 martin Exp $
---- rw2300.c.orig 2004-08-01 11:51:08.000000000 +0200
-+++ rw2300.c 2004-11-11 10:45:50.000000000 +0100
+--- rw2300.c.orig 2004-11-13 13:10:39.000000000 +0100
++++ rw2300.c 2004-11-29 09:15:14.000000000 +0100
@@ -9,6 +9,7 @@
* This program is published under the GNU General Public license
*/
@@ -10,517 +10,15 @@
#include "rw2300.h"
/********************************************************************/
-@@ -30,7 +31,7 @@
- int address=0x346;
- int bytes=2;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- if (temperature_conv)
-@@ -70,7 +71,7 @@
- int address=0x34B;
- int bytes=15;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- *temp_min = ((data[1]>>4)*10 + (data[1]&0xF) + (data[0]>>4)/10.0 +
-@@ -125,7 +126,7 @@
- address=0x346;
- number=2;
-
-- if (read_safe(ws2300, address, number, data_read, command) != number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1) != number)
- read_error_exit();
-
- data_value[0] = data_read[0]&0xF;
-@@ -137,7 +138,7 @@
- address=0x23B;
- number=6;
-
-- if (read_safe(ws2300, address, number, data_read, command) != number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1) != number)
- read_error_exit();
-
- data_time[0] = data_read[0]&0xF;
-@@ -208,7 +209,7 @@
- int address=0x373;
- int bytes=2;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- if (temperature_conv)
-@@ -248,7 +249,7 @@
- int address=0x378;
- int bytes=15;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- *temp_min = ((data[1]>>4)*10 + (data[1]&0xF) + (data[0]>>4)/10.0 +
-@@ -304,7 +305,7 @@
- address=0x373;
- number=2;
-
-- if (read_safe(ws2300, address, number, data_read, command) != number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1) != number)
- read_error_exit();
-
- data_value[0] = data_read[0]&0xF;
-@@ -316,7 +317,7 @@
- address=0x23B;
- number=6;
-
-- if (read_safe(ws2300, address, number, data_read, command) != number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1) != number)
- read_error_exit();
-
- data_time[0] = data_read[0]&0xF;
-@@ -387,7 +388,7 @@
- int address=0x3CE;
- int bytes=2;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- if (temperature_conv)
-@@ -427,7 +428,7 @@
- int address=0x3D3;
- int bytes=15;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- *dp_min = ((data[1]>>4)*10 + (data[1]&0xF) + (data[0]>>4)/10.0 +
-@@ -483,7 +484,7 @@
- address=0x3CE;
- number=2;
-
-- if (read_safe(ws2300, address, number, data_read, command) != number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1) != number)
- read_error_exit();
-
- data_value[0] = data_read[0]&0xF;
-@@ -495,7 +496,7 @@
- address=0x23B;
- number=6;
-
-- if (read_safe(ws2300, address, number, data_read, command) != number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1) != number)
- read_error_exit();
-
- data_time[0] = data_read[0]&0xF;
-@@ -562,7 +563,7 @@
- int address=0x3FB;
- int bytes=1;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- return ((data[0] >> 4) * 10 + (data[0] & 0xF));
-@@ -591,7 +592,7 @@
- int address=0x3FB;
- int bytes=13;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- *hum_min = (data[1] >> 4) * 10 + (data[1] & 0xF);
-@@ -638,7 +639,7 @@
- address=0x3FB;
- number=1;
-
-- if (read_safe(ws2300, address, number, data_read, command) != number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1) != number)
- read_error_exit();
-
- data_value[0] = data_read[0]&0xF;
-@@ -648,7 +649,7 @@
- address=0x23B;
- number=6;
-
-- if (read_safe(ws2300, address, number, data_read, command) != number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1) != number)
- read_error_exit();
-
- data_time[0] = data_read[0]&0xF;
-@@ -715,7 +716,7 @@
- int address=0x419;
- int bytes=1;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- return ((data[0] >> 4) * 10 + (data[0] & 0xF));
-@@ -745,7 +746,7 @@
- int address=0x419;
- int bytes=13;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- *hum_min = (data[1] >> 4) * 10 + (data[1] & 0xF);
-@@ -792,7 +793,7 @@
- address=0x419;
- number=1;
-
-- if (read_safe(ws2300, address, number, data_read, command) != number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1) != number)
- read_error_exit();
-
- data_value[0] = data_read[0]&0xF;
-@@ -802,7 +803,7 @@
- address=0x23B;
- number=6;
-
-- if (read_safe(ws2300, address, number, data_read, command) != number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1) != number)
- read_error_exit();
-
- data_time[0] = data_read[0]&0xF;
-@@ -879,7 +880,7 @@
-
- for (i=0; i<MAXWINDRETRIES; i++)
- {
-- if (read_safe(ws2300, address, bytes, data, command)!=bytes) //Wind
-+ if (read_safe(ws2300, address, bytes, data, command, 1)!=bytes) //Wind
- read_error_exit();
-
- if ( (data[0]!=0x00) || //Invalid wind data
-@@ -935,7 +936,12 @@
-
- for (i=0; i<MAXWINDRETRIES; i++)
- {
-- if (read_safe(ws2300, address, bytes, data, command)!=bytes) //Wind
-+ // do not verify checksum here - the result is ~5.5 bytes
-+ // and apparently the weather station calculates it differently
-+ // than what we expect. example:
-+ // 0x00, 0x00, 0xd0, 0xdd, 0xdd, 0x0a - with checksum 0x97
-+ // instead of the expected 0x94.
-+ if (read_safe(ws2300, address, bytes, data, command, 0)!=bytes) //Wind
- read_error_exit();
-
- if ( (data[0]!=0x00) || //Invalid wind data
-@@ -999,7 +1005,7 @@
- int address=0x4EE;
- int bytes=15;
-
-- if (read_safe(ws2300, address, bytes, data, command) != bytes)
-+ if (read_safe(ws2300, address, bytes, data, command, 1) != bytes)
- read_error_exit();
-
- if (wind_min != NULL)
-@@ -1057,7 +1063,7 @@
-
- for (i=0; i<MAXWINDRETRIES; i++)
- {
-- if (read_safe(ws2300, address, number, data_read, command)!=number)
-+ if (read_safe(ws2300, address, number, data_read, command, 1)!=number)
- read_error_exit();
-
- if ((data_read[0]!=0x00) || //Invalid wind data
-@@ -1083,7 +1089,7 @@
- address=0x23B;
- number=6;
-
Home |
Main Index |
Thread Index |
Old Index