Merge commit 'a0ec5a296edf38004d7dd3e851f5a756e63fc1e5' into devel
This commit is contained in:
thelastWallE
commit
20eb9388f5
|
|
@ -0,0 +1,12 @@
|
|||
name: FakeAction
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Run a one-line script
|
||||
run: echo ping
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
name: 'Close stale issues and PRs'
|
||||
on:
|
||||
schedule:
|
||||
- cron: '30 1 * * *'
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
stale:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Close Stale Issues
|
||||
uses: actions/stale@v3.0.18
|
||||
with:
|
||||
# Token for the repository. Can be passed in using `{{ secrets.GITHUB_TOKEN }}`.
|
||||
# repo-token: ${{ github.token }}
|
||||
stale-issue-message: 'This issue is stale because it has been open 30 days with no activity. Remove stale label or comment or this will be closed in 5 days.'
|
||||
days-before-stale: 30
|
||||
days-before-close: 5
|
||||
|
|
@ -11,3 +11,5 @@ dist
|
|||
*.bak
|
||||
.vscode
|
||||
.vscode/**
|
||||
|
||||
thunder-tests
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
## Fork information:
|
||||
- This is forked from [the original](https://github.com/mmone/OctoprintKlipperPlugin) version 0.2.5
|
||||
- The fork now supports Python3 (hopefully without any new bugs)
|
||||
- The current version is 0.3.5 and includes the pull requests left on the old plugin page that fixes several bugs and Themify support.
|
||||
|
||||
|
||||
## Fork Installation Information:
|
||||
- Uninstall any other versions of the plugin using Plugin Manager or other means, as necessary.
|
||||
|
|
@ -47,7 +46,7 @@ Also for the moment this plugin does what I wanted it to do, it is far from fini
|
|||
|
||||
The [devel](https://github.com/thelastWallE/OctoprintKlipperPlugin/tree/devel) branch is the branch to merge new features and bugfixes to.
|
||||
The [rc](https://github.com/thelastWallE/OctoprintKlipperPlugin/tree/rc) branch is for Release Candidates and bugfixing them.
|
||||
The [master](https://github.com/thelastWallE/OctoprintKlipperPlugin/tree/master) branch is for Stable Releases.
|
||||
The [master](https://github.com/thelastWallE/OctoprintKlipperPlugin/tree/master) branch is for Stable Releases.
|
||||
|
||||
|
||||
## Screenshots
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
2021-05-06: another day another work on highlighter
|
||||
2021-05-05: update highlighter
|
||||
2021-05-04: work on ace highlighter
|
||||
2021-05-04: update for sensor AD597
|
||||
2021-05-04: shortStatus on sidebar -styling
|
||||
2021-04-26: check values for xyz offsets
|
||||
2021-04-26: more highlight work -closes #48
|
||||
2021-04-15: add probe for z-endstop
|
||||
2021-04-14: fix for config lines with =
|
||||
2021-04-13: fix for config lines with =
|
||||
2021-04-13: more syntax highlighting
|
||||
2021-04-13: more syntax highlighting
|
||||
2021-04-12: improve syntaxhighlight
|
||||
2021-04-11: css
|
||||
2021-04-11: -zooming on editor todo: editor is taking whole dialog
|
||||
2021-04-07: added parsingCheck Checkbox -Strict mode disabled for parsing checks -reworked debug messages
|
||||
2021-04-01: add newline
|
||||
2021-04-01: work on offset dialog -show offset command in the logger -hide the offsetdialog
|
||||
|
|
@ -11,6 +11,8 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
include: "#single_line_comment"
|
||||
}, {
|
||||
include: "#config_block"
|
||||
}, {
|
||||
include: "#config_line_sensor"
|
||||
}, {
|
||||
include: "#config_line"
|
||||
}, {
|
||||
|
|
@ -22,13 +24,10 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
}],
|
||||
"#single_line_comment": [{
|
||||
token: "comment.line.number-sign",
|
||||
regex: /([^\*]|^)#[^\*].*/
|
||||
regex: /(?!#\*#)([^\*]|^)#[^\*].*/
|
||||
}, {
|
||||
token: "comment.line.gcode",
|
||||
regex: /;.*$/
|
||||
}, {
|
||||
token: "comment.line.number-sign",
|
||||
regex: /^(#\*#)/
|
||||
}],
|
||||
"#number": [{
|
||||
token: "constant.numeric",
|
||||
|
|
@ -61,10 +60,10 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
}]
|
||||
}],
|
||||
"#config_block": [{
|
||||
token: "text",
|
||||
token: "storage.type",
|
||||
regex: /\[/,
|
||||
push: [{
|
||||
token: "text",
|
||||
token: "storage.type",
|
||||
regex: /\]/,
|
||||
next: "pop"
|
||||
}, {
|
||||
|
|
@ -77,7 +76,7 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
}],
|
||||
"#known_config_block_name": [{
|
||||
token: "storage.type",
|
||||
regex: /\b(?:ad5206|adc_temperature|bed_mesh|bed_screws|bed_tilt|bltouch|board_pins|controller_fan|delayed_gcode|delta_calibrate|display|display_data|display_template|dotstar|dual_carriage|endstop_phase|extruder_stepper|extruder[1-9]{0,1}|fan|filament_switch_sensor|firmware_retraction|force_move|gcode_arcs|gcode_button|gcode_macro|hall_filament_width_sensor|heater_bed|heater_fan|heater_generic|homing_heaters|homing_override|idle_timeout|include|manual_stepper|mcp4018|mcp4451|mcp4728|mcu|menu|multi_pin|neopixel|output_pin|pause_resume|printer|probe|quad_gantry_level|replicape|respond|safe_z_home|samd_sercom|screws_tilt_adjust|servo|skew_correction|static_digital_output|stepper_(?:bed|arm|[abcdxy]|z[1-9]{0,1})|sx1509|temperature_fan|temperature_sensor|thermistor|tsl1401cl_filament_width_sensor|verify_heater|virtual_sdcard|z_tilt)\b/,
|
||||
regex: /\b(?:ad5206|adxl345|input_shaper|resonance_tester|adc_temperature|bed_mesh|bed_screws|bed_tilt|bltouch|board_pins|controller_fan|delayed_gcode|delta_calibrate|display|display_data|display_template|dotstar|dual_carriage|endstop_phase|extruder_stepper|extruder[1-9]{0,1}|fan|filament_switch_sensor|firmware_retraction|force_move|gcode_arcs|gcode_button|gcode_macro|hall_filament_width_sensor|heater_bed|heater_fan|heater_generic|homing_heaters|homing_override|idle_timeout|include|manual_stepper|mcp4018|mcp4451|mcp4728|mcu|menu|multi_pin|neopixel|output_pin|pause_resume|printer|probe|quad_gantry_level|replicape|respond|safe_z_home|samd_sercom|screws_tilt_adjust|servo|skew_correction|static_digital_output|stepper_(?:bed|arm|[abcdxy]|z[1-9]{0,1})|sx1509|temperature_fan|temperature_sensor|thermistor|tsl1401cl_filament_width_sensor|verify_heater|virtual_sdcard|z_tilt)\b/,
|
||||
caseInsensitive: true
|
||||
}],
|
||||
"#known_driver_type": [{
|
||||
|
|
@ -122,6 +121,21 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
regex: /\b(?:lagrange|bicubic)\b/,
|
||||
caseInsensitive: true
|
||||
}],
|
||||
"#known_samples_result_type": [{
|
||||
token: "support.type",
|
||||
regex: /\b(?:median|average)\b/,
|
||||
caseInsensitive: true
|
||||
}],
|
||||
"#known_shaper_type": [{
|
||||
token: "support.type",
|
||||
regex: /\b(?:zv|mzv|zvd|ei|2hump_ei|and|3hump_ei)\b/,
|
||||
caseInsensitive: true
|
||||
}],
|
||||
"#known_axel_chip": [{
|
||||
token: "support.type",
|
||||
regex: /\b(?:adxl345)\b/,
|
||||
caseInsensitive: true
|
||||
}],
|
||||
"#known_display_type": [{
|
||||
token: "support.type",
|
||||
regex: /\b(?:hd44780|st7920|uc1701|ssd1306|emulated_st7920|sh1106)\b/,
|
||||
|
|
@ -138,15 +152,15 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
}],
|
||||
"#pin": [{
|
||||
token: "support.type",
|
||||
regex: /[\^~!]*(?:EXP|ar|analog)\d{1,2}|(?:probe:z_virtual_endstop)/,
|
||||
regex: /[\^~!]*(?:EXP|ar|analog)\d{1,2}|(?:probe:z_virtual_endstop|rpi:)/,
|
||||
caseInsensitive: true
|
||||
}, {
|
||||
token: "support.type",
|
||||
regex: /(?:(_\d{1,2}))/,
|
||||
regex: /(?:(_\d{1,2}=?))/,
|
||||
caseInsensitive: true
|
||||
}, {
|
||||
token: "support.type",
|
||||
regex: /(?:\b)[\^~!]*(?:z:)?[a-z]{1,2}\d{1,2}(?:\.\d{1,2})?/,
|
||||
regex: /[\^~!]*(?:z:)?[a-zA-Z]{1,2}\d{1,2}(?:\.\d{1,2})?/,
|
||||
caseInsensitive: true
|
||||
}],
|
||||
"#config_line_start_gcode": [{
|
||||
|
|
@ -154,7 +168,7 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
regex: /^(gcode)(\s*[:=]\s*)/,
|
||||
push: [{
|
||||
token: "text",
|
||||
regex: /(?=(\[))/,
|
||||
regex: /(?=(\[|#\*#))/,
|
||||
next: "start"
|
||||
}, {
|
||||
include: "#gcode_line"
|
||||
|
|
@ -162,9 +176,9 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
include: "#single_line_comment"
|
||||
}]
|
||||
}],
|
||||
"#config_line": [{
|
||||
token: ["variable.name", "variable.name", "variable.name", "variable.name"],
|
||||
regex: /(?!(gcode))(?!(sensor_type))(\w+)(\s*[:]\s*)/,
|
||||
"#config_line_sensor": [{
|
||||
token: ["variable.name", "variable.name"],
|
||||
regex: /(sensor_type)(\s*[:]\s*)/,
|
||||
push: [{
|
||||
token: "text",
|
||||
regex: /$/,
|
||||
|
|
@ -173,6 +187,17 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
include: "#known_thermistor_type"
|
||||
}, {
|
||||
include: "#known_extruder_sensor_type"
|
||||
}, {
|
||||
include: "#single_line_comment"
|
||||
}]
|
||||
}],
|
||||
"#config_line": [{
|
||||
token: ["variable.name", "variable.name"],
|
||||
regex: /(?!gcode|sensor_type|rpi:)(\w+)(\s*[:]\s*)/,
|
||||
push: [{
|
||||
token: "text",
|
||||
regex: /$/,
|
||||
next: "pop"
|
||||
}, {
|
||||
include: "#known_control_type"
|
||||
}, {
|
||||
|
|
@ -183,6 +208,12 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
include: "#known_screws_type"
|
||||
}, {
|
||||
include: "#known_algo_type"
|
||||
}, {
|
||||
include: "#known_samples_result_type"
|
||||
}, {
|
||||
include: "#known_shaper_type"
|
||||
}, {
|
||||
include: "#known_axel_chip"
|
||||
}, {
|
||||
include: "#pin"
|
||||
}, {
|
||||
|
|
@ -197,21 +228,6 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
include: "#single_line_comment"
|
||||
}]
|
||||
}],
|
||||
"#config_line_sensor": [{
|
||||
token: ["variable.name", "variable.name", "variable.name", "variable.name"],
|
||||
regex: /(?!(gcode))(?=(sensor_type))(\w+)(\s*[:]\s*)/,
|
||||
push: [{
|
||||
token: "text",
|
||||
regex: /$/,
|
||||
next: "pop"
|
||||
}, {
|
||||
include: "#known_thermistor_type"
|
||||
}, {
|
||||
include: "#known_extruder_sensor_type"
|
||||
}, {
|
||||
include: "#single_line_comment"
|
||||
}]
|
||||
}],
|
||||
// For multiple keys on one line eg.: ^EXP1_5, ^EXP1_3
|
||||
"#config_line_display": [{
|
||||
token: ["variable.name", "variable.name", "variable.name"],
|
||||
|
|
@ -257,7 +273,7 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
}],
|
||||
"#gcode_command": [{
|
||||
token: ["text", "keyword.operator"],
|
||||
regex: /^(\s*)([A-z]+)(?![A-z])/,
|
||||
regex: /(\s*)([A-z]+)(?![A-z])/,
|
||||
caseInsensitive: true,
|
||||
push: [{
|
||||
token: "text",
|
||||
|
|
@ -271,7 +287,7 @@ ace.define("ace/mode/klipper_config_highlight_rules",[], function(require, expor
|
|||
}],
|
||||
"#gcode_parameter": [{
|
||||
token: "variable.parameter",
|
||||
regex: /\b[A-z]+(?![a-z])|(?:<---------------------- SAVE_CONFIG ---------------------->)|(?:\sDO NOT EDIT THIS BLOCK OR BELOW\. The contents are auto\-generated\.)/,
|
||||
regex: /\b[A-z]+(?![a-z])/,
|
||||
caseInsensitive: true,
|
||||
push: [{
|
||||
token: "text",
|
||||
|
|
|
|||
Loading…
Reference in New Issue