@@ -94,7 +94,7 @@ def update_status(self, msg):
94
94
95
95
96
96
class ESCPanel (QDialog ):
97
- DEFAULT_INTERVAL = 0.1
97
+ DEFAULT_RATE = 10
98
98
99
99
CMD_BIT_LENGTH = dronecan .get_dronecan_data_type (dronecan .uavcan .equipment .esc .RawCommand ().cmd ).value_type .bitlen
100
100
CMD_MAX = 2 ** (CMD_BIT_LENGTH - 1 ) - 1
@@ -118,13 +118,13 @@ def __init__(self, parent, node):
118
118
self ._safety_enable = QCheckBox (self )
119
119
self ._arming_enable = QCheckBox (self )
120
120
121
- self ._bcast_interval = QDoubleSpinBox (self )
122
- self ._bcast_interval .setMinimum (0.01 )
123
- self ._bcast_interval .setMaximum (1.0 )
124
- self ._bcast_interval .setSingleStep (0. 1 )
125
- self ._bcast_interval .setValue (self .DEFAULT_INTERVAL )
126
- self ._bcast_interval .valueChanged .connect (
127
- lambda : self ._bcast_timer .setInterval (int (self ._bcast_interval .value () * 1e3 )))
121
+ self ._bcast_rate = QSpinBox (self )
122
+ self ._bcast_rate .setMinimum (1 )
123
+ self ._bcast_rate .setMaximum (500 )
124
+ self ._bcast_rate .setSingleStep (1 )
125
+ self ._bcast_rate .setValue (self .DEFAULT_RATE )
126
+ self ._bcast_rate .valueChanged .connect (
127
+ lambda : self ._bcast_timer .setInterval (int (1e3 / self ._bcast_rate .value ())))
128
128
129
129
self ._stop_all = make_icon_button ('hand-stop-o' , 'Zero all channels' , self , text = 'Stop All' ,
130
130
on_clicked = self ._do_stop_all )
@@ -139,7 +139,7 @@ def __init__(self, parent, node):
139
139
self ._msg_viewer .setHorizontalScrollBarPolicy (Qt .ScrollBarAsNeeded )
140
140
141
141
self ._bcast_timer = QTimer (self )
142
- self ._bcast_timer .start (int (self . DEFAULT_INTERVAL * 1e3 ))
142
+ self ._bcast_timer .start (int (1e3 / self . DEFAULT_RATE ))
143
143
self ._bcast_timer .timeout .connect (self ._do_broadcast )
144
144
145
145
layout = QVBoxLayout (self )
@@ -158,9 +158,9 @@ def __init__(self, parent, node):
158
158
controls_layout .addWidget (self ._safety_enable )
159
159
controls_layout .addWidget (QLabel ('SendArming:' , self ))
160
160
controls_layout .addWidget (self ._arming_enable )
161
- controls_layout .addWidget (QLabel ('Broadcast interval :' , self ))
162
- controls_layout .addWidget (self ._bcast_interval )
163
- controls_layout .addWidget (QLabel ('sec ' , self ))
161
+ controls_layout .addWidget (QLabel ('Broadcast Rate :' , self ))
162
+ controls_layout .addWidget (self ._bcast_rate )
163
+ controls_layout .addWidget (QLabel ('Hz ' , self ))
164
164
controls_layout .addStretch ()
165
165
controls_layout .addWidget (self ._pause )
166
166
layout .addLayout (controls_layout )
0 commit comments