Skip to content

Conversation

@TonyBlit
Copy link

@TonyBlit TonyBlit commented Sep 9, 2021

Modified the sat list in order to show extra info from the following PR: betaflight/betaflight#10921

New layout:
Screenshot 2021-09-17 at 06 36 43

New sat list in action:
Screenshot 2021-09-09 at 17 42 34

Copy link
Member

@haslinghuis haslinghuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for contributing.
Please remove commented out code.
Some remarks I made are valid in different places.
Hint: look at the Sonar code smells.
We should also test if this change is backwards compatible.

<td style="width: 20%;" i18n="gpsSignalSatId"></td>
<td style="width: 15%;" i18n="gpsSignalQty"></td>
<td style="width: 65%;" i18n="gpsSignalStr"></td>
<!--<td style="width: 10%;" i18n="gpsSignalGnssId"></td>-->
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be removed?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually, I forgot to ask about this. How does the localization system work? do I have to add gpsSignalGnssId with the "Gnss Id" string to the messages.json in all languages? In this case it's easy, but what about other strings that might need to be translated?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not, only English. We have translators that will do the rest of languages

let quality = '';
switch (FC.GPS_DATA.quality[i] & 0x7) {
case 0:
quality = quality + 'no signal | ';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
quality = quality + 'no signal | ';
quality += 'no signal | ';

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have reworked those ugly switch cases, so this is no longer an issue :-)

Copy link
Member

@haslinghuis haslinghuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also fix the sonar and squash your commits when done. Looks good.

<td>0</td>
</tr>
</table>
</table>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👾 was on the right position 😆

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ouch :-)

@McGiverGim
Copy link
Member

Please also fix the sonar and squash your commits when done. Looks good.

Only as a help for @TonyBlit , not all the Sonar issues need to be fixed. Sometimes they have no sense. In this case, the literal that has been duplicated I think it does not need to be fixed, it is part of an array and will be strange to define this outside and not the other elements.
The other two issues can be fixed.

@TonyBlit
Copy link
Author

@McGiverGim yeah, the first one it doesn't make sense, indeed. The other ones made me think I forgot to localize the messages, so I've fixed everything and squashed, hope all is good now.

McGiverGim
McGiverGim previously approved these changes Sep 15, 2021
Copy link
Member

@McGiverGim McGiverGim left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To me is good enough... good work! :)
As suggestion, in the Configurator PRs is good to attach a screen capture. It helps with the review.

haslinghuis
haslinghuis previously approved these changes Sep 15, 2021
Copy link
Member

@haslinghuis haslinghuis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@McGiverGim
Copy link
Member

@TonyBlit I've seen this in the firmware PR:

gps_ublox_use_galileo will no longer disable QZSS as it's suggested on the M8N manual

Can you modify this description:

"configurationGPSGalileoHelp": {
"message": "When enabled, this removes the QZSS system (Japanese) and replaces it for the Galileo system (European).",
"description": "Help text for the option to use Galileo in the GPS configuration"
},

I think something like:

It enables the Galileo system (European). Until Betaflight 4.2 this implied to remove the QZSS system (Japanese) too.

Sorry, I'm not English native, I'm sure you will find something better :)

@TonyBlit
Copy link
Author

@McGiverGim Well spotted! I was not even conscious of this message.

I've been tempted to mention ublox_use_galileo is only for M8N, but given M9N has galileo already enabled, maybe it's not worth complicating the sentence until M9N is widely adopted.

@TonyBlit TonyBlit dismissed stale reviews from haslinghuis and McGiverGim via deea9f9 September 18, 2021 06:25
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
49.8% 49.8% Duplication

haslinghuis
haslinghuis previously approved these changes Sep 18, 2021
McGiverGim
McGiverGim previously approved these changes Sep 20, 2021
ctzsnooze
ctzsnooze previously approved these changes Oct 12, 2021
Copy link
Member

@limonspb limonspb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TonyBlit please squash in 1 commit and i think its ready to go.

limonspb
limonspb previously approved these changes Nov 25, 2021
haslinghuis
haslinghuis previously approved these changes Nov 25, 2021
blckmn
blckmn previously approved these changes Dec 3, 2021
McGiverGim
McGiverGim previously approved these changes Dec 3, 2021
@haslinghuis haslinghuis self-assigned this Dec 3, 2021
@blckmn
Copy link
Member

blckmn commented Dec 3, 2021

AUTOMERGE: (FAIL)

  • github identifies PR as mergeable -> FAIL
  • assigned to a milestone -> PASS
  • cooling off period lapsed -> PASS
  • commit count less or equal to three -> PASS
  • Don't merge label NOT found -> PASS
  • at least one RN: label found -> PASS
  • Tested label found -> FAIL
  • assigned to an approver -> PASS
  • approver count at least three -> PASS

ctzsnooze
ctzsnooze previously approved these changes Dec 13, 2021
chmelevskij
chmelevskij previously approved these changes Dec 20, 2021
@sonarqubecloud
Copy link

SonarCloud Quality Gate failed.    Quality Gate failed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 1 Code Smell

No Coverage information No Coverage information
50.2% 50.2% Duplication

Copy link
Member

@asizon asizon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really good features, my requested changes are not to important but if you can take a look would be nice

<td style="width: 20%;" i18n="gpsSignalSatId"></td>
<td style="width: 15%;" i18n="gpsSignalQty"></td>
<td style="width: 65%;" i18n="gpsSignalStr"></td>
<td style="width: 12%;" i18n="gpsSignalGnssId"></td>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The use of styles into html part is old, now we try to move all styles in to css file.

Copy link
Member

@chmelevskij chmelevskij Dec 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wouldn't block this though. Both inline styles and styles files are redundant if we just move to vue/component based architecture, so one way or the other re-work will be needed.

@haslinghuis
Copy link
Member

Sonar disabled us here from merging this 😕

@limonspb limonspb merged commit b396f0a into betaflight:master Dec 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants