diff --git a/docs/customizing.htm b/docs/customizing.htm
index 3686b078..9c025e9c 100644
--- a/docs/customizing.htm
+++ b/docs/customizing.htm
@@ -2379,7 +2379,7 @@ outTemp = Outside Temperature
aggregate_type = max
label = High
[[[[low]]]]
- date_type = outTemp
+ data_type = outTemp
aggregate_type = min
label = Low Temperature
diff --git a/docs/upgrading.htm b/docs/upgrading.htm
index 13d368f2..24be1ddc 100644
--- a/docs/upgrading.htm
+++ b/docs/upgrading.htm
@@ -19,25 +19,25 @@ Version: 2.6.0a3
-
This document has three sections:
+ This document contains the following sections:
- The section Instructions for
- Specific Versions applies to both installation methods.
- Warning!
- You must use the same upgrade technique as your initial install!
-
- For example, if you used setup.py to install
- weewx, you should use
- setup.py to upgrade.
-
- If you used a DEB or RPM package to install, then you should upgrade
- using the same package type.
-
+ The section Instructions for Specific Versions applies to each installation method.
+
+ Warning!
+ You must use the same upgrade technique as your initial install!
+
+ For example, if you used setup.py to install
+ weewx, you should use
+ setup.py to upgrade.
+
+ If you used a DEB or RPM package to install, then you should upgrade
+ using the same package type.
+
Before upgrading weewx, check the section
@@ -76,8 +76,7 @@ Version: 2.6.0a3
one does not already exist.
-
- DEB Package
+
Upgrade to X.Y.Z like this:
sudo dpkg -i weewx_X.Y.Z-R.deb
The upgrade process will not modify the weewx
@@ -113,7 +112,8 @@ Version: 2.6.0a3
/etc/weewx/weewx.conf
- RPM Package
+
+
Upgrade to X.Y.Z like this:
sudo rpm -U weewx-X.Y.Z-R.rpm
The upgrade process will not modify the weewx
diff --git a/docs/usersguide.htm b/docs/usersguide.htm
index cbb190a9..1745122a 100644
--- a/docs/usersguide.htm
+++ b/docs/usersguide.htm
@@ -71,6 +71,21 @@ Version: 2.6.0a3
Station
Driver |
Maturity |
+
+ | Aercus |
+ WS2083 |
+ USB |
+ pyusb |
+ FineOffsetUSB5 |
+ |
+
+
+ | WS3083 |
+ USB |
+ pyusb |
+ FineOffsetUSB5 |
+ |
+
| Ambient Weather |
WS1090 |
@@ -547,23 +562,17 @@ Version: 2.6.0a3
Oregon Scientific WMR-918/968 series. Tested on the
Oregon Scientific WMR968.
- Fine Offset series. These are branded by
- many vendors, including Ambient Weather, Elecsa, Froggit, Maplin,
- National Geographic, Tycon, Velleman, Watson, and others.
+ Fine Offset 10xx, 20xx, and 30xx series.
Tested on the
Ambient Weather WS2080.
- La Crosse WS-23xx series. These are branded by
- other vendors, including TFA and TechnoLine. Tested on the
+ La Crosse WS-23xx series. Tested on the
La Crosse 2317.
- La Crosse WS-28xx series. These are branded by
- other vendors, including TFA and TechnoLine. Tested on the
+ La Crosse WS-28xx series. Tested on the
La Crosse C86234.
- Hideki TE923. These are branded by many vendors,
- including Cresta, Honeywell, IROX, Meade, Mebus, TFA, and Ventus.
- Tested on the
+ Hideki Professional Weather Stations. Tested on the
Meade TE923.
diff --git a/pkg/debian/rules b/pkg/debian/rules
index 7ca99a22..ed3fa42b 100755
--- a/pkg/debian/rules
+++ b/pkg/debian/rules
@@ -77,7 +77,9 @@ install: build
ln -s ../share/weewx/wee_reports $(DST)/usr/bin/wee_reports
ln -s ../share/weewx/wee_config_database $(DST)/usr/bin/wee_config_database
ln -s ../share/weewx/wee_config_fousb $(DST)/usr/bin/wee_config_fousb
+ ln -s ../share/weewx/wee_config_te923 $(DST)/usr/bin/wee_config_te923
ln -s ../share/weewx/wee_config_vantage $(DST)/usr/bin/wee_config_vantage
+ ln -s ../share/weewx/wee_config_ws23xx $(DST)/usr/bin/wee_config_ws23xx
ln -s ../share/weewx/wee_config_ws28xx $(DST)/usr/bin/wee_config_ws28xx
# keep lintian happy
diff --git a/pkg/debian/templates b/pkg/debian/templates
index 480ee5d9..6211a62f 100644
--- a/pkg/debian/templates
+++ b/pkg/debian/templates
@@ -83,4 +83,4 @@ Template: weewx/te923_model
Type: string
Default: TE923
Description: weather station model:
- Specify the station model, for example TFA Nexus, La Crosse WS2817
+ Specify the station model, for example TFA Nexus, IROX Pro X, or Meade TE923W.
diff --git a/pkg/weewx.spec.in b/pkg/weewx.spec.in
index 21490fcd..c18ee9b6 100644
--- a/pkg/weewx.spec.in
+++ b/pkg/weewx.spec.in
@@ -109,7 +109,9 @@ ln -s ../share/weewx/weewxd %{buildroot}%{_bindir}/weewxd
ln -s ../share/weewx/wee_reports %{buildroot}%{_bindir}/wee_reports
ln -s ../share/weewx/wee_config_database %{buildroot}%{_bindir}/wee_config_database
ln -s ../share/weewx/wee_config_fousb %{buildroot}%{_bindir}/wee_config_fousb
+ln -s ../share/weewx/wee_config_te923 %{buildroot}%{_bindir}/wee_config_te923
ln -s ../share/weewx/wee_config_vantage %{buildroot}%{_bindir}/wee_config_vantage
+ln -s ../share/weewx/wee_config_ws23xx %{buildroot}%{_bindir}/wee_config_ws23xx
ln -s ../share/weewx/wee_config_ws28xx %{buildroot}%{_bindir}/wee_config_ws28xx
# pre-compile the python code
@@ -158,7 +160,9 @@ rm -rf %{buildroot}
%{_bindir}/wee_reports
%{_bindir}/wee_config_database
%{_bindir}/wee_config_fousb
+%{_bindir}/wee_config_te923
%{_bindir}/wee_config_vantage
+%{_bindir}/wee_config_ws23xx
%{_bindir}/wee_config_ws28xx
%doc %{dst_doc_dir}/
%config(noreplace) %{dst_cfg_dir}/
diff --git a/setup.py b/setup.py
index 73eb0b20..87a3aae9 100755
--- a/setup.py
+++ b/setup.py
@@ -594,7 +594,9 @@ if __name__ == "__main__":
py_modules = ['daemon'],
scripts = ['bin/wee_config_database',
'bin/wee_config_fousb',
+ 'bin/wee_config_te923',
'bin/wee_config_vantage',
+ 'bin/wee_config_ws23xx',
'bin/wee_config_ws28xx',
'bin/weewxd',
'bin/wee_reports'],