Compare commits

...

4 Commits

19 changed files with 152 additions and 73 deletions

View File

@ -1,5 +1,3 @@
live_config_reload = true
working_directory = "None"
[bell]
animation = "EaseOutExpo"
@ -602,3 +600,7 @@ lines = 0
[window.padding]
x = 4
y = 4
[general]
live_config_reload = true
working_directory = "None"

View File

@ -0,0 +1,5 @@
sync_info = create
user_id =
setting_id =
base_id = GFSA04
updated_time = 1734886086

View File

@ -0,0 +1,13 @@
{
"filament_flow_ratio": [
"0.955"
],
"filament_settings_id": [
"Voron Overture PETG"
],
"from": "User",
"inherits": "Voron Generic PETG",
"is_custom_defined": "0",
"name": "Voron Overture PETG",
"version": "2.2.0.4"
}

View File

@ -1,4 +1,4 @@
sync_info = create
sync_info = update
user_id =
setting_id =
base_id = GM001

View File

@ -2,7 +2,9 @@
"from": "User",
"inherits": "Voron 2.4 350 0.4 nozzle",
"is_custom_defined": "0",
"machine_start_gcode": "PRINT_START BED_TEMP=[bed_temperature_initial_layer_single] EXTRUDER_TEMP=[nozzle_temperature_initial_layer]",
"name": "AquaVoron 2.4 350 0.4 nozzle",
"print_host": "192.168.20.21",
"printer_settings_id": "AquaVoron 2.4 350 0.4 nozzle",
"version": "1.8.0.0"
}

View File

@ -1,4 +1,4 @@
sync_info = create
sync_info = update
user_id =
setting_id =
base_id = GM003

View File

@ -2,7 +2,12 @@
"from": "User",
"inherits": "Voron 2.4 350 0.6 nozzle",
"is_custom_defined": "0",
"machine_start_gcode": "PRINT_START BED_TEMP=[bed_temperature_initial_layer_single] EXTRUDER_TEMP=[nozzle_temperature_initial_layer]",
"name": "AquaVoron 2.4 350 0.6 nozzle",
"print_host": "http://192.168.20.21",
"printer_settings_id": "AquaVoron 2.4 350 0.6 nozzle",
"retraction_length": [
"0.1"
],
"version": "1.8.0.0"
}

View File

@ -77,6 +77,9 @@
"wipe": [
"0"
],
"z_hop": [
"0"
],
"z_hop_types": [
"Auto Lift"
]

View File

@ -0,0 +1,5 @@
sync_info =
user_id =
setting_id =
base_id = GP004
updated_time = 1735702877

View File

@ -0,0 +1,9 @@
{
"brim_type": "no_brim",
"from": "User",
"inherits": "0.18mm Fine 0.6 nozzle @Voron",
"is_custom_defined": "0",
"name": "0.18mm Fine 0.6 nozzle @Voron - AquaMorph",
"print_settings_id": "0.18mm Fine 0.6 nozzle @Voron - AquaMorph",
"version": "2.2.0.4"
}

View File

@ -25,6 +25,7 @@
"print_settings_id": "0.20mm Standard CR-10s",
"sparse_infill_density": "30%",
"sparse_infill_line_width": "107%",
"sparse_infill_pattern": "adaptivecubic",
"sparse_infill_speed": "60",
"support_interface_speed": "30",
"support_line_width": "95%",

View File

@ -0,0 +1,5 @@
sync_info =
user_id =
setting_id =
base_id = GP004
updated_time = 1736606291

View File

@ -0,0 +1,9 @@
{
"brim_type": "no_brim",
"from": "User",
"inherits": "0.30mm Standard 0.6 nozzle @Voron",
"is_custom_defined": "0",
"name": "0.30mm Standard 0.6 nozzle @Voron - AquaMorph",
"print_settings_id": "0.30mm Standard 0.6 nozzle @Voron - AquaMorph",
"version": "2.2.0.4"
}

View File

@ -33,9 +33,9 @@ def getURLId(url):
# getURLVersion() returns the url version number.
def getURLVersion(url):
if 'Beta' in url['downloadTitle']:
beta = re.search('Beta \d+', url['downloadTitle'])
beta = re.search('Beta \\d+', url['downloadTitle'])
if beta:
beta = re.search('\d+', beta.group()).group()
beta = re.search('\\d+', beta.group()).group()
else:
beta = '99'
return '{}.{}.{}.{}'.format(url['major'], url['minor'], url['releaseNum'], beta)

View File

@ -5,6 +5,20 @@
# Import library
source $(dirname ${BASH_SOURCE[0]})/install-lib.sh
# Graphics card fix
function graphicsCardFix() {
sudo rm /etc/OpenCL/vendors/mesa.icd
sudo rm /etc/OpenCL/vendors/pocl.icd
}
# gLib fix
function glibFix() {
sudo mkdir /opt/resolve/libs/_disabled
sudo mv /opt/resolve/libs/libglib-2.0.so* /opt/resolve/libs/_disabled
sudo mv /opt/resolve/libs/libgio-2.0.so* /opt/resolve/libs/_disabled
sudo mv /opt/resolve/libs/libgmodule-2.0.so* /opt/resolve/libs/_disabled
}
versionFile=/opt/resolve/version.txt
resolveVersion=$(cat /opt/resolve/docs/ReadMe.html | grep 'DaVinci Resolve Studio' | filterVersion)
@ -77,18 +91,12 @@ if [ ! -f ./*${installerName}_Linux.run ]; then
fi
echo "Installing ./*${installerName}_Linux.run"
chmod +x ./*${installerName}_Linux.run
sudo ./*${installerName}_Linux.run -i -y
sudo SKIP_PACKAGE_CHECK=1 ./*${installerName}_Linux.run -i -y
# Version number backup
sudo echo $urlVersion > $versionFile
# Graphics card fix
sudo rm /etc/OpenCL/vendors/mesa.icd
sudo rm /etc/OpenCL/vendors/pocl.icd
# gLib fix
sudo mkdir /opt/resolve/libs/_disabled
sudo mv /opt/resolve/libs/libglib-2.0.so* /opt/resolve/libs/_disabled
glibFix
# Keyboard mapping fix
setxkbmap -option 'caps:super'

View File

@ -1,14 +0,0 @@
wireplumber.components = [
{
name = /home/aqua/.config/wireplumber/scripts/auto-connect-ports.lua,
type = script/lua
provides = custom.my-script
}
]
wireplumber.profiles = {
main = {
custom.my-script = required
}
}

View File

@ -0,0 +1,13 @@
wireplumber.components = [
{
name = auto-connect-ports.lua, type = script/lua
provides = custom.auto-connect-ports
}
]
wireplumber.profiles = {
main = {
custom.auto-connect-ports = required
}
}

View File

@ -7,7 +7,7 @@
-- Link two ports together
function link_port(output_port, input_port)
if not input_port or not output_port then
return false
return nil
end
local link_args = {
@ -29,42 +29,7 @@ function link_port(output_port, input_port)
local link = Link("link-factory", link_args)
link:activate(1)
return true
end
function delete_link(link_om, output_port, input_port)
print("Trying to delete")
if not input_port or not output_port then
print("No ports")
return false
end
local link = link_om:lookup {
Constraint {
"link.input.node", "equals", input_port.properties["node.id"]
},
Constraint {
"link.input.port", "equals", input_port.properties["object.id"],
},
Constraint {
"link.output.node", "equals", output_port.properties["node.id"],
},
Constraint {
"link.output.port", "equals", output_port.properties["object.id"],
}
}
if not link then
print("No link!")
return
end
print("Deleting link!")
link:request_destroy()
return link
end
-- Automatically link ports together by their specific audio channels.
@ -107,6 +72,8 @@ function auto_connect_ports(args)
}
}
local links = {}
local input_om = ObjectManager {
Interest {
type = "port",
@ -131,22 +98,40 @@ function auto_connect_ports(args)
Constraint { "port.direction", "equals", "in" }
}
}
end
function _connect()
local delete_links = unless and unless:get_n_objects() > 0
print("Delete links", delete_links)
if delete_links then
for _i, link in pairs(links) do
link:request_destroy()
end
for output_name, input_name in pairs(args.connect) do
local output = output_om:lookup { Constraint { "audio.channel", "equals", output_name } }
local input = input_om:lookup { Constraint { "audio.channel", "equals", input_name } }
links = {}
return
end
for output_name, input_names in pairs(args.connect) do
local input_names = input_names[1] == nil and { input_names } or input_names
if delete_links then
delete_link(all_links, output, input)
else
link_port(output, input)
-- Iterate through all the output ports with the correct channel name
for output in output_om:iterate { Constraint { "audio.channel", "equals", output_name } } do
for _i, input_name in pairs(input_names) do
-- Iterate through all the input ports with the correct channel name
for input in input_om:iterate { Constraint { "audio.channel", "equals", input_name } } do
-- Link all the nodes
local link = link_port(output, input)
if link then
table.insert(links, link)
end
end
end
end
end
end
end
@ -166,10 +151,12 @@ function auto_connect_ports(args)
end
end
-- pw-cli list-objects | grep object.path
-- Connect to speakers
auto_connect_ports {
output = Constraint { "object.path", "matches", "speakers:*" },
input = Constraint { "object.path", "matches", "alsa:pcm:2:hw:2,0:playback:*" },
input = Constraint { "object.path", "matches", "alsa:acp:C8Pre:0:playback:*" },
connect = {
["FL"] = "AUX0",
["FR"] = "AUX1"

View File

@ -0,0 +1,26 @@
-- Dump all Wireplumber ports
function dump(o)
if type(o) == 'table' then
local s = '{ '
for k,v in pairs(o) do
if type(k) ~= 'number' then k = '"'..k..'"' end
s = s .. '['..k..'] = ' .. dump(v) .. ',\n'
end
return s .. '} '
else
return tostring(o)
end
end
local port_om = ObjectManager {
Interest {
type = "port",
}
}
port_om:connect("object-added", function (om, port)
print(dump(port.properties) .. '\n\n')
end)
port_om:activate()