← Back to branch summary

~waynemou/wahcade/devel

« back to all changes in this revision

Viewing changes to joystick.py

  • Committer: waynemou at gmail
  • Date: 2014-05-06 09:37:54 UTC
  • Revision ID: waynemou@gmail.com-20140506093754-w0q798l5zbb2ylze
Added support for emulator specific controller profiles, add ctrlr option to emulator.ini file, tweaked joystick.py messages to stop them filling up log file

Show diffs side-by-side

added added

removed removed

Lines of Context:
joystick.py
173
173
                        self.state[mw_key] = 0
174
174
                        mw_key_events.append(mw_key)
175
175
                    else:
176
 
                        wc.log_msg("[PYGAME] Button Not Found %s" % self.devices[dev_num].get_button(int(button_num)))
 
176
                        if self.debug:
 
177
                          wc.log_msg("[PYGAME] Button Not Found %s" % self.devices[dev_num].get_button(int(button_num)))
 
178
                        else:
 
179
                          pass
177
180
                elif joy_type in ["LEFT", "RIGHT", "UP", "DOWN"]:
178
181
                    if joy_type in ["LEFT", "RIGHT"]:
179
182
                        axis_num = 0
188
191
                            self.state[mw_key] = 0
189
192
                            mw_key_events.append(mw_key)
190
193
                        else:
191
 
                            wc.log_msg("[PYGAME] Axis in UP/LEFT Error %s" % self.devices[dev_num].get_axis(axis_num))
 
194
                            if self.debug:
 
195
                              wc.log_msg("[PYGAME] Axis in UP/LEFT Error %s" % self.devices[dev_num].get_axis(axis_num))
 
196
                            else:
 
197
                              pass
192
198
                    else:
193
199
                        if axis_value > 0.5:
194
200
                            self.state[mw_key] += 1
197
203
                            self.state[mw_key] = 0
198
204
                            mw_key_events.append(mw_key)
199
205
                        else:
200
 
                            wc.log_msg("[PYGAME] Axis OTHER Error %s" % self.devices[dev_num].get_axis(axis_num))  
 
206
                            if self.debug:
 
207
                              wc.log_msg("[PYGAME] Axis OTHER Error %s" % self.devices[dev_num].get_axis(axis_num))  
 
208
                            else:
 
209
                              pass
201
210
                else:
202
 
                    wc.log_msg("[PYGAME] Undefined %s" % joy_type)
 
211
                    if self.debug:
 
212
                      wc.log_msg("[PYGAME] Undefined %s" % joy_type)
 
213
                    else:
 
214
                      pass
203
215
            # send fake key-press events
204
216
            if len(mw_key_events) > 0:
205
217
                mw_key = mw_key_events[0]