Mirrors_Framework/stmbl
1
0
Fork 0
mirror of https://github.com/rene-dev/stmbl.git synced 2026-02-06 02:02:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplified reset button handler

Browse Source
This commit is contained in:
Rene Hopf
2015-11-17 15:25:28 +01:00
parent ef1e258eb0
commit e3c8c69321
2 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
term/mainframe.cpp
View File

@@ -71,7 +71,6 @@ ServoFrame::ServoFrame(const wxString& title) : wxFrame(NULL, wxID_ANY, title){
channelchoice.back()->Bind(wxEVT_TEXT_ENTER,&ServoFrame::OnChannelChange, this, currentID);
channelchoice.back()->Set(waves);
channelchoice.back()->SetSelection(0);
cout << channelchoice.back()->GetId() << endl;
channelpos.push_back(new wxSlider(top, ++currentID, 0, -100, 100));
channelpos.back()->Bind(wxEVT_SLIDER,&ServoFrame::OnChannelChange, this, currentID);
@@ -158,7 +157,6 @@ void ServoFrame::OnChannelChange(wxCommandEvent& event){
default:
break;
}
//cout << "change " << channel << " " << param << " " << value << endl;
string df = params[param];
df += to_string(channel);
@@ -167,8 +165,7 @@ void ServoFrame::OnChannelChange(wxCommandEvent& event){
send(df);
}
int ServoFrame::send(string& s,bool h){
cout << s << endl;
int ServoFrame::send(const string& s,bool h){
if(connected){
if(h){//history
if((history.size()==0 || history.back() != s) && !s.empty()){
@@ -230,25 +227,8 @@ void ServoFrame::OnRefresh(wxCommandEvent& WXUNUSED(event)){
}
void ServoFrame::OnReset(wxCommandEvent& WXUNUSED(event)){
string s1 = "fault0.reset = 1";
string s2 = "fault0.reset = 0";
if(connected){
int ret1 = sp_nonblocking_write(port, s1.c_str(), s1.length());
int ret2 = sp_nonblocking_write(port, "\r", 1);
int ret3 = sp_nonblocking_write(port, s2.c_str(), s2.length());
int ret4 = sp_nonblocking_write(port, "\r", 1);
if(ret1 != s1.length() || ret2!=1 || ret3 != s2.length() || ret4!=1){
wxMessageBox( wxT("Error while sending"), wxT("Error"), wxICON_EXCLAMATION);
disconnect();
return;
}
}else{
wxMessageBox( wxT("Not connected"), wxT("Error"), wxICON_EXCLAMATION);
return;
}
return;
send("fault0.reset = 1");
send("fault0.reset = 0");
}
void ServoFrame::listports(){

2
term/mainframe.hpp
View File

@@ -21,7 +21,7 @@ class ServoFrame : public wxFrame
{
public:
ServoFrame(const wxString& title);
int send(std::string& s,bool h = false);
int send(const std::string& s,bool h = false);
private:
wxButton *connectbutton;
wxButton *refresh;