Skip to content

Commit

Permalink
Merge pull request #459 from foxriver76/main
Browse files Browse the repository at this point in the history
allow to run gcode + login functionality + ssl functionality
  • Loading branch information
Apollon77 committed Apr 22, 2024
2 parents 4adef3a + bfd5af2 commit 7c102a6
Show file tree
Hide file tree
Showing 7 changed files with 505 additions and 374 deletions.
2 changes: 1 addition & 1 deletion .eslintrc.json
Expand Up @@ -35,6 +35,6 @@
]
},
"parserOptions": {
"ecmaVersion": 2018
"ecmaVersion": 2022
}
}
121 changes: 0 additions & 121 deletions admin/index_m.html

This file was deleted.

70 changes: 70 additions & 0 deletions admin/jsonConfig.json
@@ -0,0 +1,70 @@
{
"type": "panel",
"items": {
"customName": {
"label": "Name",
"default": "My 3D printer",
"type": "text",
"help": "Define your own printer name for this instance"
},
"klipperPort": {
"newLine": true,
"label": "Port",
"type": "number",
"default": 80
},
"klipperIP": {
"label": "IP",
"type": "text",
"default": "192.168.1.50",
"help": "IP of your Klipper installation"
},
"apiRefreshInterval": {
"newLine": true,
"label": "Refresh interval",
"default": 60,
"min": 1,
"type": "number",
"help": "in Seconds"
},
"apiRefreshIntervalOperational": {
"label": "Operational refresh interval",
"default": 30,
"min": 1,
"type": "number",
"help": "in Seconds"
},
"apiRefreshIntervalPrinting": {
"label": "Printing refresh interval",
"default": 10,
"min": 1,
"type": "number",
"help": "in Seconds"
},
"auth": {
"newLine": true,
"label": "Authenticate",
"type": "checkbox",
"default": false,
"help": "If authentication is required"
},
"useSsl": {
"type": "checkbox",
"label": "Use SSL",
"help": "If the API is reachable over https"
},
"user": {
"newLine": true,
"label": "Username",
"type": "text",
"default": "",
"hidden": "!data.auth"
},
"password": {
"label": "Password",
"type": "password",
"default": "",
"hidden": "!data.auth"
}
}
}
30 changes: 27 additions & 3 deletions io-package.json
Expand Up @@ -99,20 +99,44 @@
"connectionType": "local",
"dataSource": "poll",
"materialize": true,
"adminUI": {
"config": "json"
},
"dependencies": [
{
"js-controller": ">=2.0.0"
"js-controller": ">=4.0.0"
}
],
"globalDependencies": [
{
"admin": ">=6.0.0"
}
]
],
"tier": 2,
"licenseInformation": {
"license": "MIT",
"type": "free"
}
},
"native": {
"customName": "My 3D printer",
"klipperPort": "80",
"klipperIP": "192.168.1.50",
"apiRefreshInterval": 60,
"apiRefreshIntervalOperational": 30,
"apiRefreshIntervalPrinting": 10
"apiRefreshIntervalPrinting": 10,
"useSsl": false,
"auth": false,
"password": "",
"user": ""
},
"protectedNative": [
"user",
"password"
],
"encryptedNative": [
"password"
],
"objects": [],
"instanceObjects": [
{
Expand Down

0 comments on commit 7c102a6

Please sign in to comment.