Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

debugger

  • Loading branch information...
commit 307ca7fc8c9cd0450754f41f86bdc14a55c22072 1 parent dddad2b
@levj220 levj220 authored
Showing with 6 additions and 6 deletions.
  1. +1 −1  Debugger/course_config.txt
  2. +5 −5 Debugger/debugger.py
View
2  Debugger/course_config.txt
@@ -1,4 +1,4 @@
-0 0 0 0 0 1 0 0 0.0 0.0 0.0 4 20 0
+0 5 0 15 15 130 120 75 0.023 0.0 0.008 1 0 0
0 0 0 0 0 0 0 0 0.0 0.0 0.0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0 0 0
0 0 0 0 0 0 0 0 0 0 0 0 0 0
View
10 Debugger/debugger.py
@@ -172,8 +172,8 @@ def callback_termination_ok(self,widget,callback_data=None):
global t_occur
if currentStage!=-1:
termination=self.termination_combo.get_active()
- t_clicks=self.clicks.get_text()
- t_occur=self.occur.get_text()
+ t_clicks=int(self.clicks.get_text())
+ t_occur=int(self.occur.get_text())
self.turn_window.hide_all();
################################################################
@@ -307,9 +307,9 @@ def callback_pos_changed(self, widget, callback_data=None):
self.enc_fol_button.set_label("Encoders")
if ignore == 0:
- self.enc_fol_button.set_label("Don't Ignore")
+ self.ignore_button.set_label("Don't Ignore")
else:
- self.enc_fol_button.set_label("Ignore")
+ self.ignore_button.set_label("Ignore")
self.speed_entry.set_text(str(speed))
self.center_entry.set_text(str(center))
@@ -334,7 +334,7 @@ def callback_save_global_data(self,widget,callback_data=None):
def callback_send(self, widget, callback_data=None):
if currentStage!=-1:
ser=serial.Serial(serialport[serialnum],baudrate=9600)
- info=struct.pack('=cBBBBbbBBBBBfffB','c',currentStage, enc_fol,termination,termination_action,left_amnt,right_amnt,speed,turnspeed,center,t_occur, t_clicks,p,i,d,ignore,start_pos)
+ info=struct.pack('=cBBBBbbBBBBBfffBB','c',currentStage, enc_fol,termination,termination_action,left_amnt,right_amnt,speed,turnspeed,center,t_occur, t_clicks,p,i,d,ignore,start_pos)
ser.write(info)
ser.close()
print "sent"
Please sign in to comment.
Something went wrong with that request. Please try again.