Compact dashboard #60
Conversation
* Simplify Map Init Layers. * Ui Group Modifications * SQL Query Callsign from DB * Fixed kylekrieg#17, E16 Added Auto Populate Callsign Added Auto Populate Radio * Fixed kylekrieg#12 by adding "Full Exchange"(all) * Working on kylekrieg#16 kylekrieg#17 Needs work still * OP Competition SQL S&P Fix * Create changelog.md * Added great circle lines configuation group * Main dashboard CSS Updates * Part2 UI Cleanup * Great circle lines on off and changed radio1 & radio2 SQL commands * bug fixes 20221210 * Chart Resizing fixed. * fix kylekrieg#15 Update Version on Config page. States Will not allow you to change version if pending changes on flow. * Reorganized Config Page. Remove duplicate for kylekrieg#16 and kylekrieg#17 * Update package.json to new version * Changed package to update on dashboard refresh. * Fixed for all project folders. * Updated Checkout Command to folder. * Add debug node for configuration * 30 lightning (kylekrieg#31) Resolves kylekrieg#30. Added node.status to many function nodes. Disabled current backup and restore function in lieu of node-red context storage. Co-authored-by: kd9lsv <[email protected]> * Fixed IsFocus in Radio Data for Radio2 * Op Page CSS Rework. * Update CSS * Removed Spot Rate * 10 & 30 Minute Data * Band Stats CSS Matching * Band and Radio Values CSS. * Band stats chart CSS updates * PC Name Issue * Cleaned Up Radio Input Manually. Pending SQL. * Config Page Redesign (kylekrieg#33) * Config Restructure Part 1. * Flip Locks on Dashboard * Setup Score UDP and Left off. * Fixed ui to fill variables in forms. * Clean UI Changes and turned off HTTP OnlineScoreBoard * Update Changelog for PR. * Update to version V1.0.0 Co-authored-by: kylekrieg <[email protected]> Co-authored-by: AA0Z <[email protected]>
* v1.0.1 Made Sure Restart nodes were connected. * v1.1.0 Scores for dashboard flow are calculated after QSO UDP.
…m. Initial options for Radio PCs.
Config Headers larger Reorganize Map Config Group
…fix Lightining Websocket.
* Fix docs part 1. * Remove Previous data that need to added to Issues. * Remove Unused pictures from Docs due to google photos library. * Relative Pictures instead in links. * Remove json tag due to not being valid json * Update READMe to relative not absolute.
|
FIXED!! Crap...i requested to pull into main not dev! darn...twice same mistake. |
|
Ron, Your commits were not including the latest changes to dev. I rebased the branch upon dev to include the additional changes that I have made in between the other Tempateure PR and this requiring forced pushing the changes up. and associated changes. Please pull these changes down before you create another commit. See below for git tree to clarify branches.
I am still looking at the rest of the changes but for sure I know that 5 digit distance sizes are too big. I am also letting @kylekrieg initially look at this for QA on the changes. Let me know if you have any issues. |
|
Thanks. I will get the hang of this. I was not offered any pushes when I committed. Probably missed a step. In see 9 pull and 9 pushes which I am merging on my local now. Oh and PLEASE QA is welcomed! |
kd9lsv
force-pushed
the
compact_listings
branch
from
79b0713 to
e0a7031
Compare
|
I still have a issue with what you did last time. You merge both commits which duplicated the same commits in series. To become even with github, please force-pull (pull --force) using the terminal on the Node-Red machine. |
|
Terminal command is good hint. Will try later... halftime Eagles 49ers :)73 es God Bless de KK1L, Ron <><On Jan 29, 2023 14:36, Connor Dickey ***@***.***> wrote:
I still have a issue with what you did last time. You merge both commits which duplicated the same commits in series. To become even with github, please force-pull (pull --force) using the terminal on the Node-Red machine.
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were assigned.Message ID: ***@***.***>
|
|
I ran the force with all up to date response. On the gui edit interface i am showing 12 commits ahead. Should I perform the pushes?73 es God Bless de KK1L, Ron <><On Jan 29, 2023 15:29, Ron Rossi ***@***.***> wrote:Terminal command is good hint. Will try later... halftime Eagles 49ers :)73 es God Bless de KK1L, Ron <><On Jan 29, 2023 14:36, Connor Dickey ***@***.***> wrote:
I still have a issue with what you did last time. You merge both commits which duplicated the same commits in series. To become even with github, please force-pull (pull --force) using the terminal on the Node-Red machine.
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were assigned.Message ID: ***@***.***>
|
|
No, by doing the force pull it should have removed all outstanding commits unless you created the 12 additional commits? Your log should have the commits pictured below. If you have trouble to start from github, I would recommend creating a new local branch
|
|
Will work through this in the morning and get it straightened out. I am obviously new at git sharing73 es God Bless de KK1L, Ron <><On Jan 29, 2023 21:22, Connor Dickey ***@***.***> wrote:
No, by doing the force pull it should have removed all outstanding commits unless you created the 12 additional commits? Your log should have the commits pictured below.
If you have trouble to start from github, I would recommend creating a new local branch git checkout -b <name> origin/compact_listings. If you have extra commits, then you would need to cherry-pick the needed commits.
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were assigned.Message ID: ***@***.***>
|
|
Hi Connor, I ended up creating a new local branch git checkout -b cleanup_compact_listings origin/compact_listings and now I show "Already up to date" for force pull and no pushes or pulls needed on the ui interface for sharing. So that should have gotten the pull request squared away. I then made a few edits and will commit and sync. For SO1V and SO2R the Dashboard and RadioInfo will correctly show results. See the note below on multi-op, but y'all probably already know it is broken. _Note: multi-op mode is broken...not by me, but in general. In multi_op mode the station determination in Radio Info, Database, and Dashboard rely on RadioInfo.StationName which is the NetBios name of the computer sending the info. I have started to give it some though how to associate this StationName with one of the PC names someone would like to assign in node-red. You have to log the various StationNames that come across and build a database...UGH. Using RadioName is not helpful since that comes from which radio type is assigned in the Radio column of the Hardware tab of N1MM which is not unique per PC. Bottom line is it seems that assigning names to the stations from the config panel is problematic. Assigning a name dynamically as the reports come in from the various stations on the network is possible. There is StationName from RadioInfo and also in ContactInfo along with NetworkedCompNr which combined could build and indexed list 0 through 8 of StationNames._ |
|
Hey Ron,
Thanks for working on the dashboard and making it better. Every little bit
helps.
My thoughts on SO1V, SO2R, Multi-Op, M/M with SO2R as there are some
challenges as we get the dashboard in more operator hands and they are
asking for enhancements or finding bugs in the original code (which is
awesome).
SO1V - single Netbios name, single radio, single VFO. That's easy. We've
solved that.
SO2R - single Netbios name, dual radio or single radio dual VFO. In N1MM,
I was assuming the first radio had radio number (NR) = 1 and radio two was
NR = 2. The dashboard would look for that single Netbios name and then
push NR = 1 to the Radio 1 position and NR = 2 to the Radio 2 position to
show both VFO's on the main dashboard screen.
Multi-OP - multiple Netbios names, multiple radios, everybody was either
running or S&P on 1 VFO only. The dashboard would see multiple Netbios
names and Radio 1 would show up in Radio 1's info, Radio 2 and Radio 2's
into..and so on...nobody would be running multiple VFO's. If they were,
that wasn't captured in the main dashboard screen or on the radio dashboard.
M/M with S02R - we have a couple of stations running the dashboard in a M/2
S02R configuration. Multiple Netbios names with NR = 1 and NR = 2. This
is mainly Flex users and big contest stations.
I'd have to really sit down and go through the flow as I haven't touched
the actual programming in a while. Connor has completed all of the code
upgrades in the past 5 or 6 months.
73
Kyle
AA0Z
…On Mon, Jan 30, 2023 at 2:00 PM Ron Rossi ***@***.***> wrote:
Hi Connor,
I ended up creating a new local branch git checkout -b
cleanup_compact_listings origin/compact_listings and now I show "Already up
to date" for force pull and no pushes or pulls needed on the ui interface
for sharing. So that should have gotten the pull request squared away.
I then made a few edits and will commit and sync. For SO1V and SO2R the
Dashboard and RadioInfo will correctly show results. See the note below on
multi-op, but y'all probably already know it is broken.
*Note:* multi-op mode is broken...not by me, but in general. In multi_op
mode the station determination in Radio Info, Database, and Dashboard rely
on RadioInfo.StationName which is the NetBios name of the computer sending
the info. I have started to give it some though how to associate this
StationName with one of the PC names someone would like to assign in
node-red. You have to log the various StationNames that come across and
build a database...UGH. Using RadioName is not helpful since that comes
from which radio type is assigned in the Radio column of the Hardware tab
of N1MM which is not unique per PC.
—
Reply to this email directly, view it on GitHub
<#60 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/APYDC7HSM5TFJ7POEPYVOFLWVAMXRANCNFSM6AAAAAAUJ7V3CU>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
I wrote some notes in my last push. I can summarize.
For SO1V and SO2R it is easy enough to map the PC Name someone chooses
in the config page to radio 1 or radio 2. I have done that. The names
get correctly picked up.
The multi issue is harder as you recognize. My comments from github are
below. AFAIK the list if networked computers is not statically available
or there apriori. Building up a list by monitoring the StationNames as
they come in and building an indexed name list which would steer data to
the right block on the RadioInfo tab (for example). An extra peice of
info is available in the ContactInfo packet (NetworkedCompNr), but that
only comes along when a contact is logged rather than every 10s as
RadioInfo does. The Nr could be used as the index to the list of
StationNames. It would in all cases be reasonable to add RadioNr to the NetBios (StationName) so if SO2R is going on at any one station it would be caught. Could aggregate everything from one station or pay attention to each radio.
In multi_op mode the station determination in Radio Info, Database,
and Dashboard rely on RadioInfo.StationName which is the NetBios
name of the computer sending the info. I have started to give it
some though how to associate this StationName with one of the PC
names someone would like to assign in node-red. You have to log the
various StationNames that come across and build a database...UGH.
Using RadioName is not helpful since that comes from which radio
type is assigned in the Radio column of the Hardware tab of N1MM
which is not unique per PC.
Bottom line is it seems that assigning names to the stations from
the config panel is problematic. Assigning a name dynamically as the
reports come in from the various stations on the network is
possible. There is StationName from RadioInfo and also in
ContactInfo along with NetworkedCompNr which combined could build
and indexed list 0 through 8 of StationNames._
73 es God Bless de KK1L
Ron <><
http://kk1l.com
…On 1/30/2023 15:25, AA0Z wrote:
Hey Ron,
Thanks for working on the dashboard and making it better. Every little bit
helps.
My thoughts on SO1V, SO2R, Multi-Op, M/M with SO2R as there are some
challenges as we get the dashboard in more operator hands and they are
asking for enhancements or finding bugs in the original code (which is
awesome).
SO1V - single Netbios name, single radio, single VFO. That's easy. We've
solved that.
SO2R - single Netbios name, dual radio or single radio dual VFO. In N1MM,
I was assuming the first radio had radio number (NR) = 1 and radio two was
NR = 2. The dashboard would look for that single Netbios name and then
push NR = 1 to the Radio 1 position and NR = 2 to the Radio 2 position to
show both VFO's on the main dashboard screen.
Multi-OP - multiple Netbios names, multiple radios, everybody was either
running or S&P on 1 VFO only. The dashboard would see multiple Netbios
names and Radio 1 would show up in Radio 1's info, Radio 2 and Radio 2's
into..and so on...nobody would be running multiple VFO's. If they were,
that wasn't captured in the main dashboard screen or on the radio
dashboard.
M/M with S02R - we have a couple of stations running the dashboard in
a M/2
S02R configuration. Multiple Netbios names with NR = 1 and NR = 2. This
is mainly Flex users and big contest stations.
I'd have to really sit down and go through the flow as I haven't touched
the actual programming in a while. Connor has completed all of the code
upgrades in the past 5 or 6 months.
73
Kyle
AA0Z
On Mon, Jan 30, 2023 at 2:00 PM Ron Rossi ***@***.***> wrote:
> Hi Connor,
>
> I ended up creating a new local branch git checkout -b
> cleanup_compact_listings origin/compact_listings and now I show
"Already up
> to date" for force pull and no pushes or pulls needed on the ui
interface
> for sharing. So that should have gotten the pull request squared away.
>
> I then made a few edits and will commit and sync. For SO1V and SO2R the
> Dashboard and RadioInfo will correctly show results. See the note
below on
> multi-op, but y'all probably already know it is broken.
>
> *Note:* multi-op mode is broken...not by me, but in general. In multi_op
> mode the station determination in Radio Info, Database, and
Dashboard rely
> on RadioInfo.StationName which is the NetBios name of the computer
sending
> the info. I have started to give it some though how to associate this
> StationName with one of the PC names someone would like to assign in
> node-red. You have to log the various StationNames that come across and
> build a database...UGH. Using RadioName is not helpful since that comes
> from which radio type is assigned in the Radio column of the
Hardware tab
> of N1MM which is not unique per PC.
>
> —
> Reply to this email directly, view it on GitHub
>
<#60 (comment)>,
> or unsubscribe
>
<https://github.com/notifications/unsubscribe-auth/APYDC7HSM5TFJ7POEPYVOFLWVAMXRANCNFSM6AAAAAAUJ7V3CU>
> .
> You are receiving this because you were mentioned.Message ID:
> ***@***.***>
>
—
Reply to this email directly, view it on GitHub
<#60 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ARRSIFUTLCY4U3ETPP6Z2U3WVAPSXANCNFSM6AAAAAAUJ7V3CU>.
You are receiving this because you were assigned.Message ID:
***@***.***>
|
|
Have not had a chance to monkey with this in a bit...sorry. I have noticed that the CPU usage is significantly higher with this code and I have not found what of the simple changes that were made caused this issue. |
|
Ron, No worries, I have been not doing much with this week. I am hoping to get back on tackling more issues, but if you need additional help, let me know. 73, |
|
@KK1L I found the problem with the computer latch up as one of the UI-items (tempature) would send a result upon receive data which caused an endless feedback loop. |
|
Dude you're kidding! Awesome. I have scratched my head on this a lot and never thought that would do it.Also shamefully I have been way to busy with work and family to monkey around much of the past two months or so.73 es God Bless de KK1L, Ron <><On Apr 8, 2023 09:54, Connor Dickey ***@***.***> wrote:
@KK1L I found the problem with the computer latch up as one of the UI-items (tempature) would send a result upon receive data which caused an endless feedback loop.
—Reply to this email directly, view it on GitHub, or unsubscribe.You are receiving this because you were mentioned.Message ID: ***@***.***>
|
|
@kd9lsv I made the change and VIOLA(!) CPU useage is back to normal...so awesome. Frankly that was one of the reasons I had not tinkered more with the flow. Silly to make changes and perpetuate a flaw. Now I can bravely move forward. |
|
LOL. I am just trying to get back in the swing of things and are wanting to make sure you changes get implemented. I also had that issue a long time ago, when I updated the whole thing for v1.0.0 . If there is anything I need to help fix to implement, please let me know. |
|
That was the outstanding issue for the compact dashboard update and having the radio names show up in Radio Info. |
|
Make sure you are on the correct branch and pushing to the correct fork. |
As a first step to compacting some of the screens I started with the main Dashboard. I integrated the radio titles into the Op label on the Radio1 and 2 info along the bottom and removed the titles from a few of the other blocks.
To allow the radio names to be displayed I added "msg.RadioNames=global.get('PCs');" to the UTF8 function to allow me to use the names the labels for Radio 1 Operator Dashboard and Radio 2 Operator Dashboard.