Author: hhubner Date: 2006-01-24 02:07:10 -0600 (Tue, 24 Jan 2006) New Revision: 1796 Added: trunk/raw-data/doc/WMR 928 Weather Station Data Format.pdf Modified: trunk/raw-data/blume/blume_last.txt trunk/raw-data/mcp/hameg.lisp trunk/raw-data/mcp/mcp.lisp trunk/raw-data/mcp/panel-flasher.lisp trunk/raw-data/mcp/panel-listener.lisp trunk/raw-data/mcp/panel-script.lisp trunk/raw-data/mcp/sensor-listener.lisp trunk/raw-data/mcp/sniffer.lisp trunk/raw-data/mcp/start.lisp trunk/raw-data/mcp/tcp-listener.lisp trunk/raw-data/mcp/wmr928.lisp trunk/raw-data/panel-scripts/script.lisp trunk/raw-data/start-scripte/start-mcp.pl trunk/raw-data/wetterfilm/make-film-expected.log trunk/raw-data/wetterfilm/make-film.sh trunk/raw-data/wetterfilm/poll-mc-wetter.pl Log: Checking in the last state of this project. It is now history. Modified: trunk/raw-data/blume/blume_last.txt =================================================================== --- trunk/raw-data/blume/blume_last.txt 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/blume/blume_last.txt 2006-01-24 08:07:10 UTC (rev 1796) @@ -1 +1 @@ -12.06.2005 08:00 +13.01.2006 07:00 Added: trunk/raw-data/doc/WMR 928 Weather Station Data Format.pdf =================================================================== (Binary files differ) Property changes on: trunk/raw-data/doc/WMR 928 Weather Station Data Format.pdf ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Modified: trunk/raw-data/mcp/hameg.lisp =================================================================== --- trunk/raw-data/mcp/hameg.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/mcp/hameg.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -150,8 +150,11 @@ for channel-range in channel-ranges do (incf result (apply #' scan-channels hameg channel-range)) do (finish-output) - finally (progn - (sensor-set network-name result) + finally (let ((sensor (sensor-with-name network-name))) + #+(or) + (format t "; HAMEG: old-value: ~A value: ~A~%" (sensor-current-value sensor) result) + (sensor-set sensor result) + #+(or) (format t "; HAMEG ~A => ~D~%" network-name result))) (finish-output)))) Modified: trunk/raw-data/mcp/mcp.lisp =================================================================== --- trunk/raw-data/mcp/mcp.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/mcp/mcp.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -1,7 +1,7 @@ (in-package :mcp) -(defparameter *mcp-actor-classes* '(hameg-scanner +(defparameter *mcp-actor-classes* '(#+(or) hameg-scanner wmr928-listener bluetooth-scanner bluetooth-idle-scanner isdn-operator @@ -49,4 +49,4 @@ (create-event-handlers) (create-actors) (start-actors) - (publish-website)) \ No newline at end of file + (publish-website)) Modified: trunk/raw-data/mcp/panel-flasher.lisp =================================================================== --- trunk/raw-data/mcp/panel-flasher.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/mcp/panel-flasher.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -17,16 +17,15 @@ (wait-for-panels-finished)) (defmethod run-function ((flasher panel-flasher)) - (loop (mp:process-wait "Waiting for someone to pass the DLP" - #'(lambda () (and (not (connection-active)) - (> (panel-flasher-flash-until flasher) (get-universal-time))))) - (format t "; PANEL-FLASHER Someone passed a DLP, flash panel~%") - (set-panels-flashing t) - (mp:process-wait "Waiting for flashing timeout" - #'(lambda () (or (connection-active) - (< (panel-flasher-flash-until flasher) (get-universal-time))))) - (if (connection-active) - (format t "; PANEL-FLASHER Flashing stopped because someone called in~%") - (progn - (format t "; PANEL-FLASHER Stop flashing~%") - (set-panels-flashing nil))))) \ No newline at end of file + (loop + (mp:process-wait "Waiting for someone to pass the DLP" + #'(lambda () (and (not (connection-active)) + (> (panel-flasher-flash-until flasher) (get-universal-time))))) + #+(or) + (format t "; PANEL-FLASHER Someone passed a DLP, flash panel~%") + (set-panels-flashing t) + (mp:process-wait "Waiting for flashing timeout" + #'(lambda () (or (connection-active) + (< (panel-flasher-flash-until flasher) (get-universal-time))))) + (unless (connection-active) + (set-panels-flashing nil)))) \ No newline at end of file Modified: trunk/raw-data/mcp/panel-listener.lisp =================================================================== --- trunk/raw-data/mcp/panel-listener.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/mcp/panel-listener.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -56,11 +56,12 @@ (dolist (command (panel-commands panel)) (reply panel command) (mp:with-timeout (15 (error "panel ~A failed to respond to command ~S" panel command)) - (format t "; ~A command ~S reply: ~S~%" panel command (read-command panel))))) + (format nil "; ~A command ~S reply: ~S~%" panel command (read-command panel))))) (defmethod run-function ((panel panel-session)) (handler-case (progn + #+(or) (format t "; new panel session, waiting for identification~%") (mp:with-timeout (5 (error "panel session ~A failed to identify within 5 seconds" panel)) (with-slots (name) panel @@ -70,6 +71,7 @@ (mp:without-scheduling (push panel *all-panels*)) (make-event 'panel-connected-event :panel-name name) + #+(or) (format t "; new panel identified as ~A~%" name))) (sleep 5) (setf (panel-commands panel) '("panel top:text:clear" @@ -88,6 +90,7 @@ (defmethod run-session ((listener panel-listener) client-socket) (let ((panel-session (make-instance 'panel-session :stream client-socket))) + #+(or) (format t "; running panel session ~A~%" panel-session) (run-function panel-session))) Modified: trunk/raw-data/mcp/panel-script.lisp =================================================================== --- trunk/raw-data/mcp/panel-script.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/mcp/panel-script.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -24,6 +24,7 @@ (defun read-script-config (&optional (script-pathname *panel-script-pathname*)) (let ((*package* (find-package :mcp.panel-script))) + #+(or) (format t "; reading script config, package is ~A~%" *package*) (with-open-file (script script-pathname) (loop for form = (read script nil) @@ -42,8 +43,9 @@ (:default-initargs :name "Panel Script Executor")) (defmethod handle-event progn ((script-executor script-executor) (event panel-connected-event)) - (format t "; panel ~S connected, running idle script~%" (panel-connected-event-panel-name event)) - (execute-script :idle '("unknown"))) + #+(or) + (format t "; panel ~S connected, running idle script~%" (panel-connected-event-panel-name event)) + (execute-script :idle '("unknown"))) (defun expand-arguments (statement) (loop for arg in *script-arguments* @@ -86,10 +88,12 @@ (in-package :mcp.panel-script.commands) (defun pause (seconds) + #+(or) (format t "; PANEL-SCRIPT pause ~D~%" seconds) (sleep seconds)) (defun clear () + #+(or) (format t "; PANEL-SCRIPT clear~%") (mp:without-scheduling (dolist (panel (all-panels)) @@ -98,6 +102,7 @@ (wait-for-panels-finished)) (defun panel (&rest panel-commands) + #+(or) (format t "; PANEL-SCRIPT panel ~A~%" panel-commands) (mp:without-scheduling (dolist (panel (all-panels)) Modified: trunk/raw-data/mcp/sensor-listener.lisp =================================================================== --- trunk/raw-data/mcp/sensor-listener.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/mcp/sensor-listener.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -14,7 +14,7 @@ (format t "; received invalid sensor name '~A' on ~A~%" sensor-name session) (reply session "Invalid sensor name")) (t - (format t "; TCP-SENSOR ~A ~A~%" sensor-name sensor-value) +; (format t "; TCP-SENSOR ~A ~A~%" sensor-name sensor-value) (reply session command) (sensor-set sensor-name sensor-value))))) Modified: trunk/raw-data/mcp/sniffer.lisp =================================================================== --- trunk/raw-data/mcp/sniffer.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/mcp/sniffer.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -10,6 +10,7 @@ (loop (handler-case (destructuring-bind (name value) (split " " (read-line connection)) + #+(or) (format t "; SNIFFER ~A ~A~%" name value) (if (sensor-with-name name) (when (plusp (parse-integer value)) Modified: trunk/raw-data/mcp/start.lisp =================================================================== --- trunk/raw-data/mcp/start.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/mcp/start.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -1 +1,2 @@ -(mcp::mcp-start) \ No newline at end of file +(mcp::mcp-start) +(bknr.cron::start-cron) \ No newline at end of file Modified: trunk/raw-data/mcp/tcp-listener.lisp =================================================================== --- trunk/raw-data/mcp/tcp-listener.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/mcp/tcp-listener.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -43,7 +43,8 @@ (terminate session))))) (defun start-client-session (listener client-socket) - (format t ";; accepted new client on fd ~A~%" (system:fd-stream-fd client-socket)) + #+(or) + (format t ";; accepted new ~A client on fd ~A~%" (class-name (class-of listener)) (system:fd-stream-fd client-socket)) (if (slot-value listener 'multi-session) (mp:make-process #'(lambda () (run-session listener client-socket)) :name (format nil "~a client" (bknr-actor-name listener))) Modified: trunk/raw-data/mcp/wmr928.lisp =================================================================== --- trunk/raw-data/mcp/wmr928.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/mcp/wmr928.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -29,6 +29,7 @@ (speed (decode-bcd s1 s2 s3)) (speed-average (decode-bcd a1 a2 a3)) (chill (decode-bcd-signed ws w1 w2))) + #+(or) (format t "; WMR928 wind: bearing ~D speed ~D speed-average ~D chill ~D~%" bearing speed speed-average chill) (sensor-set "Wind speed" speed) @@ -44,6 +45,7 @@ (total-start-day (decode-bcd d1 d2)) (total-start-month (decode-bcd mo1 mo2)) (total-start-year (decode-bcd ye1 ye2))) + #+(or) (format t "; WMR928 rain rate ~D total ~D yesterday ~D total-start ~D.~D.~D ~D:~D~%" rate total yesterday total-start-day total-start-month total-start-year @@ -54,6 +56,7 @@ (let ((temperature (/ (decode-bcd-signed ts t1 t2 t3) 10.0)) (relative-humidity (decode-bcd h1 h2)) (dewpoint (decode-bcd d1 d2))) + #+(or) (format t "; WMR928 outdoor temperature ~D relative-humidity ~D dewpoint ~D~%" temperature relative-humidity dewpoint) (sensor-set "Outdoor Temperature" temperature) @@ -67,6 +70,7 @@ (ambient-pressure (+ 904 (decode-bcd p1 p2))) (forecast (decode-bcd f1 f2)) (sea-level-offset (decode-bcd s1 s2 s3 s4))) + #+(or) (format t "; WMR928 indoor temperature ~D relative-humidity ~D dewpoint ~D ambient-pressure ~D forecast ~D sea-level-offset ~D~%" temperature relative-humidity dewpoint ambient-pressure forecast sea-level-offset) (sensor-set "Indoor Temperature" temperature) @@ -74,6 +78,7 @@ (sensor-set "Indoor Pressure" ambient-pressure))) (defun process-clock-minute () + #+(or) (format t "; WMR928 clock minute tick~%")) (defun process-clock-hour-date (h1 h2 d1 d2 m1 m2 y1 y2) @@ -81,6 +86,7 @@ (day (decode-bcd d1 d2)) (month (decode-bcd m1 m2)) (year (decode-bcd y1 y2))) + #+(or) (format t "; WMR928 clock ~D.~D.~D ~D:00~%" day month year hour))) (defparameter *dispatch-table* @@ -115,6 +121,7 @@ (if (eql checksum expected-checksum) (apply process-function message) (warn "Bad checksum from WMR928 - Expected ~A, got ~A" expected-checksum checksum))) + #+(or) (destructuring-bind (battery-warning channel) (bcd-digits battery-and-channel) (unless (eql code #x0e) ; clock minute uses channel/battery byte for minutes, not for battery and channel as the other messages (unless (zerop battery-warning) Modified: trunk/raw-data/panel-scripts/script.lisp =================================================================== --- trunk/raw-data/panel-scripts/script.lisp 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/panel-scripts/script.lisp 2006-01-24 08:07:10 UTC (rev 1796) @@ -39,7 +39,7 @@ (outside "panel top:text:outside.top.climate.summary")) (pause 4) (panel (inside "panel bottom:text:inside.bottom.climate.summary") - (outside "panel bottom:text:outside.bottom.climate.june")) + (outside "panel bottom:text:outside.bottom.climate.september")) (pause 12) (clear) (panel (inside "panel top:text:inside.top.climate.temp") @@ -92,6 +92,7 @@ (panel (inside "panel bottom:week:communication:FileTransfer.incoming") (outside "panel bottom:text:communication.no_data_available")) (pause 12) + (clear) (panel (inside "panel top:text:inside.top.comm.mail") (outside "panel top:text:outside.top.comm.mail")) @@ -99,6 +100,7 @@ (panel (inside "panel bottom:week:communication:Mail.incoming") (outside "panel bottom:text:communication.no_data_available")) (pause 12) + (clear) (panel (inside "panel top:text:inside.top.comm.web") (outside "panel top:text:outside.top.comm.web")) @@ -106,6 +108,7 @@ (panel (inside "panel bottom:week:communication:Web.incoming") (outside "panel bottom:text:communication.no_data_available")) (pause 12) + (clear) (panel (inside "panel top:text:inside.top.comm.calls_incoming") (outside "panel top:text:outside.top.comm.signal")) @@ -113,33 +116,37 @@ (panel (inside "panel bottom:week:communication:telekom_1.incoming") (outside "panel bottom:day:communication:T-Mobile D1:Vodafone D2:e-plus:O2")) (pause 12) + (clear) (panel (inside "panel top:text:inside.top.comm.calls_outgoing") - (outside "panel top:text:outside.top.comm.bluetooth")) + (outside "panel top:text:outside.top.comm.signal")) (pause 4) (panel (inside "panel bottom:week:communication:telekom_1.outgoing") - (outside "panel bottom:list:communication:Bluetooth comes")) + (outside "panel bottom:day:communication:T-Mobile D1:Vodafone D2:e-plus:O2")) (pause 12) + (clear) (panel (inside "panel top:text:inside.top.comm.bluetooth") - (outside "panel top:text:outside.top.comm.bluetooth_week")) + (outside "panel top:text:outside.top.comm.bluetooth")) (pause 4) (panel (inside "panel bottom:text:communication.no_data_available") - (outside "panel bottom:week:communication:Bluetooth comes")) + (outside "panel bottom:list:communication:Bluetooth comes")) (pause 12) + (clear) - (panel (inside "panel top:text:inside.top.comm.bluetooth_week") - (outside "panel top:text:inside.top.comm.usage")) + (panel (inside "panel top:text:inside.top.comm.bluetooth") + (outside "panel top:text:outside.top.comm.bluetooth_week")) (pause 4) (panel (inside "panel bottom:text:communication.no_data_available") - (outside "panel bottom:day:communication:incoming call local:incoming call remote:incoming call mobile:incoming call anonymous")) + (outside "panel bottom:week:communication:Bluetooth comes")) (pause 12) + (clear) (panel (inside "panel top:text:inside.top.comm.usage") - (outside "panel bottom:text:communication.no_data_available")) + (outside "panel top:text:outside.top.comm.usage")) (pause 4) (panel (inside "panel bottom:day:communication:incoming call local:incoming call remote:incoming call mobile:incoming call anonymous") - (outside "panel bottom:text:communication.no_data_available")) + (outside "panel bottom:day:communication:incoming call local:incoming call remote:incoming call mobile:incoming call anonymous")) (pause 12) (clear)) Modified: trunk/raw-data/start-scripte/start-mcp.pl =================================================================== --- trunk/raw-data/start-scripte/start-mcp.pl 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/start-scripte/start-mcp.pl 2006-01-24 08:07:10 UTC (rev 1796) @@ -60,5 +60,5 @@ kill 9, $lisp_pid; wait; - system("tail -200 $logfile | mail -s 'mcp crashed (logfile is $logfile)' hans\@huebner.org"); + system("tail -50 $logfile | mail -s 'mcp crashed (logfile is $logfile)' hans\@huebner.org"); } Modified: trunk/raw-data/wetterfilm/make-film-expected.log =================================================================== --- trunk/raw-data/wetterfilm/make-film-expected.log 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/wetterfilm/make-film-expected.log 2006-01-24 08:07:10 UTC (rev 1796) @@ -38,7 +38,6 @@ added interface ip=192.168.0.2 bcast=192.168.0.255 nmask=255.255.255.0 added interface ip=192.168.1.2 bcast=192.168.1.255 nmask=255.255.255.0 added interface ip=10.0.0.2 bcast=10.0.0.255 nmask=255.255.255.0 -Got a positive name query response from 192.168.0.21 ( 192.168.0.21 ) Domain=[SAPBERLIN] OS=[Windows 5.1] Server=[Windows 2000 LAN Manager] Modified: trunk/raw-data/wetterfilm/make-film.sh =================================================================== --- trunk/raw-data/wetterfilm/make-film.sh 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/wetterfilm/make-film.sh 2006-01-24 08:07:10 UTC (rev 1796) @@ -2,7 +2,7 @@ cd /usr/home/hans/bknr-svn/raw-data/wetterfilm/data -touch /tmp/make-film.lock +echo $$ > /tmp/make-film.lock if [ -d tmp ]; then rm -rf tmp @@ -30,6 +30,6 @@ done mencoder -quiet 'mf://tmp/*.jpg' -fps 9 -o climate.avi -ovc lavc -lavcopts vcodec=mpeg4 -smbclient '\\pc_casino_1\display_data' -N -c 'cd visomat\filme\pc_casino_1 ; put climate.avi' +smbclient '\\pc_casino_1\display_data' -N -c 'cd visomat\filme\pc_casino_1 ; put climate.avi' || echo "Warning: could not upload film" rm /tmp/make-film.lock Modified: trunk/raw-data/wetterfilm/poll-mc-wetter.pl =================================================================== --- trunk/raw-data/wetterfilm/poll-mc-wetter.pl 2006-01-24 07:54:39 UTC (rev 1795) +++ trunk/raw-data/wetterfilm/poll-mc-wetter.pl 2006-01-24 08:07:10 UTC (rev 1796) @@ -37,7 +37,7 @@ my $output = ''; while (<MAKEFILM>) { $output .= $_; - unless (/^(Duplicate frame|Video stream:|putting file|CPU: Intel Pentium|\[mf\] number of files:|input fps will be)/) { + unless (/^(read error reading a one-byte sample|read error while reading a long sample|[dD]uplicate frame|Video stream:|putting file|CPU: Intel Pentium|\[mf\] number of files:|input fps will be|Got a positive name query response)/) { print LOGFILE; } }