Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
44aeef9
Refactor: separated Control Panel into small files
Mar 12, 2026
927b6dc
Refactor: sperated panel W.I.P
Mar 13, 2026
b049e63
Refactor: separeted info and leds page into diferent files
Mar 16, 2026
7002a43
Refactor: changed some signal and slots connections
Mar 16, 2026
c9e7905
Add: changed timeout time to 10 minutes
Mar 17, 2026
9cf9fee
Refactor: Oganized widgets into diferent folders
Mar 17, 2026
02a87a7
refactor: separeted input shaper
Mar 17, 2026
54d9d32
bugfix: bugfix after seperation
Mar 17, 2026
3d19f00
wip: separated axis maintenece
Mar 17, 2026
fdd0442
Refactor: separated routinecheckPage
Mar 17, 2026
0fd4773
bugfix: slider size
Mar 18, 2026
eb2fa3d
bugfix: some bugs after separation
Mar 24, 2026
701db74
refactor: sperated some panels
Mar 24, 2026
960360a
add: added missing gcode
Mar 26, 2026
5d256e4
Refactor: ran ruff formantter
Mar 26, 2026
2f0af14
Merge branch 'dev' into Refactor/sperate-stackedwidget
Robert0Mart Mar 26, 2026
fdeaf6d
Bugfix: re added value after merge
Mar 26, 2026
d93d873
ADD: doc strings
Mar 26, 2026
0995a36
Refactor: added docstrings
Mar 26, 2026
517d405
Merge remote-tracking branch 'origin/dev' into Refactor/sperate-stack…
gmmcosta15 Jul 29, 2026
b30e5ca
refactor(setupUI): remove generated Qt Designer UI files and hand-wri…
gmmcosta15 Jul 29, 2026
ca23a63
refactor(ui): inline _retranslate_ui bodies into _setup_ui and drop t…
gmmcosta15 Jul 29, 2026
bd70c0c
fix(axisPage): align call_load_panel signal with the 3-arg loadscreen…
gmmcosta15 Jul 29, 2026
b0c6e44
fix(mainWindow): connect UtilitiesTab.request_back instead of the non…
gmmcosta15 Jul 29, 2026
a16bb39
Merge branch 'dev' into Refactor/sperate-stackedwidget
gmmcosta15 Jul 29, 2026
9b0cac8
chore: remove committed mutants/ output
gmmcosta15 Jul 31, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions BlocksScreen.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ host: localhost
port: 7125

[screensaver]
timeout: 5000
timeout: 600000

[usb_manager]
gcodes_dir: ~/printer_data/gcodes/

[hotspot]
ssid: PrinterHotspot
password: 123456789

[filament_presence]
object: cutter_sensor
name: extruder_cutter
name: extruder_cutter
842 changes: 354 additions & 488 deletions BlocksScreen/lib/panels/controlTab.py

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions BlocksScreen/lib/panels/filamentTab.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ def __init__(
self.amu_manager: AMUManager = amu_manager
self.amu_configured = False
self._popup_callback = None
self.ui = self.setupUi()
self.change_page(self.indexOf(self.ui))
self._setup_ui()
self.change_page(self.indexOf(self.filament_control_page))

self._previous_gate_states: dict[int, bool] = {}
self.pre_gate_idx = {}
Expand Down Expand Up @@ -881,7 +881,8 @@ def on_mmu_state_changed(self, mmu_state):
self.load_state = True
self.call_load_panel.emit(True, mmu_state.action, True)

def setupUi(self):
def _setup_ui(self) -> None:
"""Build the filament control page and add it to the stack."""
self.resize(710, 410)
self.setLayoutDirection(QtCore.Qt.LayoutDirection.LeftToRight)
widget = QtWidgets.QWidget()
Expand Down Expand Up @@ -989,6 +990,7 @@ def setupUi(self):
2, int(87.5)
) # dont ask how i got this value , it was try and repeat

self.filament_control_page = widget
self.addWidget(widget)
self.fp_header_title.setText("Filament")
self.fp_button_1.setText("Filament\nControl")
Expand Down
698 changes: 591 additions & 107 deletions BlocksScreen/lib/panels/mainWindow.py

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions BlocksScreen/lib/panels/printTab.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
from configfile import BlocksScreenConfig, get_configparser
from lib.files import Files
from lib.moonrakerComm import MoonWebSocket
from lib.panels.widgets.babystepPage import BabystepPage
from lib.panels.widgets.PrintTab.babystepPage import BabystepPage
from lib.panels.widgets.basePopup import BasePopup
from lib.panels.widgets.confirmPage import ConfirmWidget
from lib.panels.widgets.filesPage import FilesPage
from lib.panels.widgets.jobStatusPage import JobStatusWidget
from lib.panels.widgets.PrintTab.confirmPage import ConfirmWidget
from lib.panels.widgets.PrintTab.filesPage import FilesPage
from lib.panels.widgets.PrintTab.jobStatusPage import JobStatusWidget
from lib.panels.widgets.numpadPage import CustomNumpad
from lib.panels.widgets.sensorsPanel import SensorsWindow
from lib.panels.widgets.PrintTab.sensorsPanel import SensorsWindow
from lib.panels.widgets.slider_selector_page import SliderPage
from lib.panels.widgets.tunePage import TuneWidget
from lib.panels.widgets.PrintTab.tunePage import TuneWidget
from lib.printer import Printer
from lib.utils.blocks_button import BlocksCustomButton
from lib.utils.display_button import DisplayButton
Expand Down
Loading
Loading