Merge pull request #672 from pasha745/master

collin80 · web-flow · commit 8826592362da · 2023-12-06T20:28:55.000-05:00
Add 3000000 baudrate mode for Lawicel device
diff --git a/connections/newconnectiondialog.cpp b/connections/newconnectiondialog.cpp
@@ -116,6 +116,7 @@ void NewConnectionDialog::selectLawicel()
         ui->cbSerialSpeed->addItem("500000");
         ui->cbSerialSpeed->addItem("1000000");
         ui->cbSerialSpeed->addItem("2000000");
+        ui->cbSerialSpeed->addItem("3000000");
     }
 
 }
@@ -330,7 +331,7 @@ QString NewConnectionDialog::getPortName()
     case CANCon::CANSERVER:
     case CANCon::CANLOGSERVER:
         return ui->cbPort->currentText();
-            
+
     default:
         qDebug() << "getPortName: can't get port";
     }

Original file line number	Diff line number	Diff line change
`@@ -116,6 +116,7 @@ void NewConnectionDialog::selectLawicel()`
`116`	`116`	`ui->cbSerialSpeed->addItem("500000");`
`117`	`117`	`ui->cbSerialSpeed->addItem("1000000");`
`118`	`118`	`ui->cbSerialSpeed->addItem("2000000");`
	`119`	`+ ui->cbSerialSpeed->addItem("3000000");`
`119`	`120`	`}`
`120`	`121`
`121`	`122`	`}`
`@@ -330,7 +331,7 @@ QString NewConnectionDialog::getPortName()`
`330`	`331`	`case CANCon::CANSERVER:`
`331`	`332`	`case CANCon::CANLOGSERVER:`
`332`	`333`	`return ui->cbPort->currentText();`
`333`		`-`
	`334`	`+`
`334`	`335`	`default:`
`335`	`336`	`qDebug() << "getPortName: can't get port";`
`336`	`337`	`}`