haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor editorial changes to PCB calculator, part 2 

Don't use substripts in HTML  if there is just a number in the
subscript: "R1", not "R<sub>1</sub>", except for characteristic
impedance. And of course still use "Z<sub>in</sub>", not "Zin".

This is also consistent with the images.
This commit is contained in:
Mikolaj Wielgus 2021-10-31 18:28:45 +01:00 committed by Wayne Stambaugh
parent 153594b9ea
commit a3707ad365
10 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pcb_calculator/attenuators/bridget_tee_formula.h
View File

@ -5,7 +5,7 @@ _HKI( "### Bridged Tee Attenuator\n"
"___Z<sub>out</sub>___ is desired output impedance in &#x2126;<br>\n" "___Z<sub>out</sub>___ is desired output impedance in &#x2126;<br>\n"
"___Z<sub>0</sub> = Z<sub>in</sub> = Z<sub>out</sub>___\n" "___Z<sub>0</sub> = Z<sub>in</sub> = Z<sub>out</sub>___\n"
"\n" "\n"
"___L = 10<sup>a/20</up>___\n" "___L = 10<sup>a/20</up>___<br>\n"
"___R<sub>1</sub> = Z<sub>0</sub> &middot; (L&minus;1)___<br>\n" "___R1 = Z<sub>0</sub> &middot; (L&minus;1)___<br>\n"
"___R<sub>2</sub> = Z<sub>0</sub> / (L&minus;1)___\n" "___R2 = Z<sub>0</sub> / (L&minus;1)___\n"
"" ); "" );

6
pcb_calculator/attenuators/bridget_tee_formula.md
View File

@ -4,6 +4,6 @@ ___Z<sub>in</sub>___ is desired input impedance in &#x2126;<br>
___Z<sub>out</sub>___ is desired output impedance in &#x2126;<br> ___Z<sub>out</sub>___ is desired output impedance in &#x2126;<br>
___Z<sub>0</sub> = Z<sub>in</sub> = Z<sub>out</sub>___ ___Z<sub>0</sub> = Z<sub>in</sub> = Z<sub>out</sub>___
___L = 10<sup>a/20</up>___ ___L = 10<sup>a/20</up>___<br>
___R<sub>1</sub> = Z<sub>0</sub> &middot; (L&minus;1)___<br> ___R1 = Z<sub>0</sub> &middot; (L&minus;1)___<br>
___R<sub>2</sub> = Z<sub>0</sub> / (L&minus;1)___ ___R2 = Z<sub>0</sub> / (L&minus;1)___

6
pcb_calculator/attenuators/pi_formula.h
View File

@ -6,7 +6,7 @@ _HKI( "### Pi Attenuator\n"
"\n" "\n"
"___L = 10<sup>a/20</sup>___<br>\n" "___L = 10<sup>a/20</sup>___<br>\n"
"___A = (L+1) / (L&minus;1)___<br><br>\n" "___A = (L+1) / (L&minus;1)___<br><br>\n"
"___R<sub>2</sub> = (L&minus;1) / 2&middot;&radic;(Z<sub>in</sub> &middot; Z<sub>out</sub> / L)___<br>\n" "___R2 = (L&minus;1) / 2&middot;&radic;(Z<sub>in</sub> &middot; Z<sub>out</sub> / L)___<br>\n"
"___R<sub>1</sub> = 1 / (A/Z<sub>in</sub> &minus; 1/R<sub>2</sub>)___<br>\n" "___R1 = 1 / (A/Z<sub>in</sub> &minus; 1/R2)___<br>\n"
"___R<sub>3</sub> = 1 / (A/Z<sub>out</sub> &minus; 1/R<sub>2</sub>)___\n" "___R3 = 1 / (A/Z<sub>out</sub> &minus; 1/R2)___\n"
"" ); "" );

6
pcb_calculator/attenuators/pi_formula.md
View File

@ -5,6 +5,6 @@ ___Z<sub>out</sub>___ is desired output impedance in &#x2126;<br>
___L = 10<sup>a/20</sup>___<br> ___L = 10<sup>a/20</sup>___<br>
___A = (L+1) / (L&minus;1)___<br><br> ___A = (L+1) / (L&minus;1)___<br><br>
___R<sub>2</sub> = (L&minus;1) / 2&middot;&radic;(Z<sub>in</sub> &middot; Z<sub>out</sub> / L)___<br> ___R2 = (L&minus;1) / 2&middot;&radic;(Z<sub>in</sub> &middot; Z<sub>out</sub> / L)___<br>
___R<sub>1</sub> = 1 / (A/Z<sub>in</sub> &minus; 1/R<sub>2</sub>)___<br> ___R1 = 1 / (A/Z<sub>in</sub> &minus; 1/R2)___<br>
___R<sub>3</sub> = 1 / (A/Z<sub>out</sub> &minus; 1/R<sub>2</sub>)___ ___R3 = 1 / (A/Z<sub>out</sub> &minus; 1/R2)___

2
pcb_calculator/attenuators/splitter_formula.h
View File

@ -5,5 +5,5 @@ _HKI( "### Split Attenuator\n"
"___Z<sub>out</sub>___ is desired output impedance in &#x2126; \n" "___Z<sub>out</sub>___ is desired output impedance in &#x2126; \n"
"___Z<sub>0</sub> = Z<sub>in</sub> = Z<sub>out</sub>___\n" "___Z<sub>0</sub> = Z<sub>in</sub> = Z<sub>out</sub>___\n"
"\n" "\n"
"___R<sub>1</sub> = R<sub>2</sub> = R<sub>3</sub> = Z<sub>0</sub>/3___\n" "___R1 = R2 = R3 = Z<sub>0</sub>/3___\n"
"" ); "" );

2
pcb_calculator/attenuators/splitter_formula.md
View File

@ -4,4 +4,4 @@ ___Z<sub>in</sub>___ is desired input impedance in &#x2126;
___Z<sub>out</sub>___ is desired output impedance in &#x2126; ___Z<sub>out</sub>___ is desired output impedance in &#x2126;
___Z<sub>0</sub> = Z<sub>in</sub> = Z<sub>out</sub>___ ___Z<sub>0</sub> = Z<sub>in</sub> = Z<sub>out</sub>___
___R<sub>1</sub> = R<sub>2</sub> = R<sub>3</sub> = Z<sub>0</sub>/3___ ___R1 = R2 = R3 = Z<sub>0</sub>/3___

8
pcb_calculator/attenuators/tee_formula.h
View File

@ -5,8 +5,8 @@ _HKI( "### Tee Attenuator\n"
"___Z<sub>out</sub>___ is desired output impedance in &#x2126;<br>\n" "___Z<sub>out</sub>___ is desired output impedance in &#x2126;<br>\n"
"\n" "\n"
"___L = 10<sup>a/20</sup>___<br>\n" "___L = 10<sup>a/20</sup>___<br>\n"
"___A = (L+1) / (L&minus;1)___<br>\n" "___A = (L+1) / (L&minus;1)___<br><br>\n"
"___R<sub>2</sub> = 2&middot;&radic;(L &middot; Z<sub>in</sub> &middot; Z<sub>out</sub>) / (L&minus;1)___<br>\n" "___R2 = 2&middot;&radic;(L &middot; Z<sub>in</sub> &middot; Z<sub>out</sub>) / (L&minus;1)___<br>\n"
"___R<sub>1</sub> = Z<sub>in</sub> &middot; A &minus; R<sub>2</sub>___<br>\n" "___R1 = Z<sub>in</sub> &middot; A &minus; R2___<br>\n"
"___R<sub>3</sub> = Z<sub>out</sub> &middot; A &minus; R<sub>2</sub>___\n" "___R3 = Z<sub>out</sub> &middot; A &minus; R2___\n"
"" ); "" );

8
pcb_calculator/attenuators/tee_formula.md
View File

@ -4,7 +4,7 @@ ___Z<sub>in</sub>___ is desired input impedance in &#x2126;<br>
___Z<sub>out</sub>___ is desired output impedance in &#x2126;<br> ___Z<sub>out</sub>___ is desired output impedance in &#x2126;<br>
___L = 10<sup>a/20</sup>___<br> ___L = 10<sup>a/20</sup>___<br>
___A = (L+1) / (L&minus;1)___<br> ___A = (L+1) / (L&minus;1)___<br><br>
___R<sub>2</sub> = 2&middot;&radic;(L &middot; Z<sub>in</sub> &middot; Z<sub>out</sub>) / (L&minus;1)___<br> ___R2 = 2&middot;&radic;(L &middot; Z<sub>in</sub> &middot; Z<sub>out</sub>) / (L&minus;1)___<br>
___R<sub>1</sub> = Z<sub>in</sub> &middot; A &minus; R<sub>2</sub>___<br> ___R1 = Z<sub>in</sub> &middot; A &minus; R2___<br>
___R<sub>3</sub> = Z<sub>out</sub> &middot; A &minus; R<sub>2</sub>___ ___R3 = Z<sub>out</sub> &middot; A &minus; R2___

2
pcb_calculator/calculator_panels/panel_attenuators_base.cpp
View File

@ -18,7 +18,7 @@ PANEL_ATTENUATORS_BASE::PANEL_ATTENUATORS_BASE( wxWindow* parent, wxWindowID id,
bLeftSizerAtt = new wxBoxSizer( wxVERTICAL ); bLeftSizerAtt = new wxBoxSizer( wxVERTICAL );
bLeftSizerAtt->SetMinSize( wxSize( 260,-1 ) ); bLeftSizerAtt->SetMinSize( wxSize( 260,-1 ) );
wxString m_AttenuatorsSelectionChoices[] = { _("PI"), _("Tee"), _("Bridged tee"), _("Resistive splitter") }; wxString m_AttenuatorsSelectionChoices[] = { _("Pi"), _("Tee"), _("Bridged tee"), _("Resistive splitter") };
int m_AttenuatorsSelectionNChoices = sizeof( m_AttenuatorsSelectionChoices ) / sizeof( wxString ); int m_AttenuatorsSelectionNChoices = sizeof( m_AttenuatorsSelectionChoices ) / sizeof( wxString );
m_AttenuatorsSelection = new wxRadioBox( this, wxID_ANY, _("Attenuators"), wxDefaultPosition, wxDefaultSize, m_AttenuatorsSelectionNChoices, m_AttenuatorsSelectionChoices, 1, wxRA_SPECIFY_COLS ); m_AttenuatorsSelection = new wxRadioBox( this, wxID_ANY, _("Attenuators"), wxDefaultPosition, wxDefaultSize, m_AttenuatorsSelectionNChoices, m_AttenuatorsSelectionChoices, 1, wxRA_SPECIFY_COLS );
m_AttenuatorsSelection->SetSelection( 2 ); m_AttenuatorsSelection->SetSelection( 2 );

2
pcb_calculator/calculator_panels/panel_attenuators_base.fbp
View File

@ -84,7 +84,7 @@
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
<property name="center_pane">0</property> <property name="center_pane">0</property>
<property name="choices">&quot;PI&quot; &quot;Tee&quot; &quot;Bridged tee&quot; &quot;Resistive splitter&quot;</property> <property name="choices">&quot;Pi&quot; &quot;Tee&quot; &quot;Bridged tee&quot; &quot;Resistive splitter&quot;</property>
<property name="close_button">1</property> <property name="close_button">1</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>