Commit Graph

114 Commits

Author SHA1 Message Date
John Kline
dfe31c2da6 Reimplement gen_records(), refactor command(), doc changes, logwatch changes. (#484)
* Robustness enhancements to cc3000 driver including py2/py3 support
cc300.py:
- changes to work on both py2/py3 (tested on both)
- change timeout to 1s (more not needed)
- retry commands when reading cmd echo times out (the signal of failure)
- use timeout of 20s for memory clear (which takes about 12s)
- various changes as assumptions of commands not currently correct (tried on 2 units)
- use weewx.wxformulas.calculate_rain for rain delta
- use weewx.crc16

engine.py:
- Failure to get time from driver is not treated as an error.

rsyncupload.py:
- Add timeout option.
- Change to allow single file to be rsynced.

util/logwatch/scripts/services/weewx:
- Changes to organize very detailed cc3000 output in logwatch reports.

* cc3000 driver cleanup and fixes

* rework genStartup, implement history-since, don't convert to unicode on py2

* fix typo

* fix typo

* Change logwatch script to match capitalization change in wxformulas.calculate_rain

* logwatch change to match engine.py log message change

* Another round of cleaning up the logwatch script.

* remove tabs in logwatch script

* Add missing commands.  Get running under debug=1 in PY3.

* A better _format_bytes.

* Make use of weeutil.y_or_n for prompting.

* rewrite function to download archive records, refactor command function

* minor changes to exec_cmd_with_retries, add all cmds to logwatch script

* Update comments.

* change/add comment
2019-12-29 16:15:13 -07:00
John Kline
1b67d896bc Cleanup of log messages in CC3000 driver. (#479)
* Robustness enhancements to cc3000 driver including py2/py3 support
cc300.py:
- changes to work on both py2/py3 (tested on both)
- change timeout to 1s (more not needed)
- retry commands when reading cmd echo times out (the signal of failure)
- use timeout of 20s for memory clear (which takes about 12s)
- various changes as assumptions of commands not currently correct (tried on 2 units)
- use weewx.wxformulas.calculate_rain for rain delta
- use weewx.crc16

engine.py:
- Failure to get time from driver is not treated as an error.

rsyncupload.py:
- Add timeout option.
- Change to allow single file to be rsynced.

util/logwatch/scripts/services/weewx:
- Changes to organize very detailed cc3000 output in logwatch reports.

* cc3000 driver cleanup and fixes

* rework genStartup, implement history-since, don't convert to unicode on py2

* fix typo

* fix typo

* Change logwatch script to match capitalization change in wxformulas.calculate_rain

* logwatch change to match engine.py log message change

* Another round of cleaning up the logwatch script.

* remove tabs in logwatch script
2019-12-27 04:42:39 -07:00
John Kline
829bc0ee59 Development (#478)
* logwatch change to match engine.py log message change
2019-12-26 18:53:09 -07:00
John Kline
47fd72ca08 Development (#477)
* Change logwatch script to match capitalization change in wxformulas.calculate_rain
2019-12-26 17:21:00 -07:00
John Kline
19980d32d3 Robustness enhancements to cc3000 driver including py2/py3 support (#474)
cc300.py:
- changes to work on both py2/py3 (tested on both)
- change timeout to 1s (more not needed)
- retry commands when reading cmd echo times out (the signal of failure)
- use timeout of 20s for memory clear (which takes about 12s)
- various changes as assumptions of commands not currently correct (tried on 2 units)
- use weewx.wxformulas.calculate_rain for rain delta
- use weewx.crc16

engine.py:
- Failure to get time from driver is not treated as an error.

rsyncupload.py:
- Add timeout option.
- Change to allow single file to be rsynced.

util/logwatch/scripts/services/weewx:
- Changes to organize very detailed cc3000 output in logwatch reports.
2019-12-20 08:09:00 -07:00
gjr80
b1c7db9478 Reworked CSV field map info in both Utilities Guide and example CSV import config file.
Addresses issue #425
2019-12-20 09:42:25 +10:00
tkeffer@gmail.com
05e3c5095e Deleted Pipfile. Too much trouble. 2019-12-11 18:22:03 -07:00
gjr80
ff3065de45 Updated WU import config comments/example to reflect usage of WU API
Minor comment updates
2019-09-18 09:51:35 +10:00
tkeffer@gmail.com
c6ff6edadf Plist for the Mac launcher now includes a log file for stderr. 2019-09-02 15:45:31 -07:00
Tom Keffer
ac93649e95 Catch up merge of branch 'development' into branch 'python3'.
This includes wdimport stuff.

# Conflicts:
#	bin/weeimport/weeimport.py
#	bin/weeimport/wuimport.py
2019-03-11 09:26:49 -07:00
Tom Keffer
12bd590849 Added piwheels source for pip files. 2019-02-25 06:16:57 -08:00
gjr80
230697babf - 1st steps in reworking the counting of records and progress reporting to cater for WD which seems to have an inordnate number of duplicate or missing log entries
- changes --suppress to --suppress-warnings
- further work to suppress warnings for WD imports
2019-02-24 23:17:38 +10:00
Tom Keffer
73e61a78b4 Update Pipfile 2019-02-21 05:28:26 -08:00
Tom Keffer
a55a81e5b2 Moved Pipefile to its own directory 2019-02-20 12:02:39 -08:00
gjr80
5a133231f1 replace weewx/weeWX with WeeWX 2019-01-20 16:44:48 +10:00
gjr80
6ed18f6866 Add WD to supported import sources 2019-01-20 16:15:48 +10:00
gjr80
8676b2d823 First cut WD example import config file 2019-01-18 22:29:43 +10:00
tkeffer@gmail.com
16fc7fb5d3 Use WeeWX consistently (instead of weeWX). 2018-12-20 15:50:51 -08:00
Tom Keffer
fefac03be9 Catch up with master branch 2018-09-18 07:49:56 -07:00
Buster One
c2663f591b Fix unmatched lines in logwatch (#340)
* Changed "garbage" to upper case in logwatch configuration file
2018-09-07 07:17:50 -07:00
Tom Keffer
b62210b837 Catch up merge with v3.8.2 2018-08-16 11:39:48 -07:00
Thorsten Alteholz
ccca623e7e as does not wait for time to be set, seems to be better 2018-07-07 16:21:25 +02:00
Matthew Wall
2f6e5cc68b keep systemd from mucking with the weewx-multi script 2018-07-06 01:11:56 -04:00
gjr80
3e1aa765df Added --ignore-invalid-data import config option 2018-04-19 14:26:32 +10:00
Rick Sayre
7cb05c5b67 Add SMF file for service support under Solaris/Illumos etc 2018-03-03 16:10:42 -08:00
Matthew Wall
d0a4a83be4 forgot to comment endscript in logrotate conf 2017-12-30 14:24:04 -05:00
Matthew Wall
0e14f856e5 single file with all udev rules for easier rpm/deb deployments 2017-12-28 11:25:25 -05:00
Matthew Wall
54d9aac49f comments in logrotate to explain corner cases 2017-12-28 11:17:28 -05:00
Matthew Wall
7457d34a6d parameterize cfgdir in the weewx-multi init script 2017-12-25 12:41:59 -05:00
Matthew Wall
e75c5e7263 update rsyslog config syntax 2017-12-20 23:10:36 -05:00
gjr80
567f21d37d cater for change in manager log output 2017-03-11 06:30:22 +10:00
Matthew Wall
f2e101ad04 Merge branch 'master', remote branch 'origin' into development 2017-03-06 08:50:17 -05:00
gjr80
144b2e17ac update logwatch script to properly handle revised generator log messages
refer commit
03c3e4ef57 (diff-3cefdd7265f340e9683b0a2d0417b70f)
2017-03-06 13:03:43 +10:00
Matthew Wall
89daf1feb2 fixed shift bug in weewx-multi 2017-03-05 13:37:07 -05:00
Matthew Wall
dbc6c0a0d7 make init script work properly with /etc/default/weewx 2017-02-12 23:13:01 -05:00
Matthew Wall
7d27106b4c read /etc/default before bailing out 2017-02-12 22:59:56 -05:00
gjr80
9a64309e3f Can now specify date field separator for Cumulus imports, weewx -> weeWX 2017-01-28 16:49:12 +10:00
matthewwall
fcdb4bed09 ensure that weewx-multi works on deb and rpm as well as setup.py 2017-01-22 12:48:05 -05:00
matthewwall
f8b33ba9a7 drop the obsolete syslog.target from unit file. use generic time-sync.target instead of specific ntp.service. 2016-12-17 00:28:11 -05:00
matthewwall
b610e43dfc simplify overrides in /etc/default/weewx-multi 2016-11-10 10:11:08 -05:00
matthewwall
fae3531f04 added init script for managing multiple weewx instances 2016-11-07 12:10:24 -05:00
matthewwall
abf09aa551 minor html style fix. minor formatting fixes in import example files. newlines at end of import examples. 2016-09-29 12:28:58 -04:00
gjr80
09487f26b1 Revised CSV field map, restructured parseMap() plus other minor changes
- revised CSV field map
- restructured Source.parseMap()
- reworked --log option help text to format better on screen
- and the obligatory typos
2016-09-21 00:40:11 +10:00
Tom Keffer
7787c89310 Added wee_import to changes doc.
Added Gary to copyright notice
2016-09-10 16:49:48 -07:00
gjr80
9183f65725 Various changes resulting from PR148 feedback, refer comments
- ditched Wunder/wunder, now uses WU/wu throughout
- removed unused sections from example import config files
- updated documentation to reflect WU/wu changes
2016-09-10 11:18:18 +10:00
gjr80
d2330018d1 Refer summary comments
- revised Cumulus import preamble to be more consistent with the other
source imports
- renamed weewx_qc config option to qc
- reworked wee_import log and screen output (again) to give more
consistent output, particularlly when doing a dry run
- added qc infor to config sections of various files
2016-09-09 13:13:10 +10:00
gjr80
a3bf16a3f7 Implement QC and rework logging at end of saveToArchive()
- new class ImportQC() to implement weewx StdQC QC min/max limits on
imported records.
- rearrange saveToArchive() logging to give a more consistent log output
- a few minor typos
2016-09-06 22:53:53 +10:00
gjr80
f2957cfc22 Various minor changes
- changed Cumulus source parameter from folder to directory
- moved startup message so that it still shows first
2016-09-03 09:24:16 +10:00
gjr80
0e23a4ed37 Various
- fixed some redundant/omitted imports
- removed whitespace
- fixed typos in .conf files
- fixed incorrect optparse option settings
2016-09-01 17:11:36 +10:00
gjr80
8b38aa7ea4 1st commit restructured wee_import
- created weewx/bin/weeimport folder and contents
- created weewx/util/import folder and contents
- deleted weewx/wee_import.conf
- updated weewx/bin/wee_import
2016-08-31 16:32:12 +10:00