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 1 commit
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
2 changes: 1 addition & 1 deletion bins/core.fzb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 9 additions & 1 deletion bins/more/sim.fzb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,14 @@
</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">
Expand Down Expand Up @@ -159,6 +166,7 @@




<instance modelIndex="24" moduleIdRef="d4d5af9700923b8a114f57961f29a8a0ColorLEDModuleID" path="led-rgb-4pin-cathode_v5.fzp">
<views>
<iconView layer="icon">
Expand Down
79 changes: 79 additions & 0 deletions core/LDR_photocell_300mil_v5.fzp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8"?><module fritzingVersion="0.3.7b.08.26.3377" moduleId="2010BBCD20113PhotocellModuleID">
<version>5</version>
<title>Photocell (LDR)</title>
<label>R</label>
<date>2010-04-06</date>
<tags>
<tag>LDR</tag>
<tag>light dependent resistor</tag>
<tag>photocell</tag>
<tag>light sensor</tag>
<tag>sensor</tag>
<tag>Fritzing core</tag>
</tags>
<properties>
<property name="dark resistance @0.01lx">300k&#937;</property>
<property name="family">Photo-Resistor</property>
<property name="light resistance @100lx">400&#937;</property>
<property name="luminance">10lx</property>
<property name="power">0.25W</property>
<property name="package">THT</property>
</properties>
<description>A generic light dependent resistor (LDR)</description>
<spice>
<line>R{instanceTitle} {net connector0} {net connector1} {(({luminance}/0.01)**(log({light resistance @100lx}/{dark resistance @0.01lx})/ln(10)/4))*{dark resistance @0.01lx}}</line>
</spice>
<views>
<iconView>
<layers image="icon/basic_ldr.svg">
<layer layerId="icon"/>
</layers>
</iconView>
<breadboardView>
<layers image="breadboard/ldr.svg">
<layer layerId="breadboard"/>
</layers>
</breadboardView>
<schematicView>
<layers image="schematic/ldr.svg">
<layer layerId="schematic"/>
</layers>
</schematicView>
<pcbView>
<layers image="pcb/axial_lay_2_300mil_pcb.svg">
<layer layerId="copper0"/>
<layer layerId="silkscreen"/>
<layer layerId="copper1"/></layers>
</pcbView>
</views>
<connectors>
<connector id="connector0" name="pin 0" type="male">
<description>pin0</description>
<views>
<breadboardView>
<p layer="breadboard" svgId="connector0pin" legId="connector0leg"/>
</breadboardView>
<schematicView>
<p layer="schematic" svgId="connector0pin" terminalId="connector0terminal"/>
</schematicView>
<pcbView>
<p layer="copper0" svgId="connector0pin"/>
<p layer="copper1" svgId="connector0pin"/></pcbView>
</views>
</connector>
<connector id="connector1" name="pin 1" type="male">
<description>pin1</description>
<views>
<breadboardView>
<p layer="breadboard" svgId="connector1pin" legId="connector1leg"/>
</breadboardView>
<schematicView>
<p layer="schematic" svgId="connector1pin" terminalId="connector1terminal"/>
</schematicView>
<pcbView>
<p layer="copper0" svgId="connector1pin"/>
<p layer="copper1" svgId="connector1pin"/></pcbView>
</views>
</connector>
</connectors>
</module>
4 changes: 2 additions & 2 deletions core/LDR_photocell_300mil.fzp → obsolete/LDR_photocell_300mil_v4.fzp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><module fritzingVersion="0.3.7b.08.26.3377" moduleId="2010BBCD20113">
<version>4</version>
<version replacedby="2010BBCD20113PhotocellModuleID">4</version>
<title>Photocell (LDR)</title>
<label>R</label>
<date>2010-04-06</date>
Expand All @@ -13,7 +13,7 @@
</tags>
<properties>
<property name="resistance@ dark">300 kOhms@ 10 seconds</property>
<property name="family">Photo-Resistor</property>
<property name="family">//obsolete//Photo-Resistor</property>
KjellMorgenstern marked this conversation as resolved.
Show resolved Hide resolved
<property name="resistance@ luminance">16 kOhms@ 10 lux</property>
<property name="package">THT</property></properties>
<description>A generic light dependent resistor (LDR)</description>
Expand Down