Merge remote-tracking branch 'origin/main' into optimized-prime-tower

This commit is contained in:
Erwan MATHIEU 2024-01-18 09:41:53 +01:00
commit 660a593872
58 changed files with 72 additions and 58 deletions

View file

@ -58,7 +58,7 @@ jobs:
enterprise: ${{ github.event.inputs.enterprise == 'true' }}
staging: ${{ github.event.inputs.staging == 'true' }}
architecture: X64
operating_system: windows-2022
operating_system: self-hosted-Windows-X64
secrets: inherit
linux-installer:

View file

@ -34,9 +34,10 @@ on:
operating_system:
description: 'OS'
required: true
default: 'windows-2022'
default: 'self-hosted-Windows-X64'
type: choice
options:
- self-hosted-Windows-X64
- windows-2022
jobs:

View file

@ -40,6 +40,7 @@ class AuthorizationHelpers:
"""
data = {
"client_id": self._settings.CLIENT_ID if self._settings.CLIENT_ID is not None else "",
"client_secret": self._settings.CLIENT_SECRET if self._settings.CLIENT_SECRET is not None else "",
"redirect_uri": self._settings.CALLBACK_URL if self._settings.CALLBACK_URL is not None else "",
"grant_type": "authorization_code",
"code": authorization_code,
@ -64,6 +65,7 @@ class AuthorizationHelpers:
Logger.log("d", "Refreshing the access token for [%s]", self._settings.OAUTH_SERVER_URL)
data = {
"client_id": self._settings.CLIENT_ID if self._settings.CLIENT_ID is not None else "",
"client_secret": self._settings.CLIENT_SECRET if self._settings.CLIENT_SECRET is not None else "",
"redirect_uri": self._settings.CALLBACK_URL if self._settings.CALLBACK_URL is not None else "",
"grant_type": "refresh_token",
"refresh_token": refresh_token,

View file

@ -31,20 +31,24 @@ class AuthorizationService:
account information.
"""
# Emit signal when authentication is completed.
onAuthStateChanged = Signal()
def __init__(self,
settings: "OAuth2Settings",
preferences: Optional["Preferences"] = None,
callback_auth_data_retrieved: Callable[[], None] = None) -> None:
# Emit signal when authentication is completed.
self.onAuthStateChanged = Signal()
# Emit signal when authentication failed.
onAuthenticationError = Signal()
# Emit signal when authentication failed.
self.onAuthenticationError = Signal()
accessTokenChanged = Signal()
self.accessTokenChanged = Signal()
def __init__(self, settings: "OAuth2Settings", preferences: Optional["Preferences"] = None) -> None:
self._settings = settings
self._auth_helpers = AuthorizationHelpers(settings)
self._auth_url = "{}/authorize".format(self._settings.OAUTH_SERVER_URL)
self._auth_data: Optional[AuthenticationResponse] = None
self._user_profile: Optional["UserProfile"] = None
self._callback_auth_data_retrieved = self.getUserProfile if callback_auth_data_retrieved is None else callback_auth_data_retrieved
self._preferences = preferences
self._server = LocalAuthorizationServer(self._auth_helpers, self._onAuthStateChanged, daemon=True)
self._currently_refreshing_token = False # Whether we are currently in the process of refreshing auth. Don't make new requests while busy.
@ -294,7 +298,7 @@ class AuthorizationService:
self._auth_data = auth_data
self._currently_refreshing_token = False
if auth_data:
self.getUserProfile()
self._callback_auth_data_retrieved()
self._preferences.setValue(self._settings.AUTH_DATA_PREFERENCE_KEY, json.dumps(auth_data.dump()))
else:
Logger.log("d", "Clearing the user profile")

View file

@ -16,6 +16,7 @@ class OAuth2Settings(BaseModel):
CALLBACK_PORT = None # type: Optional[int]
OAUTH_SERVER_URL = None # type: Optional[str]
CLIENT_ID = None # type: Optional[str]
CLIENT_SECRET = None # type: Optional[str]
CLIENT_SCOPES = None # type: Optional[str]
CALLBACK_URL = None # type: Optional[str]
AUTH_DATA_PREFERENCE_KEY = "" # type: str

View file

@ -361,8 +361,10 @@
"raft_interface_line_width": { "value": 0.7 },
"raft_interface_speed": { "value": 90 },
"raft_interface_thickness": { "value": 0.3 },
"raft_margin": { "value": 3 },
"raft_interface_wall_count": { "value": "raft_wall_count" },
"raft_margin": { "value": 1.2 },
"raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" },
"raft_surface_wall_count": { "value": "raft_wall_count" },
"retraction_amount": { "value": 0.75 },
"retraction_combing": { "value": "'off'" },
"retraction_combing_max_distance": { "value": "speed_travel / 10" },

View file

@ -12,6 +12,7 @@ variant = AA 0.25
weight = 0
[values]
cool_fan_speed_0 = 0
material_print_temperature = =default_material_print_temperature - 20
speed_topbottom = =math.ceil(speed_print * 30 / 55)
support_bottom_distance = =support_z_distance

View file

@ -12,6 +12,7 @@ variant = AA 0.25
weight = 0
[values]
cool_fan_speed_0 = 0
material_print_temperature = =default_material_print_temperature - 20
speed_topbottom = =math.ceil(speed_print * 30 / 55)
support_bottom_distance = =support_z_distance

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -51,7 +51,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -56,7 +56,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 75
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 50
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -55,7 +55,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -54,7 +54,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 75
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -54,7 +54,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 50
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -56,7 +56,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 65
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 45
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -56,7 +56,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 65
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 45
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -12,6 +12,7 @@ variant = AA 0.25
weight = 0
[values]
cool_fan_speed_0 = 0
material_print_temperature = =default_material_print_temperature - 20
speed_topbottom = =math.ceil(speed_print * 30 / 55)
support_bottom_distance = =support_z_distance

View file

@ -12,6 +12,7 @@ variant = AA 0.25
weight = 0
[values]
cool_fan_speed_0 = 0
material_print_temperature = =default_material_print_temperature - 20
speed_topbottom = =math.ceil(speed_print * 30 / 55)
support_bottom_distance = =support_z_distance

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -51,7 +51,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -52,7 +52,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -56,7 +56,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 75
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 50
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -55,7 +55,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -54,7 +54,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 75
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -54,7 +54,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 50
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -56,7 +56,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 65
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 30
speed_prime_tower = =speed_wall_0
speed_print = 45
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -56,7 +56,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 100
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 65
speed_roofing = =math.ceil(speed_wall*(45/100))

View file

@ -53,7 +53,7 @@ small_skin_on_surface = False
small_skin_width = 4
speed_infill = =speed_print
speed_ironing = 20
speed_layer_0 = =speed_roofing
speed_layer_0 = 26
speed_prime_tower = =speed_wall_0
speed_print = 45
speed_roofing = =math.ceil(speed_wall*(45/100))