tclpuks/prgsrc/puks.tcl - diff

Return to puks.tcl CVS log

Up to [Local Repository] / tclpuks / prgsrc

Diff for /tclpuks/prgsrc/puks.tcl between versions 1.4 and 1.6

-version 1.4, 2005/08/29 18:14:50
+version 1.6, 2005/08/31 17:04:31
  Line 9  set waiting_for_key 0
  set question_asked 0
  set timer_started 0
- # Channel to talk to the MRC device
+ # Channel to talk to the MCR device
- set MRC 0
+ set MCR 0
+ set MCR_DEVICE "/dev/ttyUSB0"
  #  Mapping of MCR codes to keys:  button(code)
  set buttoncode 256
- Line 21  for {set i 1} {$i <=8} {incr i} {
+ Line 22  for {set i 1} {$i <=8} {incr i} {
  ##############################################################
- #  Procedures for talking with MRC
+ #  Procedures for talking with MCR
  ##############################################################
- # Open the given device for MRC.  Return 0 if successful, 1 otherwise
+ # Open the given device for MCR.  Return 0 if successful, 1 otherwise
- proc open_mrc {device} {
+ proc open_mcr {device} {
-     global MRC
+     global MCR
-     set result [catch {set MRC [open $device r+]}]
+     set result [catch {set MCR [open $device r+]}  error]
      if {$result !=0} {
+         .status.mcr configure -text $error
+         .status.mcr configure -fg red
          return $result
      }
-     fconfigure $MRC -blocking 0  -translation binary \
+     fconfigure $MCR -blocking 0  -translation binary \
-         -encoding binary -buffering none -mode  57600,n,8,1
+         -encoding binary -buffering none
+ #-mode  57600,n,8,1
+     .status.mcr configure -text "Opened $device"
+     .status.mcr configure -fg black
-     puts $MRC s
+     puts $MCR s
      after 200
-     read $MRC
+     read $MCR
-     puts $MRC r
+     puts $MCR r
      after 200
-     read $MRC
+     read $MCR
      return 0
  }
- # Return the key pressed or 0
+ # Return the list of key pressed or empty list
  proc readbuffer {} {
-     global MRC  button
+     global MCR  button
-     set key 0
+     set keys ""
-     set message [read $MRC]
+     set message [read $MCR 6]
-     binary scan $message s key
+     while { [string length $message] > 0} {
-     set key [expr $key & 0xFFFF]
+         binary scan $message b48 msg
-     if {[catch {set key $button($key)}] == 0} {
+         .status.mcr -configure -text $msg
-         return $key
+         .status.mcr -configure -fg black
+         binary scan $message s key
+         set key [expr $key & 0xFFFF]
+         if {[catch {set key $button($key)}] == 0} {
+             lappend keys $key
+         }
+         set message [read $MCR 6]
      }
-     return 0
+     return keys
+ }
+ # Dialog for opening the device
+ proc open_mcr_dialog {} {
+     toplevel .mcr_dialog
+     label .mcr_dialog.label -text "Open MCR port:"
+     entry .mcr_dialog.entry -textvariable MCR_DEVICE
+     pack .mcr_dialog.label .mcr_dialog.entry
+     frame .mcr_dialog.buttons
+     pack .mcr_dialog.buttons
+     button .mcr_dialog.buttons.ok -command {
+         open_mcr $MCR_DEVICE
+         destroy .mcr_dialog
+     } -text OK
+     button .mcr_dialog.buttons.cancel -command {destroy .mcr_dialog}\
+         -text "Cancel"
+     pack .mcr_dialog.buttons.ok .mcr_dialog.buttons.cancel -side left
  }
  ##############################################################
- Line 69  proc readbuffer {} {
+ Line 98  proc readbuffer {} {
  menu .mbar -type menubar -relief ridge -borderwidth 2
  pack .mbar -fill x
  menubutton .mbar.file -text File -menu .mbar.file.m -underline 0 \
          -relief raised -borderwidth 2
  pack .mbar.file -side left
- Line 83  menubutton .mbar.edit -text Edit -underl
+ Line 113  menubutton .mbar.edit -text Edit -underl
          -relief raised -borderwidth 2
  pack .mbar.edit -side left
+ menubutton .mbar.mcr -text "MCR" -menu .mbar.mcr.m -underline 0 \
+     -relief raised -borderwidth 2
+ pack .mbar.mcr -side left
+ set m [menu .mbar.mcr.m]
+ $m add command -label "Open MCR" -command open_mcr_dialog
  menubutton .mbar.help -text Help -menu .mbar.help.m -underline 0\
          -relief raised -borderwidth 2
  pack .mbar.help -side right
- Line 109  for {set  i 0} {$i < 8} {incr i} {
+ Line 145  for {set  i 0} {$i < 8} {incr i} {
      pack .teams.frame($i).score -side left
  }
+ # Question weight
+ frame .weight
+ set weight 1
+ set doubled 0
+ pack .weight -side top -fill x
+ label .weight.label -text "���� �������"
+ entry .weight.weight -textvariable weight -width 3
+ checkbutton .weight.doubled -variable doubled
+ label .weight.label2 -text "x2"
+ pack .weight.label .weight.weight .weight.doubled .weight.label2 -side left
+ # Buttons and timer
+ frame .control
+ pack .control -side top -fill x
+ frame .control.buttons
+ pack .control.buttons -side left -fill y
+ button .control.buttons.assign -text "Assign  Buttons" -underline 0 -state disabled
+ pack .control.buttons.assign -fill both  -side top
+ bind Button <a> {.control.buttons.assign invoke}
+ button .control.buttons.start -text Start -underline 0 -command "puts A"
+ pack .control.buttons.start -fill both  -side top
+ bind Button <s> {.control.buttons.start invoke}
+ button .control.buttons.stop -text Stop -underline 1 -command "puts B" -state disabled
+ pack .control.buttons.stop -fill both -side top
+ bind Button <t> {.control.buttons.stop invoke}
+ button .control.buttons.reset -text "Reset scores" -underline 0 -state disabled
+ pack .control.buttons.reset -fill both -side top
+ bind Button <r> {.control.buttons.reset invoke}
+ option add *timer.font  -*-palatino-*-r-normal--*-1200-*-*-*-*-*-* widgetDefault
+ label .control.timer -text 0 -border 5 -relief raised -borderwidth 2
+ pack .control.timer -side left -expand 1 -fill x
+ # Status line
+ frame .status -relief sunk -borderwidth 2
+ pack .status -side top -fill x
+ label .status.mcr -relief ridge -text "Not connected" -fg red -width 48
+ pack .status.mcr -side left -fill x
+ label .status.state -relief ridge -text "Idle"
+ pack .status.state -side left -fill x
  #  button .start -text "Start" -command start
  #  pack .start
  #  label .pressed

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.4
changed lines
	Added in v.1.6