Skip to content

Commit 5022edc

Browse files
authored
Merge pull request #254 from pathsim/feature/ctrl-blocks
Add PT1, PT2, LeadLag, RateLimiter blocks and update PID to SISO
2 parents 15f2207 + 1e7ed16 commit 5022edc

5 files changed

Lines changed: 277 additions & 36 deletions

File tree

scripts/config/pathsim/blocks.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,14 @@
2727
"ODE",
2828
"DynamicalSystem",
2929
"StateSpace",
30+
"PT1",
31+
"PT2",
32+
"LeadLag",
3033
"PID",
3134
"AntiWindupPID",
35+
"RateLimiter",
36+
"Backlash",
37+
"Deadband",
3238
"TransferFunctionNumDen",
3339
"TransferFunctionZPG",
3440
"ButterworthLowpassFilter",

scripts/generated/registry.json

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,32 @@
171171
"initial_value"
172172
]
173173
},
174+
"PT1": {
175+
"blockClass": "PT1",
176+
"importPath": "pathsim.blocks",
177+
"params": [
178+
"K",
179+
"T"
180+
]
181+
},
182+
"PT2": {
183+
"blockClass": "PT2",
184+
"importPath": "pathsim.blocks",
185+
"params": [
186+
"K",
187+
"T",
188+
"d"
189+
]
190+
},
191+
"LeadLag": {
192+
"blockClass": "LeadLag",
193+
"importPath": "pathsim.blocks",
194+
"params": [
195+
"K",
196+
"T1",
197+
"T2"
198+
]
199+
},
174200
"PID": {
175201
"blockClass": "PID",
176202
"importPath": "pathsim.blocks",
@@ -193,6 +219,30 @@
193219
"limits"
194220
]
195221
},
222+
"RateLimiter": {
223+
"blockClass": "RateLimiter",
224+
"importPath": "pathsim.blocks",
225+
"params": [
226+
"rate",
227+
"f_max"
228+
]
229+
},
230+
"Backlash": {
231+
"blockClass": "Backlash",
232+
"importPath": "pathsim.blocks",
233+
"params": [
234+
"width",
235+
"f_max"
236+
]
237+
},
238+
"Deadband": {
239+
"blockClass": "Deadband",
240+
"importPath": "pathsim.blocks",
241+
"params": [
242+
"lower",
243+
"upper"
244+
]
245+
},
196246
"TransferFunctionNumDen": {
197247
"blockClass": "TransferFunctionNumDen",
198248
"importPath": "pathsim.blocks",

src/lib/constants/dependencies.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
// Auto-generated by scripts/extract.py - DO NOT EDIT
22
// Source: scripts/config/requirements-pyodide.txt, scripts/config/pyodide.json
33

4-
export const PATHVIEW_VERSION = '0.4.5';
4+
export const PATHVIEW_VERSION = '0.6.1';
55

66
export const PYODIDE_VERSION = '0.26.2';
77
export const PYODIDE_CDN_URL = `https://cdn.jsdelivr.net/pyodide/v${PYODIDE_VERSION}/full/pyodide.mjs`;
88

99
export const PYODIDE_PRELOAD = ["numpy", "scipy", "micropip"] as const;
1010

1111
/** Package versions extracted at build time (pinned for runtime) */
12-
export const EXTRACTED_VERSIONS: Record<string, string> = {"pathsim": "0.16.5", "pathsim_chem": "0.2rc3.dev1"};
12+
export const EXTRACTED_VERSIONS: Record<string, string> = {"pathsim": "0.16.8.dev3", "pathsim_chem": "0.2rc3"};
1313

1414
export interface PackageConfig {
1515
pip: string;
@@ -21,13 +21,13 @@ export interface PackageConfig {
2121
export const PYTHON_PACKAGES: PackageConfig[] =
2222
[
2323
{
24-
"pip": "pathsim==0.16.5",
24+
"pip": "pathsim",
2525
"required": true,
2626
"pre": true,
2727
"import": "pathsim"
2828
},
2929
{
30-
"pip": "pathsim-chem>=0.2rc2",
30+
"pip": "pathsim-chem==0.2rc3",
3131
"required": false,
3232
"pre": true,
3333
"import": "pathsim_chem"

0 commit comments

Comments
 (0)