Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix simulator issues #344

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

Fix simulator issues #344

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
eb8b1b1
add unit to the power property in the resistors and do not show it by…
failiz Jul 21, 2022
1a06971
do not show current property in schematics and add unit (A) to the cu…
failiz Jul 21, 2022
5c9c63f
do not allow flipping the multimeters in the sch view to avoid seeing…
failiz Jul 24, 2022
0b9cc90
add spice fields to RGB LEDs
failiz Jul 25, 2022
64a6374
add photocell for the simulator
failiz Jul 26, 2022
5940445
fix the symbol of potentiometers and rheostats. Thanks to vanepp for …
failiz Jul 27, 2022
5ac7785
fix missing svgs for textile pots
failiz Jul 27, 2022
384b26f
change to correct layer
failiz Jul 28, 2022
5ff9c7b
more changes to svgs to pass CI tests
failiz Jul 28, 2022
684363b
add style inside icon group
failiz Jul 28, 2022
42051c4
fix slider potentiometer
failiz Jul 29, 2022
3c8985a
led-rgb-6pin needs to be ColorLEDModuleID to be able to change the co…
failiz Aug 19, 2022
23c6f71
Merge branch 'develop' into fix_simulator_issues
KjellMorgenstern Oct 24, 2022
a7cdeaa
Merge branch 'develop' into fix_simulator_issues
KjellMorgenstern Jan 24, 2023
8a996e3
fixes #373, resistance of photoresistor is clamped to dark resistance
failiz Apr 26, 2023
eaa7f61
fixes #4009, switches are simulated as an open circuit when not press…
failiz Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions bins/core.fzb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,21 +93,21 @@
</views>
</instance>

<instance moduleIdRef="3234DBDC00PotentiometerModuleID" modelIndex="13" path="basic_poti.fzp">
<instance moduleIdRef="potentiometer_trimmer_12mm_5_PotentiometerModuleID" modelIndex="13" path="potentiometer_trimmer_12mm_5.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"/>
</iconView>
</views>
</instance>
<instance moduleIdRef="alps-starter-pot9mm" modelIndex="14" path="alps-starter-pot9mm.fzp">
<instance moduleIdRef="potentiometer_rotary_9mm_6_PotentiometerModuleID" modelIndex="14" path="potentiometer_rotary_9mm_6.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"/>
</iconView>
</views>
</instance>
<instance moduleIdRef="3b1a8578c21940dfe27253a7b57c81f5PotentiometerModuleID" modelIndex="14" path="pot-slider.fzp">
<instance moduleIdRef="potentiometer_slider_5_PotentiometerModuleID" modelIndex="14" path="potentiometer_slider_5.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"/>
Expand Down Expand Up @@ -177,7 +177,7 @@
</iconView>
</views>
</instance>
<instance moduleIdRef="1000ABDD10011" modelIndex="19" path="basic_fsr.fzp">
<instance moduleIdRef="force_sensor_resistor_circular_05in_5_FsrModuleID" modelIndex="19" path="force_sensor_resistor_circular_05in_5.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"/>
Expand All @@ -191,7 +191,7 @@
</iconView>
</views>
</instance>
<instance moduleIdRef="2010BBCD20113" modelIndex="20" path="LDR_photocell_300mil.fzp">
<instance moduleIdRef="2010BBCD20113PhotocellModuleID" modelIndex="20" path="LDR_photocell_300mil_v5.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"/>
Expand Down Expand Up @@ -287,7 +287,7 @@
</iconView>
</views>
</instance>
<instance moduleIdRef="d4d5af9700923b8a114f57961f29a8a0" modelIndex="24" path="led-rgb-4pin-cathode.fzp">
<instance moduleIdRef="d4d5af9700923b8a114f57961f29a8a0ColorLEDModuleID" modelIndex="24" path="led-rgb-4pin-cathode_v5.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"/>
Expand Down Expand Up @@ -437,14 +437,14 @@
</views>
</instance>

<instance moduleIdRef="4f6dc41d6d2f66341ea506cdaf0e797e_2" modelIndex="37" path="Textile Analog Pressure Sensor.fzp">
<instance moduleIdRef="textile_analog_pressure_sensor_005_pn07t5u_FsrModuleID" modelIndex="37" path="textile_analog_pressure_sensor_005.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"></geometry>
</iconView>
</views>
</instance>
<instance moduleIdRef="ab15a34dfcf83e23a26e83fe8a5a4dac_2" modelIndex="37" path="Textile Potentiometer.fzp">
<instance moduleIdRef="textile_potentiometer_005_068y7dc_PotentiometerModuleID" modelIndex="37" path="textile_potentiometer_005.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"></geometry>
Expand All @@ -458,7 +458,7 @@
</iconView>
</views>
</instance>
<instance moduleIdRef="fa46ea3312d60697b8e907a5c75db23d_2" modelIndex="37" path="Textile Stretch Sensor.fzp">
<instance moduleIdRef="textile_strech_sensor_005_qcootz4_FsrModuleID" modelIndex="37" path="textile_stretch_sensor_005.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"></geometry>
Expand Down
147 changes: 25 additions & 122 deletions bins/more/sim.fzb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@
</iconView>
</views>
</instance>
<instance moduleIdRef="1001ABDC27" modelIndex="12" path="basic_fet_p.fzp">
<instance modelIndex="12" moduleIdRef="1001ABDC27" path="basic_fet_p.fzp">
<views>
<iconView layer="icon">
<geometry z="-1" x="-1" y="-1"/>
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
Expand All @@ -79,21 +79,21 @@
</iconView>
</views>
</instance>
<instance modelIndex="13" moduleIdRef="3234DBDC00PotentiometerModuleID" path="basic_poti.fzp">
<instance modelIndex="13" moduleIdRef="potentiometer_trimmer_12mm_5_PotentiometerModuleID" path="potentiometer_trimmer_12mm_5.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="14" moduleIdRef="alps-starter-pot9mm" path="alps-starter-pot9mm.fzp">
<instance modelIndex="14" moduleIdRef="potentiometer_rotary_9mm_6_PotentiometerModuleID" path="potentiometer_rotary_9mm_6.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="14" moduleIdRef="3b1a8578c21940dfe27253a7b57c81f5PotentiometerModuleID" path="pot-slider.fzp">
<instance modelIndex="14" moduleIdRef="potentiometer_slider_5_PotentiometerModuleID" path="potentiometer_slider_5.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
Expand Down Expand Up @@ -124,15 +124,21 @@
</views>
</instance>
<!--
<instance moduleIdRef="Taiway-100-SP-X-T1-X-X-B1-M1_SPDT_miniature_toggle_switch" modelIndex="17"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="d206ca0d70364191f0b3fd30d5e53c5d" modelIndex="18" path="Tilt switch.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="1000ABDD10011" modelIndex="19" path="basic_fsr.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="fa3e296736059e8c25d88ac262af999a" modelIndex="19" path="Basic Force Sensing Resistor (FSR).fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="2010BBCD20113" modelIndex="20" path="LDR_photocell_300mil.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance>-->
<instance moduleIdRef="Taiway-100-SP-X-T1-X-X-B1-M1_SPDT_miniature_toggle_switch" modelIndex="17"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="d206ca0d70364191f0b3fd30d5e53c5d" modelIndex="18" path="Tilt switch.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="1000ABDD10011" modelIndex="19" path="basic_fsr.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="fa3e296736059e8c25d88ac262af999a" modelIndex="19" path="Basic Force Sensing Resistor (FSR).fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance>-->
<instance modelIndex="20" moduleIdRef="2010BBCD20113PhotocellModuleID" path="LDR_photocell_300mil_v5.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="20" moduleIdRef="beab33bd7feee277622ef76dd6e79e4d" path="infrared_proximity_sensor.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>

<instance modelIndex="21" moduleIdRef="fc-51_85d98481ce3be6f2e9b641181c0f798b_1" path="fc-51-IR-Sensor.fzp">
<views>
<iconView layer="icon">
Expand All @@ -158,109 +164,34 @@
</instance>´


<!--
<instance moduleIdRef="d4d5af9700923b8a114f57961f29a8a0" modelIndex="24" path="led-rgb-4pin-cathode.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="AnodeLEDSuperfluxModuleID" modelIndex="24" path="led_flux_blue_anode.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="Prolight RGB 3 Watt Star" modelIndex="24" path="LED_Prolight_RGB.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="7segment10an" modelIndex="24" path="7segment_9,9_an.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="LED_Matrix_Kingbright_TA07-11" modelIndex="24" path="LED_Matrix_Kingbright_TA07-11.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance>-->
<instance modelIndex="26" moduleIdRef="1000FADF10011leg" path="dc_motor.fzp">



<instance modelIndex="24" moduleIdRef="d4d5af9700923b8a114f57961f29a8a0ColorLEDModuleID" path="led-rgb-4pin-cathode_v5.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/></iconView>
</views>
</instance>
<!--
<instance moduleIdRef="9f2b90fcf9c65c9bc09d570e3442069e" modelIndex="28" path="solenoid.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="1099ABDE24_ST_relay" modelIndex="29" path="basic-relay.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="71d4db74a3a0ec43d9303ddffee7361b" modelIndex="29" path="DIP_Relay_D31A.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance>-->
<instance modelIndex="3" moduleIdRef="__spacer__" path="ICs">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<!--
<instance modelIndex="33" moduleIdRef="a59353bd0db0225dc22770e292c622f3" path="lm358.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="34" moduleIdRef="1001AAAB555Timer" path="555timer.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="35" moduleIdRef="1001AAACOptocoupler" path="optocoupler.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="36" moduleIdRef="a4f38a10-dd92-11dd-a3e2-001f5b3a17a4" path="h-bridge.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="36" moduleIdRef="1a7828b6466fac9fd042221e931124c4" path="74HC595.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="36" moduleIdRef="HEF4094" path="HEF4094.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance moduleIdRef="RevEd_FRM050">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance moduleIdRef="RevEd_ULN2003A">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="38" moduleIdRef="CrystalModuleID" path="crystal.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="38" moduleIdRef="37asdf3c843a2127a0e499f8a0b3ef6aCrystalModuleID" path="resonator-3pin.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="38" moduleIdRef="4001_4_x_2_input_NOR_gate_single">
<!--<instance moduleIdRef="AnodeLEDSuperfluxModuleID" modelIndex="24" path="led_flux_blue_anode.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="Prolight RGB 3 Watt Star" modelIndex="24" path="LED_Prolight_RGB.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="7segment10an" modelIndex="24" path="7segment_9,9_an.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="LED_Matrix_Kingbright_TA07-11" modelIndex="24" path="LED_Matrix_Kingbright_TA07-11.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance>-->
KjellMorgenstern marked this conversation as resolved.
Show resolved Hide resolved
<instance modelIndex="26" moduleIdRef="1000FADF10011leg" path="dc_motor.fzp">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="38" moduleIdRef="4001_4_x_2_input_NOR_gate_multipart">
<!--
<instance moduleIdRef="9f2b90fcf9c65c9bc09d570e3442069e" modelIndex="28" path="solenoid.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="1099ABDE24_ST_relay" modelIndex="29" path="basic-relay.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance><instance moduleIdRef="71d4db74a3a0ec43d9303ddffee7361b" modelIndex="29" path="DIP_Relay_D31A.fzp"><views><iconView layer="icon"><geometry z="-1" x="-1" y="-1"/></iconView></views></instance>-->
<instance modelIndex="3" moduleIdRef="__spacer__" path="ICs">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
-->
<!--
<instance modelIndex="33" moduleIdRef="a59353bd0db0225dc22770e292c622f3" path="lm358.fzp"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="34" moduleIdRef="1001AAAB555Timer" path="555timer.fzp"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="35" moduleIdRef="1001AAACOptocoupler" path="optocoupler.fzp"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="36" moduleIdRef="a4f38a10-dd92-11dd-a3e2-001f5b3a17a4" path="h-bridge.fzp"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="36" moduleIdRef="1a7828b6466fac9fd042221e931124c4" path="74HC595.fzp"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="36" moduleIdRef="HEF4094" path="HEF4094.fzp"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance moduleIdRef="RevEd_FRM050"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance moduleIdRef="RevEd_ULN2003A"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="38" moduleIdRef="CrystalModuleID" path="crystal.fzp"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="38" moduleIdRef="37asdf3c843a2127a0e499f8a0b3ef6aCrystalModuleID" path="resonator-3pin.fzp"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="38" moduleIdRef="4001_4_x_2_input_NOR_gate_single"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="38" moduleIdRef="4001_4_x_2_input_NOR_gate_multipart"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance>-->
Copy link
Member

Choose a reason for hiding this comment

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

Are the line breaks intentionally removed? Since the section is commented out, maybe it can entirely be removed?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My tool for auto-indent removes the line breaks for the commented lines. These lines are commented as these parts do not have SPICE fields currently, but they could be added more or less easily. It is a kind of TODO list for me, but we can remove them if you prefer it.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, great. I am working with someone to add more SPICE fields right now. The it would make sense to start with those parts, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yes. Stating with these ones makes sense. However, there are a few that will not be useful until we extend the simulator to work with transitory analysis, such as the 555, the HEF4094 or the 74HC595. Maybe they could be a second step.

I have a functional example of an NAND gate, but I would like to add some LEDs at the input and output to show the signals. But my model does not handle well the LEDs (the NAND gate cannot drive the LEDs). Maybe I could send it to you and the person can use it as a starting point.

<instance modelIndex="38" moduleIdRef="4011_4_x_2_input_NAND_gate_multipart">
<views>
<iconView layer="icon">
Expand All @@ -269,35 +200,7 @@
</views>
</instance>
<!--
<instance modelIndex="38" moduleIdRef="4070_4_x_2_input_XOR_gate_multipart">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="38" moduleIdRef="4071_4_x_2_input_OR_gate_multipart">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="38" moduleIdRef="4077_4_x_2_input_XNOR_gate_multipart">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
<instance modelIndex="38" moduleIdRef="4081_4_x_2_input_AND_gate_multipart">
<views>
<iconView layer="icon">
<geometry x="-1" y="-1" z="-1"/>
</iconView>
</views>
</instance>
-->
<instance modelIndex="38" moduleIdRef="4070_4_x_2_input_XOR_gate_multipart"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="38" moduleIdRef="4071_4_x_2_input_OR_gate_multipart"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="38" moduleIdRef="4077_4_x_2_input_XNOR_gate_multipart"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance><instance modelIndex="38" moduleIdRef="4081_4_x_2_input_AND_gate_multipart"><views><iconView layer="icon"><geometry x="-1" y="-1" z="-1"/></iconView></views></instance>-->
KjellMorgenstern marked this conversation as resolved.
Show resolved Hide resolved
<instance modelIndex="3" moduleIdRef="__spacer__" path="Power">
<views>
<iconView layer="icon">
Expand Down
Loading