Merge remote-tracking branch 'origin/main' into dcpm

Author: ValentinKaisermayer

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkitStandardLibrary"
 uuid = "16a59e39-deab-5bd0-87e4-056b12336739"
 authors = ["Chris Rackauckas and Julia Computing"]
-version = "1.2.1"
+version = "1.4.0"
 
 [deps]
 IfElse = "615f187c-cbe4-4ef1-ba3b-2fcf58d6d173"

README.md

@@ -6,6 +6,8 @@
 
 The ModelingToolkit Standard Library is standard library of components to model the world and beyond.
 
+![](https://user-images.githubusercontent.com/1814174/172000112-3579f5cf-c370-48c2-8047-558fbc46aeb6.png)
+
 ## Installation
 
 Assuming that you already have Julia correctly installed, it suffices to import
@@ -65,4 +67,4 @@ plot(sol, vars = [capacitor.v,resistor.i],
 savefig("plot.png")
 ```
 
-![](https://user-images.githubusercontent.com/1814174/164912983-c3f73628-0e19-4e42-b085-4f62ba6f23d1.png)
+![](https://user-images.githubusercontent.com/1814174/164912983-c3f73628-0e19-4e42-b085-4f62ba6f23d1.png)

docs/make.jl

@@ -7,6 +7,8 @@ using ModelingToolkitStandardLibrary.Magnetic.FluxTubes
 using ModelingToolkitStandardLibrary.Electrical
 using ModelingToolkitStandardLibrary.Thermal
 
+include("pages.jl")
+
 makedocs(
     sitename="ModelingToolkitStandardLibrary.jl",
     authors="Julia Computing",
@@ -24,22 +26,7 @@ makedocs(
     format=Documenter.HTML(assets=["assets/favicon.ico"],
                            canonical="https://mtkstdlib.sciml.ai/stable/"),
 
-    pages=[
-        "ModelingToolkitStandardLibrary.jl: A Standard Library for ModelingToolkit" => "index.md",
-
-        "Tutorials" => [
-            "RC Circuit" => "tutorials/rc_circuit.md",
-            "Custom Components" => "tutorials/custom_component.md",
-        ],
-
-        "API" => [
-            "Basic Blocks" => "API/blocks.md",
-            "Electrical Components" => "API/electrical.md",
-            "Magnetic Components" => "API/magnetic.md",
-            "Mechanical Components" => "API/mechanical.md",
-            "Thermal Components" => "API/thermal.md"
-        ],
-    ]
+    pages=pages
 )
 
 deploydocs(

docs/pages.jl

@@ -0,0 +1,16 @@
+pages = [
+        "ModelingToolkitStandardLibrary.jl: A Standard Library for ModelingToolkit" => "index.md",
+
+        "Tutorials" => [
+            "RC Circuit" => "tutorials/rc_circuit.md",
+            "Custom Components" => "tutorials/custom_component.md",
+        ],
+
+        "API" => [
+            "Basic Blocks" => "API/blocks.md",
+            "Electrical Components" => "API/electrical.md",
+            "Magnetic Components" => "API/magnetic.md",
+            "Mechanical Components" => "API/mechanical.md",
+            "Thermal Components" => "API/thermal.md"
+        ],
+    ]

src/Blocks/Blocks.jl

@@ -16,7 +16,7 @@ export Abs, Sign, Sqrt, Sin, Cos, Tan, Asin, Acos, Atan, Atan2, Sinh, Cosh, Tanh
 export Log, Log10
 include("math.jl")
 
-export Constant, Sine, Cosine, ContinuousClock, Ramp, Step, ExpSine
+export Constant, Sine, Cosine, ContinuousClock, Ramp, Step, ExpSine, Square, Triangular
 include("sources.jl")
 
 export Limiter, DeadZone, SlewRateLimiter