Skip to content

Commit 9c74a99

Browse files
thedjnKthedjnK
committed
v1.12a, Bug #15946 Add BL653 applications github link
1 parent 7a1fc47 commit 9c74a99

3 files changed

Lines changed: 92 additions & 16 deletions

File tree

‎UwxMainWindow.cpp‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6099,52 +6099,57 @@ MainWindow::on_btn_WebBrowse_clicked(
60996099
{
61006100
//Browse applications/modules button clicked
61016101
QString strURL = "";
6102-
if (ui->combo_WebSelection->currentIndex() == 0)
6102+
if (ui->combo_WebSelection->currentIndex() == WebSelectionBL654Applications)
61036103
{
61046104
//BL654 Github
61056105
strURL = "https://github.com/LairdCP/BL654-Applications";
61066106
}
6107-
else if (ui->combo_WebSelection->currentIndex() == 1)
6107+
else if (ui->combo_WebSelection->currentIndex() == WebSelectionBL653Applications)
6108+
{
6109+
//BL653 Github
6110+
strURL = "https://github.com/LairdCP/BL653-Applications";
6111+
}
6112+
else if (ui->combo_WebSelection->currentIndex() == WebSelectionBL652Applications)
61086113
{
61096114
//BL652 Github
61106115
strURL = "https://github.com/LairdCP/BL652-Applications";
61116116
}
6112-
else if (ui->combo_WebSelection->currentIndex() == 2)
6117+
else if (ui->combo_WebSelection->currentIndex() == WebSelectionPinnacle100OOBDemo)
61136118
{
61146119
//Pinnacle 100 OOB Demo Github
61156120
strURL = "https://github.com/LairdCP/Pinnacle_100_oob_demo";
61166121
}
6117-
else if (ui->combo_WebSelection->currentIndex() == 3)
6122+
else if (ui->combo_WebSelection->currentIndex() == WebSelectionBluegrassDemo)
61186123
{
61196124
//Bluegrass demo site
61206125
strURL = "https://demo.lairdconnect.com";
61216126
}
6122-
else if (ui->combo_WebSelection->currentIndex() == 4)
6127+
else if (ui->combo_WebSelection->currentIndex() == WebSelectionRM1xxApplications)
61236128
{
61246129
//RM1xx Github
61256130
strURL = "https://github.com/LairdCP/RM1xx-Applications";
61266131
}
6127-
else if (ui->combo_WebSelection->currentIndex() == 5)
6132+
else if (ui->combo_WebSelection->currentIndex() == WebSelectionBT900Applications)
61286133
{
61296134
//BT900 Github
61306135
strURL = "https://github.com/LairdCP/BT900-Applications";
61316136
}
6132-
else if (ui->combo_WebSelection->currentIndex() == 6)
6137+
else if (ui->combo_WebSelection->currentIndex() == WebSelectionBL600Applications)
61336138
{
61346139
//BL600 Github
61356140
strURL = "https://github.com/LairdCP/BL600-Applications";
61366141
}
6137-
else if (ui->combo_WebSelection->currentIndex() == 7)
6142+
else if (ui->combo_WebSelection->currentIndex() == WebSelectionBL620Applications)
61386143
{
61396144
//BL620 Github
61406145
strURL = "https://github.com/LairdCP/BL620-Applications";
61416146
}
6142-
else if (ui->combo_WebSelection->currentIndex() == 8)
6147+
else if (ui->combo_WebSelection->currentIndex() == WebSelectionWirelessModules)
61436148
{
6144-
//Laird Connectivity wireless modules page
6149+
//Wireless modules page
61456150
strURL = "https://www.lairdconnect.com/wireless-modules";
61466151
}
6147-
else if (ui->combo_WebSelection->currentIndex() == 9)
6152+
else if (ui->combo_WebSelection->currentIndex() == WebSelectionUwFlashX)
61486153
{
61496154
//UwFlashX github
61506155
strURL = "https://github.com/LairdCP/UwFlashX";

‎UwxMainWindow.h‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ const qint8 MODE_UPDATE_ERROR_CODE = 16;
132132
const qint8 MODE_CHECK_FIRMWARE_VERSIONS = 17;
133133
const qint8 MODE_CHECK_FIRMWARE_SUPPORT = 18;
134134
//Constants for version and functions
135-
const QString UwVersion = "1.12"; //Version string
135+
const QString UwVersion = "1.12a"; //Version string
136136
//Constants for timeouts and streaming
137137
const qint16 FileReadBlock = 512; //Number of bytes to read per block when streaming files
138138
const qint16 StreamProgress = 10000; //Number of bytes between streaming progress updates
@@ -214,6 +214,18 @@ const qint8 MenuActionCopy = 29;
214214
const qint8 MenuActionCopyAll = 30;
215215
const qint8 MenuActionPaste = 31;
216216
const qint8 MenuActionSelectAll = 32;
217+
//Constants for web selection combo box
218+
const qint8 WebSelectionBL654Applications = 0;
219+
const qint8 WebSelectionBL653Applications = 1;
220+
const qint8 WebSelectionBL652Applications = 2;
221+
const qint8 WebSelectionPinnacle100OOBDemo = 3;
222+
const qint8 WebSelectionBluegrassDemo = 4;
223+
const qint8 WebSelectionRM1xxApplications = 5;
224+
const qint8 WebSelectionBT900Applications = 6;
225+
const qint8 WebSelectionBL600Applications = 7;
226+
const qint8 WebSelectionBL620Applications = 8;
227+
const qint8 WebSelectionWirelessModules = 9;
228+
const qint8 WebSelectionUwFlashX = 10;
217229
//Constants for balloon (notification area) icon options
218230
const qint8 BalloonActionShow = 1;
219231
const qint8 BalloonActionExit = 2;

‎UwxMainWindow.ui‎

Lines changed: 63 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>661</width>
10-
<height>386</height>
9+
<width>670</width>
10+
<height>390</height>
1111
</rect>
1212
</property>
1313
<property name="sizePolicy">
@@ -372,6 +372,15 @@
372372
</color>
373373
</brush>
374374
</colorrole>
375+
<colorrole role="PlaceholderText">
376+
<brush brushstyle="NoBrush">
377+
<color alpha="128">
378+
<red>255</red>
379+
<green>255</green>
380+
<blue>255</blue>
381+
</color>
382+
</brush>
383+
</colorrole>
375384
</active>
376385
<inactive>
377386
<colorrole role="WindowText">
@@ -401,6 +410,15 @@
401410
</color>
402411
</brush>
403412
</colorrole>
413+
<colorrole role="PlaceholderText">
414+
<brush brushstyle="NoBrush">
415+
<color alpha="128">
416+
<red>255</red>
417+
<green>255</green>
418+
<blue>255</blue>
419+
</color>
420+
</brush>
421+
</colorrole>
404422
</inactive>
405423
<disabled>
406424
<colorrole role="WindowText">
@@ -430,6 +448,15 @@
430448
</color>
431449
</brush>
432450
</colorrole>
451+
<colorrole role="PlaceholderText">
452+
<brush brushstyle="NoBrush">
453+
<color alpha="128">
454+
<red>255</red>
455+
<green>255</green>
456+
<blue>255</blue>
457+
</color>
458+
</brush>
459+
</colorrole>
433460
</disabled>
434461
</palette>
435462
</property>
@@ -2616,6 +2643,15 @@
26162643
</color>
26172644
</brush>
26182645
</colorrole>
2646+
<colorrole role="PlaceholderText">
2647+
<brush brushstyle="NoBrush">
2648+
<color alpha="128">
2649+
<red>255</red>
2650+
<green>255</green>
2651+
<blue>255</blue>
2652+
</color>
2653+
</brush>
2654+
</colorrole>
26192655
</active>
26202656
<inactive>
26212657
<colorrole role="WindowText">
@@ -2645,6 +2681,15 @@
26452681
</color>
26462682
</brush>
26472683
</colorrole>
2684+
<colorrole role="PlaceholderText">
2685+
<brush brushstyle="NoBrush">
2686+
<color alpha="128">
2687+
<red>255</red>
2688+
<green>255</green>
2689+
<blue>255</blue>
2690+
</color>
2691+
</brush>
2692+
</colorrole>
26482693
</inactive>
26492694
<disabled>
26502695
<colorrole role="WindowText">
@@ -2674,6 +2719,15 @@
26742719
</color>
26752720
</brush>
26762721
</colorrole>
2722+
<colorrole role="PlaceholderText">
2723+
<brush brushstyle="NoBrush">
2724+
<color alpha="128">
2725+
<red>255</red>
2726+
<green>255</green>
2727+
<blue>255</blue>
2728+
</color>
2729+
</brush>
2730+
</colorrole>
26772731
</disabled>
26782732
</palette>
26792733
</property>
@@ -3434,6 +3488,11 @@ You can also use the button below to check if there is a newer version of UwTerm
34343488
<string>BL654</string>
34353489
</property>
34363490
</item>
3491+
<item>
3492+
<property name="text">
3493+
<string>BL653</string>
3494+
</property>
3495+
</item>
34373496
<item>
34383497
<property name="text">
34393498
<string>BL652</string>
@@ -3471,7 +3530,7 @@ You can also use the button below to check if there is a newer version of UwTerm
34713530
</item>
34723531
<item>
34733532
<property name="text">
3474-
<string>Laird Connectivity Modules</string>
3533+
<string>Wireless Modules</string>
34753534
</property>
34763535
</item>
34773536
<item>
@@ -3577,7 +3636,7 @@ You can also use the button below to check if there is a newer version of UwTerm
35773636
<x>0</x>
35783637
<y>0</y>
35793638
<width>204</width>
3580-
<height>43</height>
3639+
<height>54</height>
35813640
</rect>
35823641
</property>
35833642
<property name="sizePolicy">

0 commit comments

Comments
 (0)