diff --git a/pcb_calculator/attenuators/bridget_tee_formula.h b/pcb_calculator/attenuators/bridget_tee_formula.h index 0b7b426973..556c1b29c3 100644 --- a/pcb_calculator/attenuators/bridget_tee_formula.h +++ b/pcb_calculator/attenuators/bridget_tee_formula.h @@ -1,10 +1,11 @@ // Do not edit this file, it is autogenerated by CMake from the .md file _HKI( "### Bridged Tee Attenuator\n" -"__Zin__ desired input impedance in Ω
\n" -"__Zout__ desired output impedance
\n" -"__Z0 = Zin = Zout__

\n" +"___a___ is attenuation in dB \n" +"___Zin___ is desired input impedance in Ω \n" +"___Zout___ is desired output impedance in Ω \n" +"___Z0 = Zin = Zout___ \n" "\n" -"* __a__ attenuation in dB\n" -"* __L = 10a/20__ (the loss)

\n" -"* ___R1 = Z0 \\* (L - 1)___\n" -"* ___R2 = Z0 / (L - 1)___" ); +"___L = 10a/20___\n" +"___R1 = Z0 ⋅ (L−1)___ \n" +"___R2 = Z0 / (L−1)___\n" +"" ); diff --git a/pcb_calculator/attenuators/bridget_tee_formula.md b/pcb_calculator/attenuators/bridget_tee_formula.md index d569000352..ef9362800e 100644 --- a/pcb_calculator/attenuators/bridget_tee_formula.md +++ b/pcb_calculator/attenuators/bridget_tee_formula.md @@ -1,9 +1,9 @@ ### Bridged Tee Attenuator -__Zin__ desired input impedance in Ω
-__Zout__ desired output impedance
-__Z0 = Zin = Zout__

+___a___ is attenuation in dB +___Zin___ is desired input impedance in Ω +___Zout___ is desired output impedance in Ω +___Z0 = Zin = Zout___ -* __a__ attenuation in dB -* __L = 10a/20__ (the loss)

-* ___R1 = Z0 \* (L - 1)___ -* ___R2 = Z0 / (L - 1)___ \ No newline at end of file +___L = 10a/20___ +___R1 = Z0 ⋅ (L−1)___ +___R2 = Z0 / (L−1)___ diff --git a/pcb_calculator/attenuators/pi_formula.h b/pcb_calculator/attenuators/pi_formula.h index 921c815b16..9c4d3cfea4 100644 --- a/pcb_calculator/attenuators/pi_formula.h +++ b/pcb_calculator/attenuators/pi_formula.h @@ -1,12 +1,12 @@ // Do not edit this file, it is autogenerated by CMake from the .md file -_HKI( "### PI Attenuator\n" -"__Zin__ desired input impedance in Ω
\n" -"__Zout__ desired output impedance
\n" -"__Zin = Zout__

\n" +_HKI( "### Pi Attenuator\n" +"___a___ is attenuation in dB \n" +"___Zin___ is desired input impedance in Ω \n" +"___Zout___ is desired output impedance in Ω \n" "\n" -"* __a__ attenuation in dB\n" -"* __L = 10a/20__ (the loss)\n" -"* __A = (L + 1) / (L - 1)__

\n" -"* ___R2 = (L- 1) / 2 \\* √ ( (Zin \\* Zout) / L)___\n" -"* ___R1 = 1 / (A / Zin - 1 / R2)___\n" -"* ___R3 = 1 / (A / Zout - 1 / R2)___" ); +"___L = 10a/20___ \n" +"___A = (L+1) / (L−1)___ \n" +"___R2 = (L−1) / 2⋅√(Zin ⋅ Zout / L)___ \n" +"___R1 = 1 / (A/Zin − 1/R2)___ \n" +"___R3 = 1 / (A/Zout − 1/R2)___\n" +"" ); diff --git a/pcb_calculator/attenuators/pi_formula.md b/pcb_calculator/attenuators/pi_formula.md index e488f9202e..8e825e4fbb 100644 --- a/pcb_calculator/attenuators/pi_formula.md +++ b/pcb_calculator/attenuators/pi_formula.md @@ -1,11 +1,10 @@ -### PI Attenuator -__Zin__ desired input impedance in Ω
-__Zout__ desired output impedance
-__Zin = Zout__

+### Pi Attenuator +___a___ is attenuation in dB +___Zin___ is desired input impedance in Ω +___Zout___ is desired output impedance in Ω -* __a__ attenuation in dB -* __L = 10a/20__ (the loss) -* __A = (L + 1) / (L - 1)__

-* ___R2 = (L- 1) / 2 \* √ ( (Zin \* Zout) / L)___ -* ___R1 = 1 / (A / Zin - 1 / R2)___ -* ___R3 = 1 / (A / Zout - 1 / R2)___ \ No newline at end of file +___L = 10a/20___ +___A = (L+1) / (L−1)___ +___R2 = (L−1) / 2⋅√(Zin ⋅ Zout / L)___ +___R1 = 1 / (A/Zin − 1/R2)___ +___R3 = 1 / (A/Zout − 1/R2)___ diff --git a/pcb_calculator/attenuators/splitter_formula.h b/pcb_calculator/attenuators/splitter_formula.h index d5d8c4bc36..0ba58290c1 100644 --- a/pcb_calculator/attenuators/splitter_formula.h +++ b/pcb_calculator/attenuators/splitter_formula.h @@ -1,9 +1,9 @@ // Do not edit this file, it is autogenerated by CMake from the .md file _HKI( "### Split Attenuator\n" -"#### Attenuation is 6dB\n" -"___Zin___ desired input impedance in Ω
\n" -"___Zout___ desired output impedance in Ω
\n" -"___Zin = Zout___\n" +"Attenuation is 6 dB \n" +"___Zin___ is desired input impedance in Ω \n" +"___Zout___ is desired output impedance in Ω \n" +"___Z0 = Zin = Zout___\n" "\n" -"___R1 = R2 = R3 = Zout / 3___\n" +"___R1 = R2 = R3 = Z0/3___\n" "" ); diff --git a/pcb_calculator/attenuators/splitter_formula.md b/pcb_calculator/attenuators/splitter_formula.md index e643af68f7..4f782e88e0 100644 --- a/pcb_calculator/attenuators/splitter_formula.md +++ b/pcb_calculator/attenuators/splitter_formula.md @@ -1,7 +1,7 @@ ### Split Attenuator -#### Attenuation is 6dB -___Zin___ desired input impedance in Ω
-___Zout___ desired output impedance in Ω
-___Zin = Zout___ +Attenuation is 6 dB +___Zin___ is desired input impedance in Ω +___Zout___ is desired output impedance in Ω +___Z0 = Zin = Zout___ -___R1 = R2 = R3 = Zout / 3___ +___R1 = R2 = R3 = Z0/3___ diff --git a/pcb_calculator/attenuators/tee_formula.h b/pcb_calculator/attenuators/tee_formula.h index f8344650ed..87b6a2b8e4 100644 --- a/pcb_calculator/attenuators/tee_formula.h +++ b/pcb_calculator/attenuators/tee_formula.h @@ -1,13 +1,12 @@ // Do not edit this file, it is autogenerated by CMake from the .md file _HKI( "### Tee Attenuator\n" -"__Zin__ desired input impedance in Ω
\n" -"__Zout__ desired output impedance
\n" -"__Zin = Zout__

\n" +"___a___ is attenuation in dB \n" +"___Zin___ is desired input impedance in Ω \n" +"___Zout___ is desired output impedance in Ω\n" "\n" -"* __a__ attenuation in dB\n" -"* __L = 10a/20__ (the loss)\n" -"* ___A = (L + 1) / (L - 1)___

\n" -"* ___R2 = 2 √ (L \\* Zin \\* Zout ) / (L - 1)___\n" -"* ___R1 = Zin \\* A - R2___\n" -"* ___R3 = Zout \\* A - R2___\n" +"___L = 10a/20___ \n" +"___A = (L+1) / (L−1)___ \n" +"___R2 = 2⋅√(L ⋅ Zin ⋅ Zout) / (L−1)___ \n" +"___R1 = Zin ⋅ A − R2___ \n" +"___R3 = Zout ⋅ A − R2___\n" "" ); diff --git a/pcb_calculator/attenuators/tee_formula.md b/pcb_calculator/attenuators/tee_formula.md index 4091dbc698..727a57a9bd 100644 --- a/pcb_calculator/attenuators/tee_formula.md +++ b/pcb_calculator/attenuators/tee_formula.md @@ -1,11 +1,10 @@ ### Tee Attenuator -__Zin__ desired input impedance in Ω
-__Zout__ desired output impedance
-__Zin = Zout__

+___a___ is attenuation in dB +___Zin___ is desired input impedance in Ω +___Zout___ is desired output impedance in Ω -* __a__ attenuation in dB -* __L = 10a/20__ (the loss) -* ___A = (L + 1) / (L - 1)___

-* ___R2 = 2 √ (L \* Zin \* Zout ) / (L - 1)___ -* ___R1 = Zin \* A - R2___ -* ___R3 = Zout \* A - R2___ +___L = 10a/20___ +___A = (L+1) / (L−1)___ +___R2 = 2⋅√(L ⋅ Zin ⋅ Zout) / (L−1)___ +___R1 = Zin ⋅ A − R2___ +___R3 = Zout ⋅ A − R2___ diff --git a/pcb_calculator/calculator_panels/panel_attenuators_base.cpp b/pcb_calculator/calculator_panels/panel_attenuators_base.cpp index 1b59874a2b..9e6b5d8045 100644 --- a/pcb_calculator/calculator_panels/panel_attenuators_base.cpp +++ b/pcb_calculator/calculator_panels/panel_attenuators_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version 3.10.0) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -45,7 +45,7 @@ PANEL_ATTENUATORS_BASE::PANEL_ATTENUATORS_BASE( wxWindow* parent, wxWindowID id, fgSizerAttPrms->SetFlexibleDirection( wxBOTH ); fgSizerAttPrms->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_attenuationLabel = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("Attenuation:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_attenuationLabel = new wxStaticText( sbSizerAttPrms->GetStaticBox(), wxID_ANY, _("Attenuation (a):"), wxDefaultPosition, wxDefaultSize, 0 ); m_attenuationLabel->Wrap( -1 ); fgSizerAttPrms->Add( m_attenuationLabel, 0, wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_attenuators_base.fbp b/pcb_calculator/calculator_panels/panel_attenuators_base.fbp index a330414d39..e010f71a00 100644 --- a/pcb_calculator/calculator_panels/panel_attenuators_base.fbp +++ b/pcb_calculator/calculator_panels/panel_attenuators_base.fbp @@ -212,11 +212,11 @@ bMiddleSizerAtt wxVERTICAL none - + 5 wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT 0 - + wxID_ANY Parameters @@ -224,11 +224,11 @@ wxVERTICAL 1 none - + 5 wxEXPAND|wxBOTTOM 0 - + 3 wxBOTH @@ -272,7 +272,7 @@ 0 0 wxID_ANY - Attenuation: + Attenuation (a): 0 0 diff --git a/pcb_calculator/calculator_panels/panel_attenuators_base.h b/pcb_calculator/calculator_panels/panel_attenuators_base.h index 10014dc8e7..203e384092 100644 --- a/pcb_calculator/calculator_panels/panel_attenuators_base.h +++ b/pcb_calculator/calculator_panels/panel_attenuators_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version 3.10.0) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcb_calculator/calculator_panels/panel_track_width.cpp b/pcb_calculator/calculator_panels/panel_track_width.cpp index b751516658..887961208b 100644 --- a/pcb_calculator/calculator_panels/panel_track_width.cpp +++ b/pcb_calculator/calculator_panels/panel_track_width.cpp @@ -53,10 +53,12 @@ PANEL_TRACK_WIDTH::PANEL_TRACK_WIDTH( wxWindow* parent, wxWindowID id, m_TWNested( false ) { m_trackTempUnits->SetLabel( wxT( "°C" ) ); - m_resistivityUnits->SetLabel( wxT( "Ω•m" ) ); + m_resistivityUnits->SetLabel( wxT( "Ω⋅m" ) ); - m_extTrackResUnits->SetLabel( wxT( "Ω" ) ); - m_intTrackResUnits->SetLabel( wxT( "Ω" ) ); + m_extTrackResUnits->SetLabel( wxT( "Ω" ) ); + m_intTrackResUnits->SetLabel( wxT( "Ω" ) ); + + m_staticText63->SetLabel( _( "Temperature rise" ) + wxT( " (ΔT):" ) ); // Needed on wxWidgets 3.0 to ensure sizers are correctly set GetSizer()->SetSizeHints( this ); diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.cpp b/pcb_calculator/calculator_panels/panel_track_width_base.cpp index 5f1a5ed7b1..ea8a76727e 100644 --- a/pcb_calculator/calculator_panels/panel_track_width_base.cpp +++ b/pcb_calculator/calculator_panels/panel_track_width_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version 3.10.0) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -28,7 +28,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, fgSizerTWprms->SetFlexibleDirection( wxBOTH ); fgSizerTWprms->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticTextCurrent = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Current:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextCurrent = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Current (I):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCurrent->Wrap( -1 ); fgSizerTWprms->Add( m_staticTextCurrent, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM, 5 ); @@ -51,6 +51,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, fgSizerTWprms->Add( m_trackTempUnits, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); m_staticText66 = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("Conductor length:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText66->SetLabelMarkup( _("Conductor length:") ); m_staticText66->Wrap( -1 ); fgSizerTWprms->Add( m_staticText66, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM, 5 ); @@ -67,6 +68,8 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, fgSizerTWprms->Add( m_staticText103, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM, 5 ); m_TWResistivity = new wxTextCtrl( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + m_TWResistivity->Enable( false ); + fgSizerTWprms->Add( m_TWResistivity, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_resistivityUnits = new wxStaticText( sbSizerTW_Prms->GetStaticBox(), wxID_ANY, _("ohm-meter"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -97,7 +100,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, fgSizerTW_Results->SetFlexibleDirection( wxBOTH ); fgSizerTW_Results->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticTextExtWidth = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Trace width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextExtWidth = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Trace width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextExtWidth->Wrap( -1 ); m_staticTextExtWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); @@ -111,7 +114,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_TW_ExtTrackWidth_choiceUnit->SetSelection( 0 ); fgSizerTW_Results->Add( m_TW_ExtTrackWidth_choiceUnit, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 ); - m_staticText65 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Trace thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText65 = new wxStaticText( sbSizerTW_Result->GetStaticBox(), wxID_ANY, _("Trace thickness (H):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText65->Wrap( -1 ); fgSizerTW_Results->Add( m_staticText65, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -195,7 +198,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, fgSizerTW_Results1->SetFlexibleDirection( wxBOTH ); fgSizerTW_Results1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticTextIntWidth = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Trace width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextIntWidth = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Trace width (W):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextIntWidth->Wrap( -1 ); m_staticTextIntWidth->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); @@ -209,7 +212,7 @@ PANEL_TRACK_WIDTH_BASE::PANEL_TRACK_WIDTH_BASE( wxWindow* parent, wxWindowID id, m_TW_IntTrackWidth_choiceUnit->SetSelection( 0 ); fgSizerTW_Results1->Add( m_TW_IntTrackWidth_choiceUnit, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); - m_staticText652 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Trace thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText652 = new wxStaticText( sbSizerTW_Result1->GetStaticBox(), wxID_ANY, _("Trace thickness (H):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText652->Wrap( -1 ); fgSizerTW_Results1->Add( m_staticText652, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxALL, 5 ); diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.fbp b/pcb_calculator/calculator_panels/panel_track_width_base.fbp index e2afd570ae..edf66ca0a3 100644 --- a/pcb_calculator/calculator_panels/panel_track_width_base.fbp +++ b/pcb_calculator/calculator_panels/panel_track_width_base.fbp @@ -70,7 +70,7 @@ 5 wxALL|wxEXPAND 0 - + wxID_ANY Parameters @@ -78,11 +78,11 @@ wxVERTICAL 1 none - + 5 wxEXPAND 0 - + 3 wxBOTH 1 @@ -126,7 +126,7 @@ 0 0 wxID_ANY - Current: + Current (I): 0 0 @@ -501,7 +501,7 @@ 0 wxID_ANY Conductor length: - 0 + 1 0 @@ -745,7 +745,7 @@ Dock 0 Left - 1 + 0 1 @@ -979,7 +979,7 @@ 0 0 wxID_ANY - Trace width: + Trace width (W): 0 0 @@ -1170,7 +1170,7 @@ 0 0 wxID_ANY - Trace thickness: + Trace thickness (H): 0 0 @@ -2299,7 +2299,7 @@ 0 0 wxID_ANY - Trace width: + Trace width (W): 0 0 @@ -2490,7 +2490,7 @@ 0 0 wxID_ANY - Trace thickness: + Trace thickness (H): 0 0 diff --git a/pcb_calculator/calculator_panels/panel_track_width_base.h b/pcb_calculator/calculator_panels/panel_track_width_base.h index e0d930fa0f..9d7be01df6 100644 --- a/pcb_calculator/calculator_panels/panel_track_width_base.h +++ b/pcb_calculator/calculator_panels/panel_track_width_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version 3.10.0-4761b0c5) +// C++ code generated with wxFormBuilder (version 3.10.0) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! diff --git a/pcb_calculator/calculator_panels/panel_via_size.cpp b/pcb_calculator/calculator_panels/panel_via_size.cpp index 699aa0c9a3..92afa99829 100644 --- a/pcb_calculator/calculator_panels/panel_via_size.cpp +++ b/pcb_calculator/calculator_panels/panel_via_size.cpp @@ -60,11 +60,11 @@ PANEL_VIA_SIZE::PANEL_VIA_SIZE( wxWindow* parent, wxWindowID id, long style, const wxString& name ) : PANEL_VIA_SIZE_BASE( parent, id, pos, size, style, name ) { - m_viaResistivityUnits->SetLabel( wxT( "Ω•m" ) ); + m_viaResistivityUnits->SetLabel( wxT( "Ω⋅m" ) ); m_viaTempUnits->SetLabel( wxT( "°C" ) ); - m_viaResUnits->SetLabel( wxT( "Ω" ) ); + m_viaResUnits->SetLabel( wxT( "Ω" ) ); m_viaThermalResUnits->SetLabel( wxT( "°C/W" ) ); - m_viaReactanceUnits->SetLabel( wxT( "Ω" ) ); + m_viaReactanceUnits->SetLabel( wxT( "Ω" ) ); m_viaBitmap->SetBitmap( KiBitmap( BITMAPS::viacalc ) ); diff --git a/pcb_calculator/tracks_width_versus_current_formula.h b/pcb_calculator/tracks_width_versus_current_formula.h index f3dcf38429..aa337e6880 100644 --- a/pcb_calculator/tracks_width_versus_current_formula.h +++ b/pcb_calculator/tracks_width_versus_current_formula.h @@ -5,13 +5,14 @@ _HKI( "If you specify the maximum current, then the trace widths will be calcula "\n" "The controlling value is shown in bold.\n" "\n" -"The calculations are valid for currents up to 35 A (external) or 17.5 A (internal), temperature rises up to 100 ºC, and widths of up to 400 mil (10 mm).\n" +"The calculations are valid for currents up to 35 A (external) or 17.5 A (internal), temperature rises up to 100 °C, and widths of up to 400 mils (10 mm).\n" "\n" -"The formula, from IPC 2221, is\n" -"
__I = K * dT0.44 * (W*H)0.725__
\n" +"The formula, from IPC 2221, is \n" +"
___I = K ⋅ ΔT0.44 ⋅ (W ⋅ H)0.725___
\n" "where: \n" -"__I__ = maximum current in A \n" -"__dt__ = temperature rise above ambient in ºC \n" -"__W,H__ = width and thickness in mils \n" -"__K__ = 0.024 for internal traces or 0.048 for external traces\n" +"___I___ is maximum current in A \n" +"___ΔT___ is temperature rise above ambient in °C \n" +"___W___ is width in mils \n" +"___H___ is thickness (height) in mils \n" +"___K___ is 0.024 for internal traces or 0.048 for external traces \n" "" ); diff --git a/pcb_calculator/tracks_width_versus_current_formula.md b/pcb_calculator/tracks_width_versus_current_formula.md index 390614d308..447a6748fe 100644 --- a/pcb_calculator/tracks_width_versus_current_formula.md +++ b/pcb_calculator/tracks_width_versus_current_formula.md @@ -4,12 +4,13 @@ If you specify one of the trace widths, the maximum current it can handle will b The controlling value is shown in bold. -The calculations are valid for currents up to 35 A (external) or 17.5 A (internal), temperature rises up to 100 ºC, and widths of up to 400 mil (10 mm). +The calculations are valid for currents up to 35 A (external) or 17.5 A (internal), temperature rises up to 100 °C, and widths of up to 400 mils (10 mm). -The formula, from IPC 2221, is -
__I = K * dT0.44 * (W*H)0.725__
+The formula, from IPC 2221, is +
___I = K ⋅ ΔT0.44 ⋅ (W ⋅ H)0.725___
where: -__I__ = maximum current in A -__dt__ = temperature rise above ambient in ºC -__W,H__ = width and thickness in mils -__K__ = 0.024 for internal traces or 0.048 for external traces +___I___ is maximum current in A +___ΔT___ is temperature rise above ambient in °C +___W___ is width in mils +___H___ is thickness (height) in mils +___K___ is 0.024 for internal traces or 0.048 for external traces