mirror of
https://github.com/ttrftech/NanoVNA.git
synced 2025-12-06 03:31:59 +01:00
Merge branch 'master' of https://github.com/ttrftech/NanoVNA
This commit is contained in:
commit
cd745ca5eb
2
plot.c
2
plot.c
|
|
@ -594,7 +594,7 @@ format_smith_value(char *buf, int len, const float coeff[2], uint32_t frequency)
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MS_RX:
|
case MS_RX:
|
||||||
plot_printf(buf, len, "%F"S_OHM"%+Fj", zr, zi);
|
plot_printf(buf, len, "%F%+Fj"S_OHM, zr, zi);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case MS_RLC:
|
case MS_RLC:
|
||||||
|
|
|
||||||
2
ui.c
2
ui.c
|
|
@ -1011,7 +1011,7 @@ const menuitem_t menu_marker_smith[] = {
|
||||||
{ MT_CALLBACK, MS_LIN, "LIN", menu_marker_smith_cb },
|
{ MT_CALLBACK, MS_LIN, "LIN", menu_marker_smith_cb },
|
||||||
{ MT_CALLBACK, MS_LOG, "LOG", menu_marker_smith_cb },
|
{ MT_CALLBACK, MS_LOG, "LOG", menu_marker_smith_cb },
|
||||||
{ MT_CALLBACK, MS_REIM,"Re+Im", menu_marker_smith_cb },
|
{ MT_CALLBACK, MS_REIM,"Re+Im", menu_marker_smith_cb },
|
||||||
{ MT_CALLBACK, MS_RX, "R+Xj", menu_marker_smith_cb },
|
{ MT_CALLBACK, MS_RX, "R+jX", menu_marker_smith_cb },
|
||||||
{ MT_CALLBACK, MS_RLC, "R+L/C", menu_marker_smith_cb },
|
{ MT_CALLBACK, MS_RLC, "R+L/C", menu_marker_smith_cb },
|
||||||
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },
|
{ MT_CANCEL, 0, S_LARROW" BACK", NULL },
|
||||||
{ MT_NONE, 0, NULL, NULL } // sentinel
|
{ MT_NONE, 0, NULL, NULL } // sentinel
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue