X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=client%2Fmainwindow.cpp;h=b6294cf059987dfcabb193170b3e80e5994a5a0f;hb=5187eda7ebcec3d483b1bc398d991cc7da12ad04;hp=7e96d22d6d7b88604dcc9d2e38c2ff70197bf3d4;hpb=3f45b7b4478cb6e69b311d2bf1ad670bace19589;p=ultimatescore diff --git a/client/mainwindow.cpp b/client/mainwindow.cpp index 7e96d22..b6294cf 100644 --- a/client/mainwindow.cpp +++ b/client/mainwindow.cpp @@ -189,7 +189,7 @@ void MainWindow::set_match_3_initials_clicked() param["team1"] = escape_html(ui->match_3_initials_1_edit->text().toStdString()); param["team2"] = escape_html(ui->match_3_initials_2_edit->text().toStdString()); ws->send_command("update " + serialize_as_json(param)); - ws->send_command("eval setteams2()"); + ws->send_command("eval setteams3()"); } void MainWindow::set_color_clicked() @@ -527,7 +527,14 @@ void MainWindow::bt6000_message_received(const string &msg, int port) param["clock_sec"] = to_string(seconds); ws->send_command("update " + serialize_as_json(param)); - if (port == 6001) { + if (port == 6002) { + ws->send_command("eval adjustclockfromstate(2)"); + if (clock_running) { + ws->send_command("eval startclock(2)"); + } else { + ws->send_command("eval stopclock(2)"); + } + } else if (port == 6001) { ws->send_command("eval adjustclockfromstate(1)"); if (clock_running) { ws->send_command("eval startclock(1)"); @@ -546,7 +553,13 @@ void MainWindow::bt6000_message_received(const string &msg, int port) if (msg.size() >= 10 && msg[0] == 'G' && msg[1] == '0' && msg[2] == '2') { int score1 = parse_score(msg[4], msg[5], msg[6]); int score2 = parse_score(msg[7], msg[8], msg[9]); - if (port == 6001) { + if (port == 6002) { + map param; + param["score1"] = to_string(score1); + param["score2"] = to_string(score2); + ws->send_command("update " + serialize_as_json(param)); + ws->send_command("eval setscore3()"); + } else if (port == 6001) { map param; param["score1"] = to_string(score1); param["score2"] = to_string(score2);