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

Sim: Remove inference from Reference and Value

This commit is contained in:
Mikolaj Wielgus 2022-11-18 08:37:58 +01:00
parent 53b9baa5ba
commit e7c43ca20a
43 changed files with 870 additions and 991 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
eeschema/dialogs/dialog_sim_model.cpp
View File

@ -232,10 +232,6 @@ bool DIALOG_SIM_MODEL<T>::TransferDataToWindow()
}
m_excludeCheckbox->SetValue( !curModel().IsEnabled() );
m_inferCheckbox->SetValue( curModel().IsInferred() );
m_inferCheckbox->Show( SIM_MODEL::InferDeviceTypeFromRef( ref )
!= SIM_MODEL::DEVICE_TYPE_::NONE );
onRadioButton( dummyEvent );
return DIALOG_SIM_MODEL_BASE::TransferDataToWindow();
@ -308,8 +304,6 @@ void DIALOG_SIM_MODEL<T>::updateWidgets()
m_excludeCheckbox->SetValue( !curModel().IsEnabled() );
std::string ref = SIM_MODEL::GetFieldValue( &m_fields, SIM_MODEL::REFERENCE_FIELD );
m_inferCheckbox->Enable( SIM_MODEL::InferDeviceTypeFromRef( ref ) == curModel().GetDeviceType() );
m_inferCheckbox->SetValue( curModel().IsInferred() );
m_modelPanel->Layout();
m_pinAssignmentsPanel->Layout();
@ -1204,13 +1198,6 @@ void DIALOG_SIM_MODEL<T>::onExcludeCheckbox( wxCommandEvent& aEvent )
}
template <typename T>
void DIALOG_SIM_MODEL<T>::onInferCheckbox( wxCommandEvent& aEvent )
{
curModel().SetIsInferred( m_inferCheckbox->GetValue() );
}
template <typename T>
void DIALOG_SIM_MODEL<T>::onParamGridSetFocus( wxFocusEvent& aEvent )
{

1
eeschema/dialogs/dialog_sim_model.h
View File

@ -128,7 +128,6 @@ private:
void onPinAssignmentsGridCellChange( wxGridEvent& aEvent ) override;
void onPinAssignmentsGridSize( wxSizeEvent& aEvent ) override;
void onExcludeCheckbox( wxCommandEvent& aEvent ) override;
void onInferCheckbox( wxCommandEvent& aEvent ) override;
void onDifferentialCheckbox( wxCommandEvent& event ) override;
void onParamGridSetFocus( wxFocusEvent& aEvent );

31
eeschema/dialogs/dialog_sim_model_base.cpp
View File

@ -115,9 +115,6 @@ DIALOG_SIM_MODEL_BASE::DIALOG_SIM_MODEL_BASE( wxWindow* parent, wxWindowID id, c
bSizerMargins->Add( fgSizer16, 0, wxEXPAND|wxLEFT, 24 );
bSizerMargins->Add( 0, 10, 0, 0, 5 );
m_notebook4 = new wxNotebook( m_modelPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_parametersPanel = new wxPanel( m_notebook4, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_parametersPanel->SetMinSize( wxSize( 500,-1 ) );
@ -239,21 +236,18 @@ DIALOG_SIM_MODEL_BASE::DIALOG_SIM_MODEL_BASE( wxWindow* parent, wxWindowID id, c
bSizer8->Add( m_notebook, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
wxGridSizer* gSizer1;
gSizer1 = new wxGridSizer( 0, 2, 0, 0 );
m_excludeCheckbox = new wxCheckBox( this, wxID_ANY, _("Exclude from simulation"), wxDefaultPosition, wxDefaultSize, 0 );
gSizer1->Add( m_excludeCheckbox, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_inferCheckbox = new wxCheckBox( this, wxID_ANY, _("Store in Reference and Value"), wxDefaultPosition, wxDefaultSize, 0 );
gSizer1->Add( m_inferCheckbox, 0, wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bSizer8->Add( gSizer1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bSizer8->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
wxBoxSizer* bSizer81;
bSizer81 = new wxBoxSizer( wxHORIZONTAL );
m_excludeCheckbox = new wxCheckBox( this, wxID_ANY, _("Exclude from simulation"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer81->Add( m_excludeCheckbox, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
bSizer81->Add( 0, 0, 1, wxEXPAND, 5 );
m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK );
m_sdbSizer1->AddButton( m_sdbSizer1OK );
@ -261,7 +255,10 @@ DIALOG_SIM_MODEL_BASE::DIALOG_SIM_MODEL_BASE( wxWindow* parent, wxWindowID id, c
m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
m_sdbSizer1->Realize();
bSizer8->Add( m_sdbSizer1, 0, wxEXPAND|wxALL, 5 );
bSizer81->Add( m_sdbSizer1, 0, wxEXPAND|wxALL, 5 );
bSizer8->Add( bSizer81, 0, wxEXPAND, 5 );
this->SetSizer( bSizer8 );
@ -304,7 +301,6 @@ DIALOG_SIM_MODEL_BASE::DIALOG_SIM_MODEL_BASE( wxWindow* parent, wxWindowID id, c
m_pinAssignmentsGrid->Connect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_SIM_MODEL_BASE::onPinAssignmentsGridCellChange ), NULL, this );
m_pinAssignmentsGrid->Connect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_SIM_MODEL_BASE::onPinAssignmentsGridSize ), NULL, this );
m_excludeCheckbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SIM_MODEL_BASE::onExcludeCheckbox ), NULL, this );
m_inferCheckbox->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SIM_MODEL_BASE::onInferCheckbox ), NULL, this );
}
DIALOG_SIM_MODEL_BASE::~DIALOG_SIM_MODEL_BASE()
@ -343,6 +339,5 @@ DIALOG_SIM_MODEL_BASE::~DIALOG_SIM_MODEL_BASE()
m_pinAssignmentsGrid->Disconnect( wxEVT_GRID_CELL_CHANGED, wxGridEventHandler( DIALOG_SIM_MODEL_BASE::onPinAssignmentsGridCellChange ), NULL, this );
m_pinAssignmentsGrid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( DIALOG_SIM_MODEL_BASE::onPinAssignmentsGridSize ), NULL, this );
m_excludeCheckbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SIM_MODEL_BASE::onExcludeCheckbox ), NULL, this );
m_inferCheckbox->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_SIM_MODEL_BASE::onInferCheckbox ), NULL, this );
}

242
eeschema/dialogs/dialog_sim_model_base.fbp
View File

@ -1329,16 +1329,6 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="spacer" expanded="1">
<property name="height">10</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">10</property>
<property name="flag">wxEXPAND|wxTOP</property>
@ -1830,20 +1820,75 @@
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">10</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="border">5</property>
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">0</property>
<object class="wxGridSizer" expanded="1">
<property name="cols">2</property>
<property name="hgap">0</property>
<object class="wxStaticLine" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="name">gSizer1</property>
<property name="moveable">1</property>
<property name="name">m_staticline1</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxLI_HORIZONTAL</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bSizer81</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<property name="rows">0</property>
<property name="vgap">0</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
@ -1908,145 +1953,32 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_RIGHT|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Store in Reference and Value</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_inferCheckbox</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStdDialogButtonSizer" expanded="1">
<property name="Apply">0</property>
<property name="Cancel">1</property>
<property name="ContextHelp">0</property>
<property name="Help">0</property>
<property name="No">0</property>
<property name="OK">1</property>
<property name="Save">0</property>
<property name="Yes">0</property>
<property name="minimum_size"></property>
<property name="name">m_sdbSizer1</property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnCheckBox">onInferCheckbox</event>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticLine" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticline1</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxLI_HORIZONTAL</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStdDialogButtonSizer" expanded="1">
<property name="Apply">0</property>
<property name="Cancel">1</property>
<property name="ContextHelp">0</property>
<property name="Help">0</property>
<property name="No">0</property>
<property name="OK">1</property>
<property name="Save">0</property>
<property name="Yes">0</property>
<property name="minimum_size"></property>
<property name="name">m_sdbSizer1</property>
<property name="permission">protected</property>
</object>
</object>
</object>

4
eeschema/dialogs/dialog_sim_model_base.h
View File

@ -78,9 +78,8 @@ class DIALOG_SIM_MODEL_BASE : public DIALOG_SHIM
wxStyledTextCtrl* m_codePreview;
wxPanel* m_pinAssignmentsPanel;
WX_GRID* m_pinAssignmentsGrid;
wxCheckBox* m_excludeCheckbox;
wxCheckBox* m_inferCheckbox;
wxStaticLine* m_staticline1;
wxCheckBox* m_excludeCheckbox;
wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK;
wxButton* m_sdbSizer1Cancel;
@ -114,7 +113,6 @@ class DIALOG_SIM_MODEL_BASE : public DIALOG_SHIM
virtual void onPinAssignmentsGridCellChange( wxGridEvent& event ) { event.Skip(); }
virtual void onPinAssignmentsGridSize( wxSizeEvent& event ) { event.Skip(); }
virtual void onExcludeCheckbox( wxCommandEvent& event ) { event.Skip(); }
virtual void onInferCheckbox( wxCommandEvent& event ) { event.Skip(); }
public:

170
eeschema/sch_sheet_path.cpp
View File

@ -1260,116 +1260,86 @@ void SCH_SHEET_LIST::MigrateSimModelNameFields()
// V6 schematics may specify model names in Value fields, which we don't do in V7.
// Migrate by adding an equivalent model for these symbols.
bool mayHaveModelsInValues = false;
for( SCH_ITEM* item : screen->Items().OfType( SCH_TEXT_T ) )
for( SCH_ITEM* item : screen->Items().OfType( SCH_SYMBOL_T ) )
{
wxString text = static_cast<SCH_TEXT*>( item )->GetShownText();
SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( item );
if( text.StartsWith( ".inc" ) || text.StartsWith( ".lib" )
|| text.StartsWith( ".model" ) || text.StartsWith( ".subckt" ) )
if( !symbol )
{
mayHaveModelsInValues = true;
// Shouldn't happen.
wxFAIL;
continue;
}
}
for( SCH_ITEM* item : screen->Items().OfType( SCH_TEXTBOX_T ) )
{
wxString text = static_cast<SCH_TEXTBOX*>( item )->GetShownText();
if( text.StartsWith( ".inc" ) || text.StartsWith( ".lib" )
|| text.StartsWith( ".model" ) || text.StartsWith( ".subckt" ) )
if( symbol->FindField( "Spice_Primitive" )
|| symbol->FindField( "Spice_Node_Sequence" )
|| symbol->FindField( "Spice_Model" )
|| symbol->FindField( "Spice_Netlist_Enabled" )
|| symbol->FindField( "Spice_Lib_File" ) )
{
mayHaveModelsInValues = true;
// Has a legacy raw (plaintext) model -- this is handled in the SIM_MODEL class.
continue;
}
}
if( mayHaveModelsInValues )
{
for( SCH_ITEM* item : screen->Items().OfType( SCH_SYMBOL_T ) )
if( symbol->FindField( SIM_MODEL::DEVICE_TYPE_FIELD )
|| symbol->FindField( SIM_MODEL::TYPE_FIELD )
|| symbol->FindField( SIM_MODEL::PINS_FIELD )
|| symbol->FindField( SIM_MODEL::PARAMS_FIELD ) )
{
SCH_SYMBOL* symbol = static_cast<SCH_SYMBOL*>( item );
if( !symbol )
{
// Shouldn't happen.
wxFAIL;
continue;
}
if( symbol->FindField( "Spice_Primitive" )
|| symbol->FindField( "Spice_Node_Sequence" )
|| symbol->FindField( "Spice_Model" )
|| symbol->FindField( "Spice_Netlist_Enabled" )
|| symbol->FindField( "Spice_Lib_File" ) )
{
// Has a legacy raw (plaintext) model -- this is handled in the SIM_MODEL class.
continue;
}
if( symbol->FindField( SIM_MODEL::DEVICE_TYPE_FIELD )
|| symbol->FindField( SIM_MODEL::TYPE_FIELD )
|| symbol->FindField( SIM_MODEL::PINS_FIELD )
|| symbol->FindField( SIM_MODEL::PARAMS_FIELD ) )
{
// Has a V7 model field - skip.
continue;
}
// Insert a plaintext model as a substitute.
wxString refdes = symbol->GetRef( &at( sheetIndex ), true );
if( refdes.Length() == 0 )
continue; // No refdes? We need the first character to determine type. Skip.
wxString value = symbol->GetValue( &at( sheetIndex ), true );
if( refdes.StartsWith( "R" )
|| refdes.StartsWith( "C" )
|| refdes.StartsWith( "L" ) )
{
// This is taken from the former Spice exporter.
wxRegEx passiveVal(
wxT( "^([0-9\\. ]+)([fFpPnNuUmMkKgGtTμµ𝛍𝜇𝝁 ]|M(e|E)(g|G))?([fFhHΩΩ𝛀𝛺𝝮]|ohm)?([-1-9 ]*)$" ) );
if( passiveVal.Matches( value ) )
{
wxString prefix( passiveVal.GetMatch( value, 1 ) );
wxString unit( passiveVal.GetMatch( value, 2 ) );
wxString suffix( passiveVal.GetMatch( value, 6 ) );
prefix.Trim(); prefix.Trim( false );
unit.Trim(); unit.Trim( false );
suffix.Trim(); suffix.Trim( false );
// Make 'mega' units comply with the Spice expectations
if( unit == "M" )
unit = "Meg";
std::unique_ptr<SIM_VALUE> simValue =
SIM_VALUE::Create( SIM_VALUE::TYPE_FLOAT );
simValue->FromString( ( prefix + unit + suffix ).ToStdString(),
SIM_VALUE::NOTATION::SPICE );
if( value == simValue->ToString() )
continue; // Can stay the same.
}
}
SCH_FIELD deviceTypeField( VECTOR2I( 0, 0 ), symbol->GetFieldCount(), symbol,
SIM_MODEL::DEVICE_TYPE_FIELD );
deviceTypeField.SetText(
SIM_MODEL::DeviceTypeInfo( SIM_MODEL::DEVICE_TYPE_::SPICE ).fieldValue );
symbol->AddField( deviceTypeField );
SCH_FIELD modelParamsField( VECTOR2I( 0, 0 ), symbol->GetFieldCount(), symbol,
SIM_MODEL::PARAMS_FIELD );
modelParamsField.SetText( wxString::Format( "type=%s model=\"%s\"",
refdes.Left( 1 ),
value ) );
symbol->AddField( modelParamsField );
// Has a V7 model field - skip.
continue;
}
// Insert a plaintext model as a substitute.
wxString refdes = symbol->GetRef( &at( sheetIndex ), true );
if( refdes.Length() == 0 )
continue; // No refdes? We need the first character to determine type. Skip.
wxString value = symbol->GetValue( &at( sheetIndex ), true );
if( refdes.StartsWith( "R" )
|| refdes.StartsWith( "C" )
|| refdes.StartsWith( "L" ) )
{
// This is taken from the former Spice exporter.
wxRegEx passiveVal(
wxT( "^([0-9\\. ]+)([fFpPnNuUmMkKgGtTμµ𝛍𝜇𝝁 ]|M(e|E)(g|G))?([fFhHΩΩ𝛀𝛺𝝮]|ohm)?([-1-9 ]*)$" ) );
if( passiveVal.Matches( value ) )
{
wxString prefix( passiveVal.GetMatch( value, 1 ) );
wxString unit( passiveVal.GetMatch( value, 2 ) );
wxString suffix( passiveVal.GetMatch( value, 6 ) );
prefix.Trim(); prefix.Trim( false );
unit.Trim(); unit.Trim( false );
suffix.Trim(); suffix.Trim( false );
// Make 'mega' units comply with the Spice expectations
if( unit == "M" )
unit = "Meg";
std::unique_ptr<SIM_VALUE> simValue =
SIM_VALUE::Create( SIM_VALUE::TYPE_FLOAT );
simValue->FromString( std::string( ( prefix + unit + suffix ).ToUTF8() ),
SIM_VALUE::NOTATION::SPICE );
}
}
SCH_FIELD deviceTypeField( VECTOR2I( 0, 0 ), symbol->GetFieldCount(), symbol,
SIM_MODEL::DEVICE_TYPE_FIELD );
deviceTypeField.SetText(
SIM_MODEL::DeviceTypeInfo( SIM_MODEL::DEVICE_TYPE_::SPICE ).fieldValue );
symbol->AddField( deviceTypeField );
SCH_FIELD modelParamsField( VECTOR2I( 0, 0 ), symbol->GetFieldCount(), symbol,
SIM_MODEL::PARAMS_FIELD );
modelParamsField.SetText( wxString::Format( "type=%s model=\"%s\"",
refdes.Left( 1 ),
value ) );
symbol->AddField( modelParamsField );
}
}
}

111
eeschema/sim/sim_model.cpp
View File

@ -402,31 +402,7 @@ TYPE SIM_MODEL::ReadTypeFromFields( const std::vector<T>& aFields, int aSymbolPi
if( typeFromLegacyFields != TYPE::NONE )
return typeFromLegacyFields;
// Still no type information.
// We try to infer the model from the mandatory fields in this case.
return SIM_SERDE::InferTypeFromRefAndValue( GetFieldValue( &aFields, REFERENCE_FIELD ),
GetFieldValue( &aFields, VALUE_FIELD ),
aSymbolPinCount );
}
DEVICE_TYPE SIM_MODEL::InferDeviceTypeFromRef( const std::string& aRef )
{
if( boost::starts_with( aRef, "R" ) )
return DEVICE_TYPE::R;
else if( boost::starts_with( aRef, "C" ) )
return DEVICE_TYPE::C;
else if( boost::starts_with( aRef, "L" ) )
return DEVICE_TYPE::L;
else if( boost::starts_with( aRef, "V" ) )
return DEVICE_TYPE::V;
else if( boost::starts_with( aRef, "I" ) )
return DEVICE_TYPE::I;
else if( boost::starts_with( aRef, "TL" ) )
return DEVICE_TYPE::TLINE;
return DEVICE_TYPE::NONE;
return TYPE::NONE;
}
@ -480,6 +456,13 @@ void SIM_MODEL::ReadDataLibFields( unsigned aSymbolPinCount, const std::vector<L
}
template <typename T>
void SIM_MODEL::WriteFields( std::vector<T>& aFields ) const
{
doWriteFields( aFields );
}
template <>
void SIM_MODEL::WriteFields( std::vector<SCH_FIELD>& aFields ) const
{
@ -929,8 +912,7 @@ SIM_MODEL::SIM_MODEL( TYPE aType,
m_serde( std::move( aSerde ) ),
m_spiceGenerator( std::move( aSpiceGenerator ) ),
m_type( aType ),
m_isEnabled( true ),
m_isInferred( false )
m_isEnabled( true )
{
}
@ -954,42 +936,6 @@ void SIM_MODEL::CreatePins( unsigned aSymbolPinCount )
}
template void SIM_MODEL::WriteInferredDataFields( std::vector<SCH_FIELD>& aFields,
const std::string& aValue ) const;
template void SIM_MODEL::WriteInferredDataFields( std::vector<LIB_FIELD>& aFields,
const std::string& aValue ) const;
template <typename T>
void SIM_MODEL::WriteInferredDataFields( std::vector<T>& aFields, const std::string& aValue ) const
{
bool removePinsField = true;
// Only write Sim_Pins field if the pins are not in the canonical order.
for( int i = 0; i < GetPinCount(); ++i )
{
if( GetPin( i ).symbolPinNumber != fmt::format( "{}", i + 1 ) )
{
removePinsField = false;
break;
}
}
if( removePinsField )
SetFieldValue( aFields, PINS_FIELD, "" );
std::string value = aValue;
if( value == "" )
value = m_serde->GenerateValue();
SetFieldValue( aFields, VALUE_FIELD, value );
SetFieldValue( aFields, DEVICE_TYPE_FIELD, "" );
SetFieldValue( aFields, TYPE_FIELD, "" );
SetFieldValue( aFields, PARAMS_FIELD, "" );
SetFieldValue( aFields, ENABLE_FIELD, "" );
}
template <typename T>
void SIM_MODEL::doReadDataFields( unsigned aSymbolPinCount, const std::vector<T>* aFields )
{
@ -998,32 +944,12 @@ void SIM_MODEL::doReadDataFields( unsigned aSymbolPinCount, const std::vector<T>
CreatePins( aSymbolPinCount );
m_serde->ParsePins( GetFieldValue( aFields, PINS_FIELD ) );
if( GetFieldValue( aFields, PARAMS_FIELD ) != "" )
m_serde->ParseParams( GetFieldValue( aFields, PARAMS_FIELD ) );
std::string paramsField = GetFieldValue( aFields, PARAMS_FIELD );
if( paramsField == "" && HasPrimaryValue() )
m_serde->ParseValue( GetFieldValue( aFields, VALUE_FIELD ) );
else
InferredReadDataFields( aSymbolPinCount, aFields );
}
template <typename T>
void SIM_MODEL::InferredReadDataFields( unsigned aSymbolPinCount, const std::vector<T>* aFields )
{
// TODO: Make a subclass SIM_MODEL_NONE.
if( GetType() == SIM_MODEL::TYPE::NONE )
return;
// TODO: Don't call this multiple times.
if( SIM_SERDE::InferTypeFromRefAndValue( GetFieldValue( aFields, REFERENCE_FIELD ),
GetFieldValue( aFields, VALUE_FIELD ),
aSymbolPinCount ) != GetType() )
{
// Not an inferred model. Nothing to do here.
return;
}
m_serde->ParseValue( GetFieldValue( aFields, VALUE_FIELD ) );
SetIsInferred( true );
m_serde->ParseParams( paramsField );
}
@ -1032,9 +958,14 @@ void SIM_MODEL::doWriteFields( std::vector<T>& aFields ) const
{
SetFieldValue( aFields, DEVICE_TYPE_FIELD, m_serde->GenerateDevice() );
SetFieldValue( aFields, TYPE_FIELD, m_serde->GenerateType() );
SetFieldValue( aFields, PINS_FIELD, m_serde->GeneratePins() );
SetFieldValue( aFields, PARAMS_FIELD, m_serde->GenerateParams() );
SetFieldValue( aFields, ENABLE_FIELD, m_serde->GenerateEnable() );
SetFieldValue( aFields, PINS_FIELD, m_serde->GeneratePins() );
if( IsStoredInValue() )
SetFieldValue( aFields, VALUE_FIELD, m_serde->GenerateValue() );
else
SetFieldValue( aFields, PARAMS_FIELD, m_serde->GenerateParams() );
}

25
eeschema/sim/sim_model.h
View File

@ -388,12 +388,9 @@ public:
template <typename T>
static TYPE ReadTypeFromFields( const std::vector<T>& aFields, int aSymbolPinCount );
static DEVICE_TYPE_ InferDeviceTypeFromRef( const std::string& aRef );
template <typename T>
static TYPE InferTypeFromLegacyFields( const std::vector<T>& aFields );
static std::unique_ptr<SIM_MODEL> Create( TYPE aType, unsigned aSymbolPinCount );
static std::unique_ptr<SIM_MODEL> Create( const SIM_MODEL& aBaseModel,
unsigned aSymbolPinCount );
@ -427,15 +424,14 @@ public:
template <typename T>
void ReadDataFields( unsigned aSymbolPinCount, const std::vector<T>* aFields );
// C++ doesn't allow virtual template methods, so we do this:
virtual void ReadDataSchFields( unsigned aSymbolPinCount, const std::vector<SCH_FIELD>* aFields );
virtual void ReadDataLibFields( unsigned aSymbolPinCount, const std::vector<LIB_FIELD>* aFields );
virtual void ReadDataSchFields( unsigned aSymbolPinCount,
const std::vector<SCH_FIELD>* aFields );
virtual void ReadDataLibFields( unsigned aSymbolPinCount,
const std::vector<LIB_FIELD>* aFields );
template <typename T>
void WriteFields( std::vector<T>& aFields ) const;
// C++ doesn't allow virtual template methods, so we do this:
virtual void WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const;
virtual void WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const;
@ -513,8 +509,8 @@ public:
void SetIsEnabled( bool aIsEnabled ) { m_isEnabled = aIsEnabled; }
bool IsEnabled() const { return m_isEnabled; }
void SetIsInferred( bool aIsInferred ) { m_isInferred = aIsInferred; }
bool IsInferred() const { return m_isInferred; }
void SetIsStoredInValue( bool aIsStoredInValue ) { m_isStoredInValue = aIsStoredInValue; }
bool IsStoredInValue() const { return m_isStoredInValue; }
protected:
static std::unique_ptr<SIM_MODEL> Create( TYPE aType );
@ -528,12 +524,6 @@ protected:
virtual void CreatePins( unsigned aSymbolPinCount );
template <typename T>
void WriteInferredDataFields( std::vector<T>& aFields, const std::string& aValue = "" ) const;
template <typename T>
void InferredReadDataFields( unsigned aSymbolPinCount, const std::vector<T>* aFields );
std::vector<PARAM> m_params;
const SIM_MODEL* m_baseModel;
std::unique_ptr<SIM_SERDE> m_serde;
@ -544,7 +534,6 @@ private:
const std::string& aVersion = "",
bool aSkipDefaultLevel = true );
template <typename T>
void doReadDataFields( unsigned aSymbolPinCount, const std::vector<T>* aFields );
@ -561,7 +550,7 @@ private:
const TYPE m_type;
std::vector<PIN> m_pins;
bool m_isEnabled;
bool m_isInferred;
bool m_isStoredInValue;
};
#endif // SIM_MODEL_H

68
eeschema/sim/sim_model_behavioral.cpp
View File

@ -92,44 +92,6 @@ SIM_MODEL_BEHAVIORAL::SIM_MODEL_BEHAVIORAL( TYPE aType ) :
}
void SIM_MODEL_BEHAVIORAL::ReadDataSchFields( unsigned aSymbolPinCount,
const std::vector<SCH_FIELD>* aFields )
{
if( GetFieldValue( aFields, PARAMS_FIELD ) != "" )
SIM_MODEL::ReadDataSchFields( aSymbolPinCount, aFields );
else
inferredReadDataFields( aSymbolPinCount, aFields );
}
void SIM_MODEL_BEHAVIORAL::ReadDataLibFields( unsigned aSymbolPinCount,
const std::vector<LIB_FIELD>* aFields )
{
if( GetFieldValue( aFields, PARAMS_FIELD ) != "" )
SIM_MODEL::ReadDataLibFields( aSymbolPinCount, aFields );
else
inferredReadDataFields( aSymbolPinCount, aFields );
}
void SIM_MODEL_BEHAVIORAL::WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const
{
SIM_MODEL::WriteDataSchFields( aFields );
if( IsInferred() )
inferredWriteDataFields( aFields );
}
void SIM_MODEL_BEHAVIORAL::WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const
{
SIM_MODEL::WriteDataLibFields( aFields );
if( IsInferred() )
inferredWriteDataFields( aFields );
}
bool SIM_MODEL_BEHAVIORAL::parseValueField( const std::string& aValueField )
{
std::string expr = aValueField;
@ -144,36 +106,6 @@ bool SIM_MODEL_BEHAVIORAL::parseValueField( const std::string& aValueField )
}
template <typename T>
void SIM_MODEL_BEHAVIORAL::inferredReadDataFields( unsigned aSymbolPinCount,
const std::vector<T>* aFields )
{
m_serde->ParsePins( GetFieldValue( aFields, PINS_FIELD ) );
if( ( m_serde->InferTypeFromRefAndValue( GetFieldValue( aFields, REFERENCE_FIELD ),
GetFieldValue( aFields, VALUE_FIELD ),
aSymbolPinCount ) == GetType()
&& parseValueField( GetFieldValue( aFields, VALUE_FIELD ) ) )
// If Value is device type, this is an empty model
|| GetFieldValue( aFields, VALUE_FIELD ) == DeviceTypeInfo( GetDeviceType() ).fieldValue )
{
SetIsInferred( true );
}
}
template <typename T>
void SIM_MODEL_BEHAVIORAL::inferredWriteDataFields( std::vector<T>& aFields ) const
{
std::string value = GetParam( 0 ).value->ToString();
if( value == "" )
value = GetDeviceTypeInfo().fieldValue;
WriteInferredDataFields( aFields, "=" + value );
}
SIM_MODEL::PARAM::INFO SIM_MODEL_BEHAVIORAL::makeParams( std::string aName, std::string aDescription,
std::string aUnit )
{

17
eeschema/sim/sim_model_behavioral.h
View File

@ -39,29 +39,14 @@ public:
};
// Not used for now.
class SIM_MODEL_BEHAVIORAL : public SIM_MODEL
{
public:
SIM_MODEL_BEHAVIORAL( TYPE aType );
void ReadDataSchFields( unsigned aSymbolPinCount,
const std::vector<SCH_FIELD>* aFields ) override;
void ReadDataLibFields( unsigned aSymbolPinCount,
const std::vector<LIB_FIELD>* aFields ) override;
void WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const override;
void WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const override;
private:
bool parseValueField( const std::string& aValueField );
template <typename T>
void inferredReadDataFields( unsigned aSymbolPinCount, const std::vector<T>* aFields );
template <typename T>
void inferredWriteDataFields( std::vector<T>& aFields ) const;
std::vector<std::string> getPinNames() const override { return { "+", "-" }; }
static PARAM::INFO makeParams( std::string aName, std::string aDescription, std::string aUnit );

18
eeschema/sim/sim_model_ideal.cpp
View File

@ -73,24 +73,6 @@ SIM_MODEL_IDEAL::SIM_MODEL_IDEAL( TYPE aType ) :
}
void SIM_MODEL_IDEAL::WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const
{
SIM_MODEL::WriteDataSchFields( aFields );
if( IsInferred() )
WriteInferredDataFields( aFields );
}
void SIM_MODEL_IDEAL::WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const
{
SIM_MODEL::WriteDataLibFields( aFields );
if( IsInferred() )
WriteInferredDataFields( aFields );
}
SIM_MODEL::PARAM::INFO SIM_MODEL_IDEAL::makeParamInfo( std::string aName, std::string aDescription,
std::string aUnit )
{

6
eeschema/sim/sim_model_ideal.h
View File

@ -46,16 +46,10 @@ class SIM_MODEL_IDEAL : public SIM_MODEL
public:
SIM_MODEL_IDEAL( TYPE aType );
void WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const override;
void WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const override;
const PARAM* GetTunerParam() const override { return &GetParam( 0 ); }
bool HasPrimaryValue() const override { return true; }
private:
template <typename T>
void inferredWriteDataFields( std::vector<T>& aFields ) const;
std::vector<std::string> getPinNames() const override { return { "+", "-" }; }
static PARAM::INFO makeParamInfo( std::string aName, std::string aDescription, std::string aUnit );

18
eeschema/sim/sim_model_r_pot.cpp
View File

@ -73,24 +73,6 @@ SIM_MODEL_R_POT::SIM_MODEL_R_POT() :
}
void SIM_MODEL_R_POT::WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const
{
SIM_MODEL::WriteDataSchFields( aFields );
if( IsInferred() )
WriteInferredDataFields( aFields );
}
void SIM_MODEL_R_POT::WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const
{
SIM_MODEL::WriteDataLibFields( aFields );
if( IsInferred() )
WriteInferredDataFields( aFields );
}
const std::vector<SIM_MODEL::PARAM::INFO> SIM_MODEL_R_POT::makeParamInfos()
{
std::vector<PARAM::INFO> paramInfos;

6
eeschema/sim/sim_model_r_pot.h
View File

@ -45,16 +45,10 @@ class SIM_MODEL_R_POT : public SIM_MODEL
public:
SIM_MODEL_R_POT();
void WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const override;
void WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const override;
const PARAM* GetTunerParam() const override { return FindParam( "pos" ); }
bool HasPrimaryValue() const override { return true; }
private:
template <typename T>
void inferredWriteDataFields( std::vector<T>& aFields ) const;
std::vector<std::string> getPinNames() const override { return { "+", "wiper", "-" }; }
static const std::vector<PARAM::INFO> makeParamInfos();

39
eeschema/sim/sim_model_source.cpp
View File

@ -217,24 +217,6 @@ SIM_MODEL_SOURCE::SIM_MODEL_SOURCE( TYPE aType )
}
void SIM_MODEL_SOURCE::WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const
{
SIM_MODEL::WriteDataSchFields( aFields );
if( IsInferred() )
inferredWriteDataFields( aFields );
}
void SIM_MODEL_SOURCE::WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const
{
SIM_MODEL::WriteDataLibFields( aFields );
if( IsInferred() )
inferredWriteDataFields( aFields );
}
void SIM_MODEL_SOURCE::SetParamValue( int aParamIndex, const SIM_VALUE& aValue )
{
// Sources are special. All preceding parameter values must be filled. If they are not, fill
@ -264,27 +246,6 @@ void SIM_MODEL_SOURCE::SetParamValue( int aParamIndex, const SIM_VALUE& aValue )
}
template <typename T>
void SIM_MODEL_SOURCE::inferredWriteDataFields( std::vector<T>& aFields ) const
{
std::string value;
if( GetTypeInfo().fieldValue != "" )
{
value = fmt::format( "{} {}",
GetTypeInfo().fieldValue,
GetFieldValue( &aFields, PARAMS_FIELD ) );
}
else
value = fmt::format( "{}", GetFieldValue( &aFields, PARAMS_FIELD ) );
if( value == "" )
value = GetDeviceTypeInfo().fieldValue;
WriteInferredDataFields( aFields, value );
}
const std::vector<SIM_MODEL::PARAM::INFO>& SIM_MODEL_SOURCE::makeParamInfos( TYPE aType )
{
static std::vector<PARAM::INFO> vdc = makeDcParamInfos( "y", "V" );

9
eeschema/sim/sim_model_source.h
View File

@ -74,19 +74,12 @@ class SIM_MODEL_SOURCE : public SIM_MODEL
public:
SIM_MODEL_SOURCE( TYPE aType );
void WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const override;
void WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const override;
void SetParamValue( int aParamIndex, const SIM_VALUE& aValue ) override;
bool HasAutofill() const override { return true; }
bool HasPrimaryValue() const override { return true; }
bool HasPrimaryValue() const override { return GetType() == TYPE::V || GetType() == TYPE::I; }
private:
template <typename T>
void inferredWriteDataFields( std::vector<T>& aFields ) const;
std::vector<std::string> getPinNames() const override { return { "+", "-" }; }
static const std::vector<PARAM::INFO>& makeParamInfos( TYPE aType );

30
eeschema/sim/sim_model_tline.cpp
View File

@ -94,36 +94,6 @@ SIM_MODEL_TLINE::SIM_MODEL_TLINE( TYPE aType ) :
}
void SIM_MODEL_TLINE::WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const
{
SIM_MODEL::WriteDataSchFields( aFields );
if( IsInferred() )
inferredWriteDataFields( aFields );
}
void SIM_MODEL_TLINE::WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const
{
SIM_MODEL::WriteDataLibFields( aFields );
if( IsInferred() )
inferredWriteDataFields( aFields );
}
template <typename T>
void SIM_MODEL_TLINE::inferredWriteDataFields( std::vector<T>& aFields ) const
{
std::string value = GetFieldValue( &aFields, PARAMS_FIELD );
if( value == "" )
value = GetDeviceTypeInfo().fieldValue;
WriteInferredDataFields( aFields, value );
}
std::vector<PARAM::INFO> SIM_MODEL_TLINE::makeZ0ParamInfos()
{
std::vector<PARAM::INFO> paramInfos;

6
eeschema/sim/sim_model_tline.h
View File

@ -43,13 +43,7 @@ class SIM_MODEL_TLINE : public SIM_MODEL
public:
SIM_MODEL_TLINE( TYPE aType );
void WriteDataSchFields( std::vector<SCH_FIELD>& aFields ) const override;
void WriteDataLibFields( std::vector<LIB_FIELD>& aFields ) const override;
private:
template <typename T>
void inferredWriteDataFields( std::vector<T>& aFields ) const;
std::vector<std::string> getPinNames() const override { return { "1+", "1-", "2+", "2-" }; }
static std::vector<PARAM::INFO> makeZ0ParamInfos();

63
eeschema/sim/sim_serde.cpp
View File

@ -183,24 +183,14 @@ void SIM_SERDE::ParseValue( const std::string& aValue )
{
if( node->is_type<SIM_SERDE_PARSER::fieldInferValuePrimaryValue>() )
{
if( m_model.HasPrimaryValue() )
for( const auto& subnode : node->children )
{
for( const auto& subnode : node->children )
if( subnode->is_type<SIM_SERDE_PARSER::number<SIM_VALUE::TYPE_FLOAT,
SIM_VALUE::NOTATION::SI>>() )
{
if( subnode->is_type<SIM_SERDE_PARSER::number<SIM_VALUE::TYPE_FLOAT,
SIM_VALUE::NOTATION::SI>>() )
{
m_model.SetParamValue( 0, subnode->string() );
}
m_model.SetParamValue( 0, subnode->string() );
}
}
else
{
THROW_IO_ERROR(
wxString::Format( _( "Simulation model of type '%s' cannot have a primary value (which is '%s') in Value field" ),
m_model.GetTypeInfo().fieldValue,
node->string() ) );
}
}
else if( node->is_type<SIM_SERDE_PARSER::fieldParamValuePairs>() )
ParseParams( node->string() );
@ -210,6 +200,8 @@ void SIM_SERDE::ParseValue( const std::string& aValue )
{
THROW_IO_ERROR( e.what() );
}
m_model.SetIsStoredInValue( true );
}
@ -317,49 +309,6 @@ void SIM_SERDE::ParseEnable( const std::string& aEnable )
}
SIM_MODEL::TYPE SIM_SERDE::InferTypeFromRefAndValue( const std::string& aRef,
const std::string& aValue,
int aSymbolPinCount )
{
std::string typeString;
try
{
tao::pegtl::string_input<> in( aValue, VALUE_FIELD );
auto root = tao::pegtl::parse_tree::parse<SIM_SERDE_PARSER::fieldInferValueGrammar,
SIM_SERDE_PARSER::fieldInferValueSelector,
tao::pegtl::nothing,
SIM_SERDE_PARSER::control>( in );
for( const auto& node : root->children )
{
if( node->is_type<SIM_SERDE_PARSER::fieldInferValueType>() )
typeString = node->string();
}
}
catch( const tao::pegtl::parse_error& )
{
}
SIM_MODEL::DEVICE_TYPE_ deviceType = SIM_MODEL::InferDeviceTypeFromRef( aRef );
// Exception. Potentiometer model is determined from pin count.
if( deviceType == SIM_MODEL::DEVICE_TYPE_::R && aSymbolPinCount == 3 )
return SIM_MODEL::TYPE::R_POT;
for( SIM_MODEL::TYPE type : SIM_MODEL::TYPE_ITERATOR() )
{
if( SIM_MODEL::TypeInfo( type ).deviceType == deviceType
&& SIM_MODEL::TypeInfo( type ).fieldValue == typeString )
{
return type;
}
}
return SIM_MODEL::TYPE::NONE;
}
std::string SIM_SERDE::GenerateParamValuePair( const SIM_MODEL::PARAM& aParam ) const
{
std::string name = aParam.info.name;

1
qa/data/eeschema/spice_netlists/cmos_not/cmos_not.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

20
qa/data/eeschema/spice_netlists/cmos_not/cmos_not.kicad_sch
View File

@ -155,11 +155,11 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "VSIN_0_0"
(arc (start 0 0) (mid -0.635 0.635) (end -1.27 0)
(arc (start 0 0) (mid -0.635 0.6323) (end -1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 0) (mid 0.635 -0.635) (end 1.27 0)
(arc (start 0 0) (mid 0.635 -0.6323) (end 1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
@ -601,7 +601,7 @@
(property "Reference" "VIN1" (at 118.11 107.95 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "SIN dc=2.5 ampl=2.5 f=1k" (at 118.11 110.49 0)
(property "Value" "${Sim_Device} ${Sim_Type}" (at 118.11 110.49 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 114.3 107.95 0)
@ -610,12 +610,21 @@
(property "Datasheet" "~" (at 114.3 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 114.3 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "SIN" (at 114.3 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "dc=2.5 ampl=2.5 f=1k" (at 129.54 113.03 0)
(effects (font (size 1.27 1.27)))
)
(pin "1" (uuid caf5bcc4-a42f-4b60-b1a8-22e72909f97a))
(pin "2" (uuid c527511d-c2c7-4e42-b131-b52b3277b5f0))
(instances
(project "cmos_not"
(path "/569fb493-5024-4abd-9aba-73198e12c7f2"
(reference "VIN1") (unit 1) (value "SIN dc=2.5 ampl=2.5 f=1k") (footprint "")
(reference "VIN1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
)
)
)
@ -661,6 +670,9 @@
(property "Datasheet" "~" (at 165.1 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 165.1 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 2f230156-e43a-4ffc-bfcb-5ad7a95b7eed))
(pin "2" (uuid 94ba9eaf-e7c2-4392-86f1-973077f847d3))
(instances

1
qa/data/eeschema/spice_netlists/directives/directives.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

37
qa/data/eeschema/spice_netlists/directives/directives.kicad_sch
View File

@ -28,19 +28,19 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "L_0_1"
(arc (start 0 -2.54) (mid 0.635 -1.905) (end 0 -1.27)
(arc (start 0 -2.54) (mid 0.6323 -1.905) (end 0 -1.27)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 -1.27) (mid 0.635 -0.635) (end 0 0)
(arc (start 0 -1.27) (mid 0.6323 -0.635) (end 0 0)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 0) (mid 0.635 0.635) (end 0 1.27)
(arc (start 0 0) (mid 0.6323 0.635) (end 0 1.27)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 1.27) (mid 0.635 1.905) (end 0 2.54)
(arc (start 0 1.27) (mid 0.6323 1.905) (end 0 2.54)
(stroke (width 0) (type default))
(fill (type none))
)
@ -206,11 +206,11 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "VSIN_0_0"
(arc (start 0 0) (mid -0.635 0.635) (end -1.27 0)
(arc (start 0 0) (mid -0.635 0.6323) (end -1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 0) (mid 0.635 -0.635) (end 1.27 0)
(arc (start 0 0) (mid 0.635 -0.6323) (end 1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
@ -409,6 +409,9 @@
(property "Datasheet" "~" (at 114.3 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 114.3 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid a16c3b98-7b67-49c9-8b37-b5d5ca2ceccb))
(pin "2" (uuid b728ab4c-60f1-4317-8063-17a3a58f5bb4))
(instances
@ -435,6 +438,9 @@
(property "Datasheet" "~" (at 165.1 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 165.1 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid f3a7863c-6d15-47c4-8c18-821cab9870f0))
(pin "2" (uuid 6c3cfdb7-22f3-45ea-8a26-b9e9f1c4daa3))
(instances
@ -571,6 +577,9 @@
(property "Datasheet" "~" (at 152.4 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "L" (at 152.4 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid a53583dc-95c8-4fca-91b3-9355c491ff8e))
(pin "2" (uuid adc9748a-7cbe-4cce-80d0-2d901552a4cf))
(instances
@ -597,6 +606,9 @@
(property "Datasheet" "~" (at 139.7 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "L" (at 139.7 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 0fe84496-e0c8-4141-8960-8b9cae8d2390))
(pin "2" (uuid 203451e4-970e-42a8-abf2-211eb2fe3a4f))
(instances
@ -614,7 +626,7 @@
(property "Reference" "V1" (at 118.11 81.915 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "SIN ampl=1 f=1k" (at 118.11 84.455 0)
(property "Value" "${Sim_Device} ${Sim_Type}" (at 118.11 84.455 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 114.3 82.55 0)
@ -623,12 +635,21 @@
(property "Datasheet" "~" (at 114.3 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 114.3 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "SIN" (at 114.3 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "ampl=1 f=1k" (at 114.3 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 97129dd6-9c66-4077-b4e0-36ed8a999d2a))
(pin "2" (uuid e7584aeb-a043-4b70-ad6e-fcf3f0fb48a0))
(instances
(project "directives"
(path "/a442c838-4dd5-4486-8afe-ccab26ad4148"
(reference "V1") (unit 1) (value "SIN ampl=1 f=1k") (footprint "")
(reference "V1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
)
)
)

1
qa/data/eeschema/spice_netlists/fliege_filter/fliege_filter.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

533
qa/data/eeschema/spice_netlists/fliege_filter/fliege_filter.kicad_sch
View File

@ -1,4 +1,4 @@
(kicad_sch (version 20220820) (generator eeschema)
(kicad_sch (version 20221004) (generator eeschema)
(uuid 1bb7f68e-09b1-4448-8403-97b70f8d3680)
@ -6,28 +6,28 @@
(lib_symbols
(symbol "Amplifier_Operational:LM358" (pin_names (offset 0.127)) (in_bom yes) (on_board yes)
(property "Reference" "U" (id 0) (at 0 5.08 0)
(property "Reference" "U" (at 0 5.08 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "LM358" (id 1) (at 0 -5.08 0)
(property "Value" "LM358" (at 0 -5.08 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 0 0 0)
(property "Footprint" "" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm2904-n.pdf" (id 3) (at 0 0 0)
(property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm2904-n.pdf" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_locked" "" (id 4) (at 0 0 0)
(property "ki_locked" "" (at 0 0 0)
(effects (font (size 1.27 1.27)))
)
(property "ki_keywords" "dual opamp" (id 5) (at 0 0 0)
(property "ki_keywords" "dual opamp" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_description" "Low-Power, Dual Operational Amplifiers, DIP-8/SOIC-8/TO-99-8" (id 6) (at 0 0 0)
(property "ki_description" "Low-Power, Dual Operational Amplifiers, DIP-8/SOIC-8/TO-99-8" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_fp_filters" "SOIC*3.9x4.9mm*P1.27mm* DIP*W7.62mm* TO*99* OnSemi*Micro8* TSSOP*3x3mm*P0.65mm* TSSOP*4.4x3mm*P0.65mm* MSOP*3x3mm*P0.65mm* SSOP*3.9x4.9mm*P0.635mm* LFCSP*2x2mm*P0.5mm* *SIP* SOIC*5.3x6.2mm*P1.27mm*" (id 7) (at 0 0 0)
(property "ki_fp_filters" "SOIC*3.9x4.9mm*P1.27mm* DIP*W7.62mm* TO*99* OnSemi*Micro8* TSSOP*3x3mm*P0.65mm* TSSOP*4.4x3mm*P0.65mm* MSOP*3x3mm*P0.65mm* SSOP*3.9x4.9mm*P0.635mm* LFCSP*2x2mm*P0.5mm* *SIP* SOIC*5.3x6.2mm*P1.27mm*" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(symbol "LM358_1_1"
@ -90,25 +90,25 @@
)
)
(symbol "Device:C" (pin_numbers hide) (pin_names (offset 0.254)) (in_bom yes) (on_board yes)
(property "Reference" "C" (id 0) (at 0.635 2.54 0)
(property "Reference" "C" (at 0.635 2.54 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "C" (id 1) (at 0.635 -2.54 0)
(property "Value" "C" (at 0.635 -2.54 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 0.9652 -3.81 0)
(property "Footprint" "" (at 0.9652 -3.81 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 0 0 0)
(property "Datasheet" "~" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_keywords" "cap capacitor" (id 4) (at 0 0 0)
(property "ki_keywords" "cap capacitor" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_description" "Unpolarized capacitor" (id 5) (at 0 0 0)
(property "ki_description" "Unpolarized capacitor" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_fp_filters" "C_*" (id 6) (at 0 0 0)
(property "ki_fp_filters" "C_*" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(symbol "C_0_1"
@ -141,25 +141,25 @@
)
)
(symbol "Device:R" (pin_numbers hide) (pin_names (offset 0)) (in_bom yes) (on_board yes)
(property "Reference" "R" (id 0) (at 2.032 0 90)
(property "Reference" "R" (at 2.032 0 90)
(effects (font (size 1.27 1.27)))
)
(property "Value" "R" (id 1) (at 0 0 90)
(property "Value" "R" (at 0 0 90)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at -1.778 0 90)
(property "Footprint" "" (at -1.778 0 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 0 0 0)
(property "Datasheet" "~" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_keywords" "R res resistor" (id 4) (at 0 0 0)
(property "ki_keywords" "R res resistor" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_description" "Resistor" (id 5) (at 0 0 0)
(property "ki_description" "Resistor" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_fp_filters" "R_*" (id 6) (at 0 0 0)
(property "ki_fp_filters" "R_*" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(symbol "R_0_1"
@ -180,31 +180,31 @@
)
)
(symbol "Simulation_SPICE:VDC" (pin_numbers hide) (pin_names (offset 0.0254)) (in_bom yes) (on_board yes)
(property "Reference" "V" (id 0) (at 2.54 2.54 0)
(property "Reference" "V" (at 2.54 2.54 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "VDC" (id 1) (at 2.54 0 0)
(property "Value" "VDC" (at 2.54 0 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 0 0 0)
(property "Footprint" "" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 0 0 0)
(property "Datasheet" "~" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Spice_Netlist_Enabled" "Y" (id 4) (at 0 0 0)
(property "Spice_Netlist_Enabled" "Y" (at 0 0 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
(property "Spice_Primitive" "V" (id 5) (at 0 0 0)
(property "Spice_Primitive" "V" (at 0 0 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
(property "Spice_Model" "dc(1)" (id 6) (at 2.54 -2.54 0)
(property "Spice_Model" "dc(1)" (at 2.54 -2.54 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "ki_keywords" "simulation" (id 7) (at 0 0 0)
(property "ki_keywords" "simulation" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_description" "Voltage source, DC" (id 8) (at 0 0 0)
(property "ki_description" "Voltage source, DC" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(symbol "VDC_0_0"
@ -262,39 +262,39 @@
)
)
(symbol "Simulation_SPICE:VSIN" (pin_numbers hide) (pin_names (offset 0.0254)) (in_bom yes) (on_board yes)
(property "Reference" "V" (id 0) (at 2.54 2.54 0)
(property "Reference" "V" (at 2.54 2.54 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "VSIN" (id 1) (at 2.54 0 0)
(property "Value" "VSIN" (at 2.54 0 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 0 0 0)
(property "Footprint" "" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 0 0 0)
(property "Datasheet" "~" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Spice_Netlist_Enabled" "Y" (id 4) (at 0 0 0)
(property "Spice_Netlist_Enabled" "Y" (at 0 0 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
(property "Spice_Primitive" "V" (id 5) (at 0 0 0)
(property "Spice_Primitive" "V" (at 0 0 0)
(effects (font (size 1.27 1.27)) (justify left) hide)
)
(property "Spice_Model" "sin(0 1 1k)" (id 6) (at 2.54 -2.54 0)
(property "Spice_Model" "sin(0 1 1k)" (at 2.54 -2.54 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "ki_keywords" "simulation" (id 7) (at 0 0 0)
(property "ki_keywords" "simulation" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_description" "Voltage source, sinusoidal" (id 8) (at 0 0 0)
(property "ki_description" "Voltage source, sinusoidal" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(symbol "VSIN_0_0"
(arc (start 0 0) (mid -0.635 0.635) (end -1.27 0)
(arc (start 0 0) (mid -0.635 0.6323) (end -1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 0) (mid 0.635 -0.635) (end 1.27 0)
(arc (start 0 0) (mid 0.635 -0.6323) (end 1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
@ -320,22 +320,22 @@
)
)
(symbol "power:GND" (power) (pin_names (offset 0)) (in_bom yes) (on_board yes)
(property "Reference" "#PWR" (id 0) (at 0 -6.35 0)
(property "Reference" "#PWR" (at 0 -6.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (id 1) (at 0 -3.81 0)
(property "Value" "GND" (at 0 -3.81 0)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 0 0 0)
(property "Footprint" "" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "" (id 3) (at 0 0 0)
(property "Datasheet" "" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_keywords" "power-flag" (id 4) (at 0 0 0)
(property "ki_keywords" "power-flag" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "ki_description" "Power symbol creates a global label with name \"GND\" , ground" (id 5) (at 0 0 0)
(property "ki_description" "Power symbol creates a global label with name \"GND\" , ground" (at 0 0 0)
(effects (font (size 1.27 1.27)) hide)
)
(symbol "GND_0_1"
@ -571,435 +571,532 @@
)
(symbol (lib_id "Amplifier_Operational:LM358") (at 170.18 118.11 180) (unit 2)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 1f9535b1-6668-419a-8162-68da61e10385)
(default_instance (reference "U1") (unit 2) (value "LM358") (footprint ""))
(property "Reference" "U1" (id 0) (at 170.18 109.22 0)
(property "Reference" "U1" (at 170.18 109.22 0)
(effects (font (size 1.27 1.27)))
)
(property "Value" "LM358" (id 1) (at 170.18 111.76 0)
(property "Value" "LM358" (at 170.18 111.76 0)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 170.18 118.11 0)
(property "Footprint" "" (at 170.18 118.11 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm2904-n.pdf" (id 3) (at 170.18 118.11 0)
(property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm2904-n.pdf" (at 170.18 118.11 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Name" "uopamp_lvl2_2x" (id 4) (at 185.42 91.44 0)
(property "Sim_Name" "uopamp_lvl2_2x" (at 185.42 91.44 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Library" "uopamp.lib.spice" (id 5) (at 185.42 91.44 0)
(property "Sim_Library" "uopamp.lib.spice" (at 185.42 91.44 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "SUBCKT" (id 6) (at 185.42 91.44 0)
(property "Sim_Device" "SUBCKT" (at 185.42 91.44 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Pins" "8 4 3 2 1 5 6 7" (id 7) (at 154.94 91.44 0)
(property "Sim_Pins" "8 4 3 2 1 5 6 7" (at 154.94 91.44 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 0a29384e-5eae-4f6a-8dd8-bcb7fde77582))
(pin "2" (uuid f4822b70-a40a-48e4-b1fe-93961c727978))
(pin "3" (uuid 333b2942-3abd-4b04-b462-3f60313d7d5c))
(pin "5" (uuid 27f8c948-353a-4e62-b0f4-6e9d2caf36b6))
(pin "6" (uuid 1da44f03-c3bc-46fb-8565-760c3d3847b8))
(pin "7" (uuid 3f62936b-f8db-42c6-bf32-9967c0bb59ed))
(pin "4" (uuid a2661ef9-a7e5-4a82-acc4-498069251b27))
(pin "8" (uuid 28267ce4-7d05-4b5b-b250-9717f9aadad6))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "U1") (unit 2) (value "LM358") (footprint "")
)
)
)
)
(symbol (lib_id "power:GND") (at 113.03 127 270) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 32efad03-1f41-49f9-b4ea-1c10d6f8b290)
(default_instance (reference "#PWR?") (unit 1) (value "GND") (footprint ""))
(property "Reference" "#PWR?" (id 0) (at 106.68 127 0)
(property "Reference" "#PWR0102" (at 106.68 127 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (id 1) (at 109.22 127.635 90)
(property "Value" "GND" (at 109.22 127.635 90)
(effects (font (size 1.27 1.27)) (justify right))
)
(property "Footprint" "" (id 2) (at 113.03 127 0)
(property "Footprint" "" (at 113.03 127 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "" (id 3) (at 113.03 127 0)
(property "Datasheet" "" (at 113.03 127 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid b8698b4b-789d-433e-9e3d-58855afeb989))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "#PWR0102") (unit 1) (value "GND") (footprint "")
)
)
)
)
(symbol (lib_id "Device:R") (at 146.05 101.6 90) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 40ae5997-e7ff-4435-9011-995b9329a072)
(default_instance (reference "R1") (unit 1) (value "R") (footprint ""))
(property "Reference" "R1" (id 0) (at 146.05 96.52 90)
(property "Reference" "R1" (at 146.05 96.52 90)
(effects (font (size 1.27 1.27)))
)
(property "Value" "R" (id 1) (at 146.05 99.06 90)
(property "Value" "1M" (at 146.05 99.06 90)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 146.05 103.378 90)
(property "Footprint" "" (at 146.05 103.378 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 146.05 101.6 0)
(property "Datasheet" "~" (at 146.05 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 146.05 101.6 90)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 40f49b82-6de7-4c0a-9ce9-c928e90dcee8))
(pin "2" (uuid 927de06d-c030-4513-ae73-2a546edceb92))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "R1") (unit 1) (value "1M") (footprint "")
)
)
)
)
(symbol (lib_id "power:GND") (at 114.3 100.33 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 417cb032-b0dd-48f9-ba4c-b3e4ab34caa0)
(default_instance (reference "#PWR?") (unit 1) (value "GND") (footprint ""))
(property "Reference" "#PWR?" (id 0) (at 114.3 106.68 0)
(property "Reference" "#PWR0103" (at 114.3 106.68 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (id 1) (at 114.3 105.41 0)
(property "Value" "GND" (at 114.3 105.41 0)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 114.3 100.33 0)
(property "Footprint" "" (at 114.3 100.33 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "" (id 3) (at 114.3 100.33 0)
(property "Datasheet" "" (at 114.3 100.33 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 5574af62-a1d4-48a1-8d60-098f735cbc13))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "#PWR0103") (unit 1) (value "GND") (footprint "")
)
)
)
)
(symbol (lib_id "power:GND") (at 152.4 111.76 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 4a5a1b77-1f24-4735-af02-661a95efa347)
(default_instance (reference "#PWR?") (unit 1) (value "GND") (footprint ""))
(property "Reference" "#PWR?" (id 0) (at 152.4 118.11 0)
(property "Reference" "#PWR0101" (at 152.4 118.11 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (id 1) (at 152.4 116.84 0)
(property "Value" "GND" (at 152.4 116.84 0)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 152.4 111.76 0)
(property "Footprint" "" (at 152.4 111.76 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "" (id 3) (at 152.4 111.76 0)
(property "Datasheet" "" (at 152.4 111.76 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 285f130f-c9a9-447d-91e9-c9eb4bad4b7a))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "#PWR0101") (unit 1) (value "GND") (footprint "")
)
)
)
)
(symbol (lib_id "Device:R") (at 196.85 133.35 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 4e83ce78-5afa-4877-a190-a11a77e2315b)
(default_instance (reference "R1") (unit 1) (value "R") (footprint ""))
(property "Reference" "R1" (id 0) (at 199.39 132.715 0)
(property "Reference" "R6" (at 199.39 132.715 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "R" (id 1) (at 199.39 135.255 0)
(property "Value" "100k" (at 199.39 135.255 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 195.072 133.35 90)
(property "Footprint" "" (at 195.072 133.35 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 196.85 133.35 0)
(property "Datasheet" "~" (at 196.85 133.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 196.85 133.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 083905bc-5d2a-4620-b997-d57f2d5bc810))
(pin "2" (uuid 985c8f1c-8267-45f9-9760-47c9aa413bce))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "R6") (unit 1) (value "100k") (footprint "")
)
)
)
)
(symbol (lib_id "Simulation_SPICE:VDC") (at 114.3 133.35 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 7156d318-64c1-44a4-9222-3a9a47aa2372)
(default_instance (reference "V1") (unit 1) (value "VDC") (footprint ""))
(property "Reference" "V1" (id 0) (at 118.11 132.715 0)
(property "Reference" "V5" (at 118.11 132.715 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "VDC" (id 1) (at 118.11 135.255 0)
(property "Value" "5" (at 118.11 135.255 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 114.3 133.35 0)
(property "Footprint" "" (at 114.3 133.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 114.3 133.35 0)
(property "Datasheet" "~" (at 114.3 133.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 114.3 133.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid d23993af-9614-478b-984f-e6808785e08a))
(pin "2" (uuid 908cef22-da54-4813-a573-d8e538412d66))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "V5") (unit 1) (value "5") (footprint "")
)
)
)
)
(symbol (lib_id "Device:R") (at 184.15 101.6 270) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 7a2f7d50-7fd2-45fc-8549-13a411cd678a)
(default_instance (reference "R1") (unit 1) (value "R") (footprint ""))
(property "Reference" "R1" (id 0) (at 184.15 96.52 90)
(property "Reference" "R4" (at 184.15 96.52 90)
(effects (font (size 1.27 1.27)))
)
(property "Value" "R" (id 1) (at 184.15 99.06 90)
(property "Value" "15k" (at 184.15 99.06 90)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 184.15 99.822 90)
(property "Footprint" "" (at 184.15 99.822 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 184.15 101.6 0)
(property "Datasheet" "~" (at 184.15 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 184.15 101.6 90)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid b939b2fc-aa38-4699-b76d-3476fb7b1b91))
(pin "2" (uuid 340595d2-3297-4e03-bc9e-7b5530d12845))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "R4") (unit 1) (value "15k") (footprint "")
)
)
)
)
(symbol (lib_id "Amplifier_Operational:LM358") (at 124.46 127 0) (mirror y) (unit 3)
(in_bom yes) (on_board yes)
(in_bom yes) (on_board yes) (dnp no)
(uuid 87dd20a3-7a20-4d68-b835-ffed52bb6407)
(default_instance (reference "U1") (unit 3) (value "LM358") (footprint ""))
(property "Reference" "U1" (id 0) (at 128.27 127.635 0)
(property "Reference" "U1" (at 128.27 127.635 0)
(effects (font (size 1.27 1.27)) (justify right))
)
(property "Value" "LM358" (id 1) (at 128.27 125.095 0)
(property "Value" "LM358" (at 128.27 125.095 0)
(effects (font (size 1.27 1.27)) (justify right))
)
(property "Footprint" "" (id 2) (at 124.46 127 0)
(property "Footprint" "" (at 124.46 127 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm2904-n.pdf" (id 3) (at 124.46 127 0)
(property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm2904-n.pdf" (at 124.46 127 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Name" "uopamp_lvl2_2x" (id 4) (at 185.42 149.86 0)
(property "Sim_Name" "uopamp_lvl2_2x" (at 185.42 149.86 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Library" "uopamp.lib.spice" (id 5) (at 185.42 149.86 0)
(property "Sim_Library" "uopamp.lib.spice" (at 185.42 149.86 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "SUBCKT" (id 6) (at 185.42 149.86 0)
(property "Sim_Device" "SUBCKT" (at 185.42 149.86 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Pins" "8 4 3 2 1 5 6 7" (id 7) (at 185.42 149.86 0)
(property "Sim_Pins" "8 4 3 2 1 5 6 7" (at 185.42 149.86 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 5299360d-4e38-4601-9b73-8e19e0ac8f7e))
(pin "2" (uuid 350b908f-0f88-41e6-ae62-566d1b148cb6))
(pin "3" (uuid 871312bc-5c95-4083-a3f3-77e176925cf4))
(pin "5" (uuid 04a3f5df-511c-4551-be3d-0f36514b9d79))
(pin "6" (uuid 505a0463-ab55-4d25-a322-9c1bc4d556d4))
(pin "7" (uuid 6c8a5b15-19b8-4f7f-9391-fd0ae8577955))
(pin "4" (uuid f8419e99-6cb4-4149-8f18-58b8a114b817))
(pin "8" (uuid 104db1a6-2ee0-424b-8a10-83f39fbdda9d))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "U1") (unit 3) (value "LM358") (footprint "")
)
)
)
)
(symbol (lib_id "Simulation_SPICE:VSIN") (at 114.3 95.25 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 88021970-b98d-4b3b-8504-80e76499ab7b)
(default_instance (reference "V1") (unit 1) (value "ac=1") (footprint ""))
(property "Reference" "V1" (id 0) (at 118.11 93.345 0)
(property "Reference" "V1" (at 118.11 93.345 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "ac=1" (id 1) (at 118.11 95.885 0)
(property "Value" "ac=1" (at 118.11 95.885 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 114.3 95.25 0)
(property "Footprint" "" (at 114.3 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 114.3 95.25 0)
(property "Datasheet" "~" (at 114.3 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 114.3 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid d18a7be3-befb-4f82-9812-85b576c6ba5e))
(pin "2" (uuid 9a1a9ed4-ff64-4de9-9d48-d4c40f1612a0))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "V1") (unit 1) (value "ac=1") (footprint "")
)
)
)
)
(symbol (lib_id "Device:C") (at 171.45 101.6 90) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 915357ab-3b0a-400b-9348-4398e83e2f0d)
(default_instance (reference "C1") (unit 1) (value "C") (footprint ""))
(property "Reference" "C1" (id 0) (at 171.45 95.25 90)
(property "Reference" "C2" (at 171.45 95.25 90)
(effects (font (size 1.27 1.27)))
)
(property "Value" "C" (id 1) (at 171.45 97.79 90)
(property "Value" "10n" (at 171.45 97.79 90)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 175.26 100.6348 0)
(property "Footprint" "" (at 175.26 100.6348 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 171.45 101.6 0)
(property "Datasheet" "~" (at 171.45 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "C" (at 171.45 101.6 90)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 701a271c-8e57-419b-a6f9-2cfcaf4ee7b0))
(pin "2" (uuid 8acd99f5-756e-400c-8bc0-8ad070a55b1c))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "C2") (unit 1) (value "10n") (footprint "")
)
)
)
)
(symbol (lib_id "Simulation_SPICE:VDC") (at 114.3 120.65 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 9505d7a9-59aa-4162-bfe0-189552aad72d)
(default_instance (reference "V1") (unit 1) (value "VDC") (footprint ""))
(property "Reference" "V1" (id 0) (at 118.11 118.745 0)
(property "Reference" "V4" (at 118.11 118.745 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "VDC" (id 1) (at 118.11 121.285 0)
(property "Value" "5" (at 118.11 121.285 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 114.3 120.65 0)
(property "Footprint" "" (at 114.3 120.65 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 114.3 120.65 0)
(property "Datasheet" "~" (at 114.3 120.65 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 114.3 120.65 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid d2a7eba0-60d5-4840-8c92-caa7d1cde951))
(pin "2" (uuid 265a4239-56c8-4d73-80d5-54f8b8513d40))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "V4") (unit 1) (value "5") (footprint "")
)
)
)
)
(symbol (lib_id "Amplifier_Operational:LM358") (at 185.42 91.44 0) (unit 1)
(in_bom yes) (on_board yes)
(in_bom yes) (on_board yes) (dnp no)
(uuid b7badb24-bf38-4cfb-b723-95e3c247d571)
(default_instance (reference "U1") (unit 1) (value "LM358") (footprint ""))
(property "Reference" "U1" (id 0) (at 185.42 82.55 0)
(property "Reference" "U1" (at 185.42 82.55 0)
(effects (font (size 1.27 1.27)))
)
(property "Value" "LM358" (id 1) (at 185.42 85.09 0)
(property "Value" "LM358" (at 185.42 85.09 0)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 185.42 91.44 0)
(property "Footprint" "" (at 185.42 91.44 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm2904-n.pdf" (id 3) (at 185.42 91.44 0)
(property "Datasheet" "http://www.ti.com/lit/ds/symlink/lm2904-n.pdf" (at 185.42 91.44 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Name" "uopamp_lvl2_2x" (id 4) (at 185.42 91.44 0)
(property "Sim_Name" "uopamp_lvl2_2x" (at 185.42 91.44 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Library" "uopamp.lib.spice" (id 5) (at 185.42 91.44 0)
(property "Sim_Library" "uopamp.lib.spice" (at 185.42 91.44 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "SUBCKT" (id 6) (at 185.42 91.44 0)
(property "Sim_Device" "SUBCKT" (at 185.42 91.44 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Pins" "8 4 3 2 1 5 6 7" (id 7) (at 185.42 91.44 0)
(property "Sim_Pins" "8 4 3 2 1 5 6 7" (at 185.42 91.44 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid dd60fb5d-009c-4abb-9bfa-85c9da58e712))
(pin "2" (uuid 119b97a6-2663-4af3-8985-755444efebf8))
(pin "3" (uuid 4aa8a087-5c13-4214-a267-06743f36fd28))
(pin "5" (uuid 9f9bfbff-a698-4166-bfdb-67470ac1ef24))
(pin "6" (uuid cf69309c-5a55-4110-be51-f85795c3cda1))
(pin "7" (uuid 44bbf19f-6e7b-4432-9a21-df368cc78b2b))
(pin "4" (uuid a892482c-6810-40f9-8824-e192d9d63f7f))
(pin "8" (uuid 5bab44f3-7d2e-4aad-be27-b6e5b1dde982))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "U1") (unit 1) (value "LM358") (footprint "")
)
)
)
)
(symbol (lib_id "Device:R") (at 158.75 95.25 180) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid da754588-7440-43c1-8ef3-7b66c12d6a5a)
(default_instance (reference "R1") (unit 1) (value "R") (footprint ""))
(property "Reference" "R1" (id 0) (at 161.29 94.615 0)
(property "Reference" "R3" (at 161.29 94.615 0)
(effects (font (size 1.27 1.27)) (justify right))
)
(property "Value" "R" (id 1) (at 161.29 97.155 0)
(property "Value" "15k" (at 161.29 97.155 0)
(effects (font (size 1.27 1.27)) (justify right))
)
(property "Footprint" "" (id 2) (at 160.528 95.25 90)
(property "Footprint" "" (at 160.528 95.25 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 158.75 95.25 0)
(property "Datasheet" "~" (at 158.75 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 158.75 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 0f79286a-8c35-4ebd-bb87-7c2598c14e47))
(pin "2" (uuid bbd3f277-d91d-4c7c-a69e-c57524a68d74))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "R3") (unit 1) (value "15k") (footprint "")
)
)
)
)
(symbol (lib_id "Device:C") (at 146.05 88.9 90) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid dbe16bdd-a219-4911-8bf3-fe440c368714)
(default_instance (reference "C1") (unit 1) (value "C") (footprint ""))
(property "Reference" "C1" (id 0) (at 146.05 82.55 90)
(property "Reference" "C1" (at 146.05 82.55 90)
(effects (font (size 1.27 1.27)))
)
(property "Value" "C" (id 1) (at 146.05 85.09 90)
(property "Value" "10n" (at 146.05 85.09 90)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (id 2) (at 149.86 87.9348 0)
(property "Footprint" "" (at 149.86 87.9348 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 146.05 88.9 0)
(property "Datasheet" "~" (at 146.05 88.9 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "C" (at 146.05 88.9 90)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 390f428e-6f41-4201-872f-ad881ee3dac9))
(pin "2" (uuid eaf1c2d2-52fe-4763-afe1-6117fb0605a1))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "C1") (unit 1) (value "10n") (footprint "")
)
)
)
)
(symbol (lib_id "Device:R") (at 196.85 107.95 0) (unit 1)
(in_bom yes) (on_board yes) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid e279ce6e-6053-4f70-b6fc-c5b6590e8e68)
(default_instance (reference "R1") (unit 1) (value "R") (footprint ""))
(property "Reference" "R1" (id 0) (at 199.39 107.315 0)
(property "Reference" "R5" (at 199.39 107.315 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "R" (id 1) (at 199.39 109.855 0)
(property "Value" "100k" (at 199.39 109.855 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (id 2) (at 195.072 107.95 90)
(property "Footprint" "" (at 195.072 107.95 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 196.85 107.95 0)
(property "Datasheet" "~" (at 196.85 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 196.85 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 17e2e487-1812-4496-ab4b-2a31981593f1))
(pin "2" (uuid 60c540bd-d514-4344-b841-1ce0bbdaccec))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "R5") (unit 1) (value "100k") (footprint "")
)
)
)
)
(symbol (lib_id "Device:R") (at 152.4 107.95 180) (unit 1)
(in_bom yes) (on_board yes)
(in_bom yes) (on_board yes) (dnp no)
(uuid f1b3385a-18cc-443d-986d-324b49f10808)
(default_instance (reference "R1") (unit 1) (value "R") (footprint ""))
(property "Reference" "R1" (id 0) (at 146.05 106.68 0)
(property "Reference" "R2" (at 146.05 106.68 0)
(effects (font (size 1.27 1.27)) (justify right))
)
(property "Value" "R" (id 1) (at 146.05 109.22 0)
(property "Value" "1M" (at 146.05 109.22 0)
(effects (font (size 1.27 1.27)) (justify right))
)
(property "Footprint" "" (id 2) (at 154.178 107.95 90)
(property "Footprint" "" (at 154.178 107.95 90)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (id 3) (at 152.4 107.95 0)
(property "Datasheet" "~" (at 152.4 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 152.4 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 0641ce34-fa4f-4111-a092-55b991bc6841))
(pin "2" (uuid 8088142a-b276-4d71-995a-28a0e4dbefbe))
(instances
(project "fliege_filter"
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680"
(reference "R2") (unit 1) (value "1M") (footprint "")
)
)
)
)
(sheet_instances
(path "/" (page "1"))
)
(symbol_instances
(path "/32efad03-1f41-49f9-b4ea-1c10d6f8b290"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
)
(path "/417cb032-b0dd-48f9-ba4c-b3e4ab34caa0"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
)
(path "/4a5a1b77-1f24-4735-af02-661a95efa347"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
)
(path "/dbe16bdd-a219-4911-8bf3-fe440c368714"
(reference "C1") (unit 1) (value "10n") (footprint "")
)
(path "/915357ab-3b0a-400b-9348-4398e83e2f0d"
(reference "C2") (unit 1) (value "10n") (footprint "")
)
(path "/40ae5997-e7ff-4435-9011-995b9329a072"
(reference "R1") (unit 1) (value "1M") (footprint "")
)
(path "/f1b3385a-18cc-443d-986d-324b49f10808"
(reference "R2") (unit 1) (value "1M") (footprint "")
)
(path "/da754588-7440-43c1-8ef3-7b66c12d6a5a"
(reference "R3") (unit 1) (value "15k") (footprint "")
)
(path "/7a2f7d50-7fd2-45fc-8549-13a411cd678a"
(reference "R4") (unit 1) (value "15k") (footprint "")
)
(path "/e279ce6e-6053-4f70-b6fc-c5b6590e8e68"
(reference "R5") (unit 1) (value "100k") (footprint "")
)
(path "/4e83ce78-5afa-4877-a190-a11a77e2315b"
(reference "R6") (unit 1) (value "100k") (footprint "")
)
(path "/b7badb24-bf38-4cfb-b723-95e3c247d571"
(reference "U1") (unit 1) (value "LM358") (footprint "")
)
(path "/1f9535b1-6668-419a-8162-68da61e10385"
(reference "U1") (unit 2) (value "LM358") (footprint "")
)
(path "/87dd20a3-7a20-4d68-b835-ffed52bb6407"
(reference "U1") (unit 3) (value "LM358") (footprint "")
)
(path "/88021970-b98d-4b3b-8504-80e76499ab7b"
(reference "V1") (unit 1) (value "ac=1") (footprint "")
)
(path "/9505d7a9-59aa-4162-bfe0-189552aad72d"
(reference "V4") (unit 1) (value "5") (footprint "")
)
(path "/7156d318-64c1-44a4-9222-3a9a47aa2372"
(reference "V5") (unit 1) (value "5") (footprint "")
)
(path "/1bb7f68e-09b1-4448-8403-97b70f8d3680" (page "1"))
)
)

1
qa/data/eeschema/spice_netlists/legacy_opamp/legacy_opamp.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

25
qa/data/eeschema/spice_netlists/legacy_opamp/legacy_opamp.kicad_sch
View File

@ -224,11 +224,11 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "VSIN_0_0"
(arc (start 0 0) (mid -0.635 0.635) (end -1.27 0)
(arc (start 0 0) (mid -0.635 0.6323) (end -1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 0) (mid 0.635 -0.635) (end 1.27 0)
(arc (start 0 0) (mid 0.635 -0.6323) (end 1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
@ -413,6 +413,9 @@
(property "Datasheet" "~" (at 152.4 111.125 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 152.4 111.125 90)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 8570589f-3239-4688-b9b7-f28babea55a9))
(pin "2" (uuid b28e6f6a-0a3d-4193-a4fd-094e7eb2bb42))
(instances
@ -452,10 +455,10 @@
(symbol (lib_id "Simulation_SPICE:VSIN") (at 138.43 93.98 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no)
(uuid 8fe10d6d-5ad3-4bcf-9fbd-bc9f56307af6)
(property "Reference" "VIN1" (at 114.3 92.71 0)
(property "Reference" "VIN1" (at 118.11 91.44 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "SIN ampl=500m f=1k" (at 114.3 95.25 0)
(property "Value" "${Sim_Device} ${Sim_Type}" (at 118.11 93.98 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 138.43 93.98 0)
@ -464,12 +467,21 @@
(property "Datasheet" "~" (at 138.43 93.98 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 138.43 93.98 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "SIN" (at 138.43 93.98 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "ampl=500m f=1k" (at 125.73 96.52 0)
(effects (font (size 1.27 1.27)))
)
(pin "1" (uuid e14fe139-e230-4c18-ba7e-26a3436f2277))
(pin "2" (uuid 167be7c4-3f85-4d13-a262-f53f4c67d8c0))
(instances
(project "legacy_opamp"
(path "/986bd0ba-4f89-4046-b50f-9d5b4a950ed1"
(reference "VIN1") (unit 1) (value "SIN ampl=500m f=1k") (footprint "")
(reference "VIN1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
)
)
)
@ -525,6 +537,9 @@
(property "Datasheet" "~" (at 144.78 111.125 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 144.78 111.125 90)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 18222c52-d810-454a-9f36-37f7e5183634))
(pin "2" (uuid f052a642-d7fc-4802-b25f-fd6d95004b7b))
(instances

11
qa/data/eeschema/spice_netlists/legacy_sallen_key/legacy_sallen_key.kicad_pro
View File

@ -323,6 +323,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",
@ -340,7 +341,7 @@
"net_settings": {
"classes": [
{
"bus_width": 12.0,
"bus_width": 12,
"clearance": 0.2,
"diff_pair_gap": 0.25,
"diff_pair_via_gap": 0.25,
@ -354,13 +355,15 @@
"track_width": 0.25,
"via_diameter": 0.8,
"via_drill": 0.4,
"wire_width": 6.0
"wire_width": 6
}
],
"meta": {
"version": 2
"version": 3
},
"net_colors": null
"net_colors": null,
"netclass_assignments": null,
"netclass_patterns": []
},
"pcbnew": {
"last_paths": {

2
qa/data/eeschema/spice_netlists/legacy_sallen_key/legacy_sallen_key.kicad_sch
View File

@ -1,4 +1,4 @@
(kicad_sch (version 20220622) (generator eeschema)
(kicad_sch (version 20220404) (generator eeschema)
(uuid 403a5eac-c035-4b08-8ba1-e036b0ed18fb)

1
qa/data/eeschema/spice_netlists/npn_ce_amp/npn_ce_amp.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

25
qa/data/eeschema/spice_netlists/npn_ce_amp/npn_ce_amp.kicad_sch
View File

@ -206,11 +206,11 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "VSIN_0_0"
(arc (start 0 0) (mid -0.635 0.635) (end -1.27 0)
(arc (start 0 0) (mid -0.635 0.6323) (end -1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 0) (mid 0.635 -0.635) (end 1.27 0)
(arc (start 0 0) (mid 0.635 -0.6323) (end 1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
@ -499,6 +499,9 @@
(property "Datasheet" "~" (at 120.65 88.9 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "C" (at 120.65 88.9 90)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 94852f4d-516a-49ae-94b0-d7194707acba))
(pin "2" (uuid 8245b736-a715-43fb-a993-1e7d8dd85088))
(instances
@ -593,6 +596,9 @@
(property "Datasheet" "~" (at 148.59 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "C" (at 148.59 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid e537f30b-df49-4540-b7c3-be90d17f9974))
(pin "2" (uuid b5484ad9-186a-4b7a-98c3-a367c224e24d))
(instances
@ -619,6 +625,9 @@
(property "Datasheet" "~" (at 139.7 76.2 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 139.7 76.2 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid e6274a8f-746c-4ba0-8504-4c8082be16cf))
(pin "2" (uuid 2f15bad6-8ea3-4281-8207-ccd6f867f80a))
(instances
@ -683,6 +692,9 @@
(property "Datasheet" "~" (at 139.7 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 139.7 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 537b0f91-9fdd-4f38-a125-8bcc16fcae66))
(pin "2" (uuid 5a32069d-e4f7-494e-a9f9-417b71f15917))
(instances
@ -734,6 +746,9 @@
(property "Datasheet" "~" (at 127 85.09 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 127 85.09 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 4bd7b8c1-ef81-4d9e-8786-74309346686c))
(pin "2" (uuid 8deb3938-9d5d-4eb6-9d1a-d76714cf7d00))
(instances
@ -760,6 +775,9 @@
(property "Datasheet" "~" (at 139.7 109.22 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 139.7 109.22 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 4bb143a1-985c-492c-a6e7-e81a25da1fda))
(pin "2" (uuid 6e8b12d9-2933-4936-8fd0-349ca0293a71))
(instances
@ -786,6 +804,9 @@
(property "Datasheet" "~" (at 127 92.71 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 127 92.71 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 305f44d5-f5cd-42d1-81ea-89b233f6b5a9))
(pin "2" (uuid 8dbdc783-b66f-430c-a6e5-5b06dc41f34a))
(instances

1
qa/data/eeschema/spice_netlists/opamp/opamp.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

31
qa/data/eeschema/spice_netlists/opamp/opamp.kicad_sch
View File

@ -212,11 +212,11 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "VSIN_0_0"
(arc (start 0 0) (mid -0.635 0.635) (end -1.27 0)
(arc (start 0 0) (mid -0.635 0.6323) (end -1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 0) (mid 0.635 -0.635) (end 1.27 0)
(arc (start 0 0) (mid 0.635 -0.6323) (end 1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
@ -354,10 +354,10 @@
(symbol (lib_id "Simulation_SPICE:VSIN") (at 138.43 93.98 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no)
(uuid 10f44001-5f65-44eb-a535-b7b3c67d5b83)
(property "Reference" "VIN1" (at 114.3 92.71 0)
(property "Reference" "VIN1" (at 116.84 92.71 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "SIN ampl=500m f=1k" (at 114.3 95.25 0)
(property "Value" "${Sim_Device} ${Sim_Type}" (at 116.84 95.25 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 138.43 93.98 0)
@ -366,12 +366,21 @@
(property "Datasheet" "~" (at 138.43 93.98 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 138.43 93.98 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "SIN" (at 138.43 93.98 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "ampl=500m f=1k" (at 124.46 97.79 0)
(effects (font (size 1.27 1.27)))
)
(pin "1" (uuid 19da877c-a69c-4a1d-8029-3483030b2fe0))
(pin "2" (uuid 4c449474-8aa6-4bd1-b153-a08aa763d45a))
(instances
(project "opamp"
(path "/fd5567b0-04f0-4d9e-b647-1775367d8ff4"
(reference "VIN1") (unit 1) (value "SIN ampl=500m f=1k") (footprint "")
(reference "VIN1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
)
)
)
@ -392,6 +401,9 @@
(property "Datasheet" "~" (at 152.4 111.125 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 152.4 111.125 90)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 7cf6d433-268b-4901-b74d-8803afdfc194))
(pin "2" (uuid 63068397-add3-45ea-b295-240f56e8c4f9))
(instances
@ -418,6 +430,9 @@
(property "Datasheet" "~" (at 153.67 76.2 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 153.67 76.2 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 885c89aa-c780-4741-b398-9d4b8e38f094))
(pin "2" (uuid 8a2dca0c-b99f-4109-a426-af5e80ea91fe))
(instances
@ -560,6 +575,9 @@
(property "Datasheet" "~" (at 153.67 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 153.67 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 62bdf880-7061-4b86-be3a-09bf959fae21))
(pin "2" (uuid 9bd26aa2-337b-4c5a-a9de-bdab770672a9))
(instances
@ -586,6 +604,9 @@
(property "Datasheet" "~" (at 144.78 111.125 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 144.78 111.125 90)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid fe3f00f2-cee0-4154-8f20-4097e41e635f))
(pin "2" (uuid 5480c24e-8f90-4441-b07c-0db2096e1071))
(instances

1
qa/data/eeschema/spice_netlists/potentiometers/potentiometers.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

21
qa/data/eeschema/spice_netlists/potentiometers/potentiometers.kicad_sch
View File

@ -332,6 +332,12 @@
(property "Datasheet" "~" (at 152.4 133.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 152.4 133.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "POT" (at 152.4 133.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid c77da26e-2c80-4310-84bf-e1a90dc2094f))
(pin "2" (uuid 03dbec1f-269e-4720-a4dd-2cbbc854fa89))
(pin "3" (uuid f76a306b-9f82-41eb-a2bd-27e1b85e66b9))
@ -359,6 +365,12 @@
(property "Datasheet" "~" (at 152.4 57.15 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 152.4 57.15 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "POT" (at 152.4 57.15 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 72f78aa8-0a10-4afc-bce0-380904d14d13))
(pin "2" (uuid 23696eac-29f2-4bf5-8d36-b58dc31aade0))
(pin "3" (uuid a088b589-4331-4a43-9692-eeae2c3927ce))
@ -411,6 +423,9 @@
(property "Datasheet" "~" (at 114.3 57.15 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 114.3 57.15 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 4553662d-6271-4548-b150-dc1eb8221d40))
(pin "2" (uuid 9ab1f350-5c0f-4459-b0df-abd174706379))
(instances
@ -462,6 +477,12 @@
(property "Datasheet" "~" (at 152.4 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 152.4 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "POT" (at 152.4 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 506d640e-0a3d-4ba3-a5f0-80d908fad32d))
(pin "2" (uuid dc9b9c37-5353-4880-87bb-8fc37017c528))
(pin "3" (uuid db81ec35-ea18-4bf8-aefc-34db5616ae22))

1
qa/data/eeschema/spice_netlists/rectifier/rectifier.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

30
qa/data/eeschema/spice_netlists/rectifier/rectifier.kicad_sch
View File

@ -185,11 +185,11 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "VSIN_0_0"
(arc (start 0 0) (mid -0.635 0.635) (end -1.27 0)
(arc (start 0 0) (mid -0.635 0.6323) (end -1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 0) (mid 0.635 -0.635) (end 1.27 0)
(arc (start 0 0) (mid 0.635 -0.6323) (end 1.27 0)
(stroke (width 0) (type default))
(fill (type none))
)
@ -336,10 +336,10 @@
(symbol (lib_id "Simulation_SPICE:VSIN") (at 134.62 101.6 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no)
(uuid 2f4ce84c-7613-4135-9bc6-7662b55052cf)
(property "Reference" "V1" (at 114.3 99.06 0)
(property "Reference" "V1" (at 119.38 99.06 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "SIN ampl=5 f=1k" (at 114.3 101.6 0)
(property "Value" "${SIM_DEVICE} ${SIM_TYPE}" (at 119.38 101.6 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 134.62 101.6 0)
@ -348,12 +348,24 @@
(property "Datasheet" "~" (at 134.62 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 134.62 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "SIN" (at 134.62 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "ampl=5 f=1k" (at 124.46 104.14 0)
(effects (font (size 1.27 1.27)))
)
(property "Sim_Pins" "1 2" (at 134.62 101.6 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid a29d8f63-65fa-4d69-b0d4-cfa5c00fc5ab))
(pin "2" (uuid 8bfe05fb-6889-4435-80ba-ab2128b151d8))
(instances
(project "rectifier"
(path "/0c9c3a92-6a4e-4a5b-b607-2cfe0f3c4b2e"
(reference "V1") (unit 1) (value "SIN ampl=5 f=1k") (footprint "")
(reference "V1") (unit 1) (value "${SIM_DEVICE} ${SIM_TYPE}") (footprint "")
)
)
)
@ -374,6 +386,9 @@
(property "Datasheet" "~" (at 155.575 100.33 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "C" (at 155.575 100.33 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 0f0333bf-611a-47ec-bd68-52c7b166c571))
(pin "2" (uuid b71649f6-4e0d-4ac7-a45e-e31d214c664b))
(instances
@ -400,7 +415,7 @@
(property "Datasheet" "~" (at 151.765 96.52 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "DIODE" (at 151.765 96.52 0)
(property "Sim_Device" "D" (at 151.765 96.52 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Name" "DIODE1" (at 151.765 96.52 0)
@ -438,6 +453,9 @@
(property "Datasheet" "~" (at 165.1 100.33 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 165.1 100.33 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 908dc772-f335-42cf-8fc9-474d99c97d6b))
(pin "2" (uuid 8284393b-9c35-4de1-912f-0588e9c9883b))
(instances

1
qa/data/eeschema/spice_netlists/rlc/rlc.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

52
qa/data/eeschema/spice_netlists/rlc/rlc.kicad_sch
View File

@ -79,19 +79,19 @@
(effects (font (size 1.27 1.27)) hide)
)
(symbol "L_0_1"
(arc (start 0 -2.54) (mid 0.635 -1.905) (end 0 -1.27)
(arc (start 0 -2.54) (mid 0.6323 -1.905) (end 0 -1.27)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 -1.27) (mid 0.635 -0.635) (end 0 0)
(arc (start 0 -1.27) (mid 0.6323 -0.635) (end 0 0)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 0) (mid 0.635 0.635) (end 0 1.27)
(arc (start 0 0) (mid 0.6323 0.635) (end 0 1.27)
(stroke (width 0) (type default))
(fill (type none))
)
(arc (start 0 1.27) (mid 0.635 1.905) (end 0 2.54)
(arc (start 0 1.27) (mid 0.6323 1.905) (end 0 2.54)
(stroke (width 0) (type default))
(fill (type none))
)
@ -439,6 +439,9 @@
(property "Datasheet" "~" (at 127 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "C" (at 127 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 903935c6-35d3-4916-ada6-6df4770de2aa))
(pin "2" (uuid 345dcb8d-fa56-42b9-8459-76c190d65d47))
(instances
@ -465,6 +468,9 @@
(property "Datasheet" "~" (at 190.5 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 190.5 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 7eaeaa13-0708-49b3-b75d-a26c16d10ee7))
(pin "2" (uuid 638515be-9c03-48d2-b9fe-a631fb6915e0))
(instances
@ -491,6 +497,9 @@
(property "Datasheet" "~" (at 203.2 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "L" (at 203.2 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 4ebb4d0f-b627-4dc9-9847-2a94f54f22db))
(pin "2" (uuid 3b2f749c-1e7c-4201-80ac-4298b93d47b7))
(instances
@ -517,6 +526,9 @@
(property "Datasheet" "~" (at 127 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 127 82.55 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 074f07c5-e6cf-47ec-af8c-7b1f0375a3bf))
(pin "2" (uuid 0cfc39f9-53c2-4a24-b203-fdb49a1dc8b2))
(instances
@ -643,6 +655,9 @@
(property "Datasheet" "~" (at 215.9 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "C" (at 215.9 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 37d61ed5-e320-4d57-bff7-ec42aeca9f21))
(pin "2" (uuid 07323bac-5c2c-4732-830c-f3c57201154d))
(instances
@ -660,7 +675,7 @@
(property "Reference" "I1" (at 168.91 93.345 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "PULSE y2=1 tw=1u" (at 168.91 95.885 0)
(property "Value" "${Sim_Device} ${Sim_Type}" (at 168.91 95.885 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 165.1 95.25 0)
@ -669,12 +684,21 @@
(property "Datasheet" "~" (at 165.1 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "I" (at 165.1 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "PULSE" (at 165.1 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "y2=1 tw=1u" (at 165.1 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 8a80b586-d30c-44d1-b165-e9c7e3047e62))
(pin "2" (uuid 45a2089b-d1a0-426a-994b-107d5560e7f0))
(instances
(project "rlc"
(path "/b0197b4d-36ea-4821-991f-20bf73bcc80c"
(reference "I1") (unit 1) (value "PULSE y2=1 tw=1u") (footprint "")
(reference "I1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
)
)
)
@ -686,7 +710,7 @@
(property "Reference" "V1" (at 105.41 93.345 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "PULSE y2=1 tw=1u" (at 105.41 95.885 0)
(property "Value" "${Sim_Device} ${Sim_Type}" (at 105.41 95.885 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 101.6 95.25 0)
@ -695,12 +719,21 @@
(property "Datasheet" "~" (at 101.6 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 101.6 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "PULSE" (at 101.6 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "y2=1 tw=1u" (at 101.6 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid e8818239-f91c-47e3-ac1e-178af6b74e90))
(pin "2" (uuid 024d1f91-a924-4436-bab9-338ed09010fe))
(instances
(project "rlc"
(path "/b0197b4d-36ea-4821-991f-20bf73bcc80c"
(reference "V1") (unit 1) (value "PULSE y2=1 tw=1u") (footprint "")
(reference "V1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
)
)
)
@ -721,6 +754,9 @@
(property "Datasheet" "~" (at 127 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "L" (at 127 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 8e8c16ca-b9d0-42ae-8073-59118828361f))
(pin "2" (uuid a1d46bf7-ab6a-4497-adbf-0ad4bd09d044))
(instances

1
qa/data/eeschema/spice_netlists/switches/switches.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

117
qa/data/eeschema/spice_netlists/switches/switches.kicad_sch
View File

@ -462,12 +462,12 @@
)
(symbol (lib_id "Simulation_SPICE:VPULSE") (at 101.6 81.28 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(in_bom yes) (on_board yes) (dnp no)
(uuid 347e9fb4-5b9c-424b-a0ef-e3e1d4152813)
(property "Reference" "V1" (at 105.41 79.375 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "PULSE y2=1 td=1m tr=1u tf=1u tw=1m" (at 105.41 81.915 0)
(property "Value" "${SIM_DEVICE} ${SIM_TYPE}" (at 105.41 81.915 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 101.6 81.28 0)
@ -476,12 +476,21 @@
(property "Datasheet" "~" (at 101.6 81.28 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 101.6 81.28 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "PULSE" (at 101.6 81.28 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "y2=1 td=1m tr=1u tf=1u tw=1m" (at 121.92 83.82 0)
(effects (font (size 1.27 1.27)))
)
(pin "1" (uuid 117dae63-cbae-4915-acae-e6e10531e40e))
(pin "2" (uuid 9b2185ff-f747-4fa4-8049-8a873f9809b0))
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "V1") (unit 1) (value "PULSE y2=1 td=1m tr=1u tf=1u tw=1m") (footprint "")
(reference "V1") (unit 1) (value "${SIM_DEVICE} ${SIM_TYPE}") (footprint "")
)
)
)
@ -502,6 +511,9 @@
(property "Datasheet" "~" (at 168.91 96.52 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 168.91 96.52 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 0b55c5be-6cf6-4c8b-92f9-3478d772166e))
(pin "2" (uuid 2397d0b3-3656-47e9-bee9-7c3263dd94b2))
(instances
@ -516,7 +528,7 @@
(symbol (lib_id "power:GND") (at 158.75 91.44 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 3a046e4d-7b2b-4ee1-9196-d1db4ee763bb)
(property "Reference" "#PWR?" (at 158.75 97.79 0)
(property "Reference" "#PWR0106" (at 158.75 97.79 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (at 158.75 96.52 0)
@ -532,33 +544,7 @@
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
)
)
)
)
(symbol (lib_id "Simulation_SPICE:VPULSE") (at 101.6 119.38 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 4200094f-3f88-44e8-b754-02453ae72796)
(property "Reference" "V3" (at 105.41 118.745 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "PULSE y2=1 td=3m tr=1u tf=1u tw=1m" (at 105.41 121.285 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 101.6 119.38 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (at 101.6 119.38 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 5a04f24f-84ee-415e-9ebb-6a57bc5cb49d))
(pin "2" (uuid 6b71e245-55cf-4686-9a3f-ea5b100aa39a))
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "V3") (unit 1) (value "PULSE y2=1 td=3m tr=1u tf=1u tw=1m") (footprint "")
(reference "#PWR0106") (unit 1) (value "GND") (footprint "")
)
)
)
@ -607,7 +593,7 @@
(symbol (lib_id "power:GND") (at 101.6 88.9 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 66dfc60d-51c9-41a4-8112-e32a54e72e44)
(property "Reference" "#PWR?" (at 101.6 95.25 0)
(property "Reference" "#PWR0104" (at 101.6 95.25 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (at 101.6 93.98 0)
@ -623,7 +609,7 @@
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
(reference "#PWR0104") (unit 1) (value "GND") (footprint "")
)
)
)
@ -632,7 +618,7 @@
(symbol (lib_id "power:GND") (at 158.75 129.54 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 7b412bef-6375-4838-89d0-ef85f2a44f39)
(property "Reference" "#PWR?" (at 158.75 135.89 0)
(property "Reference" "#PWR0103" (at 158.75 135.89 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (at 158.75 134.62 0)
@ -648,7 +634,7 @@
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
(reference "#PWR0103") (unit 1) (value "GND") (footprint "")
)
)
)
@ -657,7 +643,7 @@
(symbol (lib_id "power:GND") (at 184.15 127 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 8f3fec1f-a25a-4d2a-835f-873a7617927d)
(property "Reference" "#PWR?" (at 184.15 133.35 0)
(property "Reference" "#PWR0105" (at 184.15 133.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (at 184.15 132.08 0)
@ -673,7 +659,7 @@
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
(reference "#PWR0105") (unit 1) (value "GND") (footprint "")
)
)
)
@ -682,7 +668,7 @@
(symbol (lib_id "power:GND") (at 101.6 127 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid 925023dd-5312-461f-a25e-dc1614390dac)
(property "Reference" "#PWR?" (at 101.6 133.35 0)
(property "Reference" "#PWR0101" (at 101.6 133.35 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (at 101.6 132.08 0)
@ -698,7 +684,7 @@
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
(reference "#PWR0101") (unit 1) (value "GND") (footprint "")
)
)
)
@ -719,6 +705,9 @@
(property "Datasheet" "~" (at 184.15 85.09 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 184.15 85.09 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid ca5b7fb7-b9ed-4675-bf02-833e831d13b1))
(pin "2" (uuid 44011730-1773-4bd0-9249-a31db1d4c278))
(instances
@ -733,7 +722,7 @@
(symbol (lib_id "power:GND") (at 168.91 139.7 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid af1b7e6e-e3ca-4aef-a5e2-387742769c66)
(property "Reference" "#PWR?" (at 168.91 146.05 0)
(property "Reference" "#PWR0102" (at 168.91 146.05 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (at 168.91 144.78 0)
@ -749,7 +738,7 @@
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
(reference "#PWR0102") (unit 1) (value "GND") (footprint "")
)
)
)
@ -795,10 +784,45 @@
)
)
(symbol (lib_id "Simulation_SPICE:VPULSE") (at 101.6 119.38 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no)
(uuid cc5714e1-b7d6-480c-969a-294d5122f327)
(property "Reference" "V5" (at 105.41 117.475 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "${SIM_DEVICE} ${SIM_TYPE}" (at 105.41 120.015 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 101.6 119.38 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Datasheet" "~" (at 101.6 119.38 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 101.6 119.38 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "PULSE" (at 101.6 119.38 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "y2=1 td=3m tr=1u tf=1u tw=1m" (at 121.92 121.92 0)
(effects (font (size 1.27 1.27)))
)
(pin "1" (uuid ddd2ffc3-7553-4ad4-936b-0f723731d49a))
(pin "2" (uuid d5f77ea6-9917-42cc-9fe2-e5f0a719777c))
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "V5") (unit 1) (value "${SIM_DEVICE} ${SIM_TYPE}") (footprint "")
)
)
)
)
(symbol (lib_id "power:GND") (at 168.91 101.6 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid cf6a69fc-ed84-4873-b4dc-81fbde5f83b7)
(property "Reference" "#PWR?" (at 168.91 107.95 0)
(property "Reference" "#PWR0108" (at 168.91 107.95 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (at 168.91 106.68 0)
@ -814,7 +838,7 @@
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
(reference "#PWR0108") (unit 1) (value "GND") (footprint "")
)
)
)
@ -870,6 +894,9 @@
(property "Datasheet" "~" (at 168.91 134.62 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 168.91 134.62 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 443fd48c-8d2e-46b1-8fbf-0c210fd528fb))
(pin "2" (uuid 7020a4d8-768d-428d-9f3e-da14232410f1))
(instances
@ -884,7 +911,7 @@
(symbol (lib_id "power:GND") (at 184.15 91.44 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
(uuid efec76b7-311a-4c4c-971c-c6fda250379c)
(property "Reference" "#PWR?" (at 184.15 97.79 0)
(property "Reference" "#PWR0107" (at 184.15 97.79 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Value" "GND" (at 184.15 96.52 0)
@ -900,7 +927,7 @@
(instances
(project "switches"
(path "/8c3d4d2c-5107-4b13-88da-bd05d371fd8a"
(reference "#PWR?") (unit 1) (value "GND") (footprint "")
(reference "#PWR0107") (unit 1) (value "GND") (footprint "")
)
)
)

1
qa/data/eeschema/spice_netlists/tlines/tlines.kicad_pro
View File

@ -230,6 +230,7 @@
"pin_to_pin": "warning",
"power_pin_not_driven": "error",
"similar_labels": "warning",
"simulation_model_issue": "error",
"unannotated": "error",
"unit_value_mismatch": "error",
"unresolved_variable": "error",

69
qa/data/eeschema/spice_netlists/tlines/tlines.kicad_sch
View File

@ -338,11 +338,11 @@
(symbol (lib_id "Transmission_Line:TLINE") (at 146.05 114.3 0) (unit 1)
(in_bom no) (on_board no) (dnp no) (fields_autoplaced)
(uuid 34b3fec2-c790-40cf-bb63-dd642fff2299)
(uuid 27aefe2b-7fc4-496d-8a9d-7c135474145a)
(property "Reference" "TLINE2" (at 146.0509 109.22 0)
(effects (font (size 1.27 1.27)))
)
(property "Value" "RLGC len=1 r=0 l=1.25m g=0 c=500n" (at 146.0509 111.76 0)
(property "Value" "${Sim_Device} ${Sim_Type}" (at 146.0509 111.76 0)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (at 146.05 114.3 0)
@ -351,14 +351,23 @@
(property "Datasheet" "http://ngspice.sourceforge.net/docs/ngspice-36-manual.pdf#7f" (at 146.05 109.22 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 3ba94ccd-338c-44da-afd8-322313c0ff13))
(pin "2" (uuid ed81258e-3e5d-4a2d-8e04-b3182f9c51c0))
(pin "3" (uuid 443d9994-dd5c-4f22-b64a-7cbede1ad619))
(pin "4" (uuid 5b960bbf-5dc9-492f-b460-847fb0c65707))
(property "Sim_Device" "TLINE" (at 146.05 114.3 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "RLGC" (at 146.05 114.3 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "len=1 r=0 l=1.25m g=0 c=500n" (at 146.05 114.3 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid ae869dc5-9148-4a5a-a155-bcf7a2097121))
(pin "2" (uuid af5bfd97-40d2-4cad-a4a6-f10aeaafa893))
(pin "3" (uuid df23b39e-b412-4023-b9b8-2104f74b03ac))
(pin "4" (uuid a39c7848-40ac-43f3-86cd-affc7f43fee5))
(instances
(project "tlines"
(path "/f74aa792-5ddc-4342-b3b1-f3d782106d77"
(reference "TLINE2") (unit 1) (value "RLGC len=1 r=0 l=1.25m g=0 c=500n") (footprint "")
(reference "TLINE2") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
)
)
)
@ -367,10 +376,10 @@
(symbol (lib_id "Simulation_SPICE:VPULSE") (at 127 81.28 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no)
(uuid 56fc236a-df5f-49ef-9b92-3227f86197b4)
(property "Reference" "V1" (at 81.28 80.01 0)
(property "Reference" "V1" (at 86.36 78.74 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "PULSE y2=1 tr=1u tf=1u tw=50u per=100u" (at 81.28 82.55 0)
(property "Value" "${Sim_Device} ${Sim_Type}" (at 86.36 81.28 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 127 81.28 0)
@ -379,12 +388,21 @@
(property "Datasheet" "~" (at 127 81.28 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 127 81.28 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "PULSE" (at 127 81.28 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "y2=1 tr=1u tf=1u tw=50u per=100u" (at 104.14 85.09 0)
(effects (font (size 1.27 1.27)))
)
(pin "1" (uuid 5e20d69f-9003-4997-b6ac-fca384177c2c))
(pin "2" (uuid 59e755b2-04d0-4799-bdf1-e10965451a30))
(instances
(project "tlines"
(path "/f74aa792-5ddc-4342-b3b1-f3d782106d77"
(reference "V1") (unit 1) (value "PULSE y2=1 tr=1u tf=1u tw=50u per=100u") (footprint "")
(reference "V1") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
)
)
)
@ -480,6 +498,9 @@
(property "Datasheet" "~" (at 165.1 80.01 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 165.1 80.01 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 1ec2478e-c74c-4b1f-94f8-f36178bb057b))
(pin "2" (uuid d9cd7012-5227-493d-a953-8c8f9e0cc488))
(instances
@ -522,7 +543,7 @@
(property "Reference" "TLINE1" (at 146.0509 71.12 0)
(effects (font (size 1.27 1.27)))
)
(property "Value" "z0=50 td=25u" (at 146.0509 73.66 0)
(property "Value" "${Sim_Device}" (at 146.0509 73.66 0)
(effects (font (size 1.27 1.27)))
)
(property "Footprint" "" (at 146.05 76.2 0)
@ -531,6 +552,12 @@
(property "Datasheet" "http://ngspice.sourceforge.net/docs/ngspice-36-manual.pdf#7f" (at 146.05 71.12 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "TLINE" (at 146.05 76.2 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "z0=50 td=25u" (at 146.05 76.2 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid ea050e5c-1246-4281-a897-0695b0c28888))
(pin "2" (uuid 6a849f27-b16c-48cb-80be-7504707e9e4a))
(pin "3" (uuid a8652546-dd2b-4f4f-874e-abb58500b88a))
@ -538,7 +565,7 @@
(instances
(project "tlines"
(path "/f74aa792-5ddc-4342-b3b1-f3d782106d77"
(reference "TLINE1") (unit 1) (value "z0=50 td=25u") (footprint "")
(reference "TLINE1") (unit 1) (value "${Sim_Device}") (footprint "")
)
)
)
@ -559,6 +586,9 @@
(property "Datasheet" "~" (at 165.1 118.11 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "R" (at 165.1 118.11 0)
(effects (font (size 1.27 1.27)) hide)
)
(pin "1" (uuid 720acbb9-4c0b-48b1-9b2a-ca5415db622e))
(pin "2" (uuid aee2f2ef-458b-4835-9263-2a66796398fe))
(instances
@ -598,10 +628,10 @@
(symbol (lib_id "Simulation_SPICE:VPULSE") (at 127 119.38 0) (unit 1)
(in_bom yes) (on_board yes) (dnp no)
(uuid fcc0dfa9-c624-4a32-a3d3-4c36ee7b0fe6)
(property "Reference" "V2" (at 81.28 118.11 0)
(property "Reference" "V2" (at 86.36 115.57 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Value" "PULSE y2=1 tr=1u tf=1u tw=50u per=100u" (at 81.28 120.65 0)
(property "Value" "${Sim_Device} ${Sim_Type}" (at 86.36 118.11 0)
(effects (font (size 1.27 1.27)) (justify left))
)
(property "Footprint" "" (at 127 119.38 0)
@ -610,12 +640,21 @@
(property "Datasheet" "~" (at 127 119.38 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Device" "V" (at 127 119.38 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Type" "PULSE" (at 127 119.38 0)
(effects (font (size 1.27 1.27)) hide)
)
(property "Sim_Params" "y2=1 tr=1u tf=1u tw=50u per=100u" (at 104.14 121.92 0)
(effects (font (size 1.27 1.27)))
)
(pin "1" (uuid 4697d16d-3f33-43d4-bdc9-9604ce8ac4d7))
(pin "2" (uuid b718a7b9-338a-42ec-b700-e8a6ef481ecb))
(instances
(project "tlines"
(path "/f74aa792-5ddc-4342-b3b1-f3d782106d77"
(reference "V2") (unit 1) (value "PULSE y2=1 tr=1u tf=1u tw=50u per=100u") (footprint "")
(reference "V2") (unit 1) (value "${Sim_Device} ${Sim_Type}") (footprint "")
)
)
)