germano laptop
a8cfd52557
Merge remote-tracking branch 'origin/master'
2025-01-24 09:10:15 +01:00
germano laptop
51b1529c12
dev
2025-01-24 09:09:55 +01:00
germano laptop
d99922c1b9
dev
2025-01-24 08:23:45 +01:00
germano laptop
944266ecb9
dev
2025-01-24 08:21:22 +01:00
gg
78c95b51f2
Merge remote-tracking branch 'origin/master'
2025-01-23 18:33:51 +01:00
gg
fa4112c001
hikrobot dual smart cam test wip
2025-01-23 18:33:40 +01:00
neonb
fbfe07b3cb
dev pipe
2025-01-23 17:27:43 +01:00
gg
0f28ff4218
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/ui/recipe_spec_and_step_editor/recipe_spec_and_step_editor.py
2025-01-23 16:51:04 +01:00
gg
410e1fef3f
hikrobot dual smart cam test wip
2025-01-23 16:49:51 +01:00
neonb
4a6fa63ef7
dev pipe
2025-01-23 16:15:49 +01:00
neonb
3b9cefc009
dev pipe
2025-01-23 15:35:10 +01:00
561ab6c84d
dev
2025-01-23 11:15:13 +01:00
neonb
47b9d8aa4f
Merge remote-tracking branch 'origin/master'
2025-01-23 10:58:29 +01:00
neonb
3de4e2695f
dev pipe
2025-01-23 10:58:14 +01:00
gg
2d92ab9555
hikrobot dual smart camera test OK
2025-01-22 19:01:57 +01:00
gg
240373973d
Merge remote-tracking branch 'origin/master'
2025-01-22 16:25:52 +01:00
gg
15decde342
hikrobot sc finally got the image
2025-01-22 16:25:39 +01:00
neonb
6bfb62a6e8
dev pip_gif
2025-01-22 15:21:08 +01:00
eb79ba6b72
dev
2025-01-22 12:28:49 +01:00
neonb
45df1552a1
Merge remote-tracking branch 'origin/master'
2025-01-22 12:27:30 +01:00
neonb
fe460f030a
dev TODO test for tecna compatibility
2025-01-22 12:27:15 +01:00
gg
404d9b7a28
Merge remote-tracking branch 'origin/master'
2025-01-21 19:16:34 +01:00
gg
92342c006b
hikrobot smart camera getting data wip
2025-01-21 19:16:21 +01:00
neonb
9653812a13
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/components/pipe_cutter_component.py
# src/ui/test_pipe_cutter/test_pipe_cutter.py
2025-01-21 15:46:06 +01:00
neonb
53c8ed4a60
dev TODO test for tecna compatibility
2025-01-21 15:44:47 +01:00
8ec410c676
Merge remote-tracking branch 'origin/master'
2025-01-21 10:52:23 +01:00
cbb487e314
dev
2025-01-21 10:52:13 +01:00
neonb
855084f7e7
dev
2025-01-21 10:51:06 +01:00
gg
1353aa14e0
Merge remote-tracking branch 'origin/master'
2025-01-17 19:17:25 +01:00
gg
7f7fa06266
hikrobot smart camera almost getting data
2025-01-17 19:17:09 +01:00
gg
cb13f28d2e
hikrobot smart camera login ok
2025-01-17 16:23:24 +01:00
6ed0cd9f99
pipe cutter wip
2025-01-17 15:15:36 +01:00
ee70974ec6
Merge remote-tracking branch 'origin/master'
2025-01-17 15:14:41 +01:00
849db63176
pipe cutter wip
2025-01-17 15:14:28 +01:00
gg
d03242eccf
hikrobot smart camera test init single camera list ok
2025-01-16 19:01:07 +01:00
eduardo
8117802a0c
dev fix src import
2025-01-14 15:43:52 +01:00
Eduardo
b54903f6d1
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/ui/barcode_recipe_selection/barcode_recipe_selection.py
2025-01-14 15:24:15 +01:00
Eduardo
2ace6ce8a0
fix barcode len
2025-01-14 15:23:22 +01:00
374ea2cfae
Merge remote-tracking branch 'origin/master'
2025-01-14 10:16:15 +01:00
356857bb58
dev
2025-01-14 10:13:26 +01:00
gg
8c283376fb
RFID connection
2025-01-13 11:56:47 +01:00
gg
7c79bfc6a3
rfid imports
2024-12-24 12:30:17 +01:00
b6211a8dcb
Merge remote-tracking branch 'origin/master'
2024-12-24 11:45:16 +01:00
533d010881
dev
2024-12-24 11:44:57 +01:00
gg
4bf753e50a
rfid imports
2024-12-24 11:06:51 +01:00
neo-nb3
270366af32
fork nfcpy package as local lib, fixed pn532 baudrate, tbt
2024-12-22 18:39:13 +01:00
e827089e31
Merge remote-tracking branch 'origin/master'
2024-12-18 14:46:40 +01:00
b7a09646a9
remote import recipes under testing
2024-12-18 14:46:25 +01:00
stres1
1ad3b89814
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# config/machine_settings/st-ten-1.ini
# src/ui/barcode_recipe_selection/barcode_recipe_selection.py
2024-12-17 12:31:43 +01:00
Eduardo
11e21b0c23
fix stten6 gg
2024-12-16 08:58:29 +01:00
Eduardo
87818cace6
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/ui/test/test.py
2024-12-13 10:28:28 +01:00
226b7d1398
fix st-ten-6
2024-12-11 15:16:35 +01:00
Eduardo
85cacaddfd
Merge remote-tracking branch 'origin/master'
2024-12-11 12:48:12 +01:00
bda17a5452
Merge remote-tracking branch 'origin/master'
2024-12-09 15:37:25 +01:00
0e6be1f8a6
dev portal ok overwrite png files
2024-12-09 15:37:08 +01:00
3715436280
extra server on stten1/4/14 tbt
2024-12-06 15:04:14 +01:00
4b63f5b14d
extra server on stten1/4/14 tbt
2024-12-06 14:25:41 +01:00
neo-2
33ba90a35b
ST TEN 14
2024-12-06 12:05:15 +01:00
3fd2efcd7b
extra server on stten1/4/14 tbt
2024-12-06 11:58:57 +01:00
f3b19fd32b
extra server on stten1/4/14 tbt
2024-12-06 11:51:45 +01:00
ST-TEN-1
bb2d069d49
FIX
2024-12-06 09:12:10 +01:00
357c517638
extra server on stten1/4/14 tbt
2024-12-05 17:31:49 +01:00
Eduardo
96a162fe90
Merge remote-tracking branch 'origin/master'
2024-12-02 17:02:51 +01:00
5d52f423e0
db fix
2024-12-02 17:00:32 +01:00
Eduardo
32b66a03a6
Merge remote-tracking branch 'origin/master'
2024-12-02 16:27:24 +01:00
Eduardo
757867fbda
dev stten6
2024-12-02 16:26:33 +01:00
62681cc80f
Log management ok
2024-12-02 14:23:33 +01:00
099a07b08b
Merge remote-tracking branch 'origin/master'
2024-12-02 12:24:13 +01:00
2c957a64a2
Log management ok
2024-12-02 12:24:02 +01:00
gg
edc3fa9647
Merge remote-tracking branch 'origin/master'
2024-12-02 11:16:27 +01:00
gg
596829f656
stten6 barcode selection
2024-12-02 11:16:15 +01:00
dc4651b43a
Log management wip
2024-12-02 10:54:59 +01:00
ST-TEN-11
0b9e3d097e
fix
2024-11-22 14:04:45 +01:00
Eduardo
8474729dd2
fix
2024-11-15 12:28:28 +01:00
Eduardo
26508cc25c
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/ui/recipe_selection/recipe_selection.py
2024-11-15 11:10:15 +01:00
5f1189f277
st-ten-6 ready for update
2024-11-14 16:45:43 +01:00
65250d6533
wip remote fetch
2024-11-11 16:57:51 +01:00
9942b5c542
remote fecthing ok on sim
...
wip on server
2024-11-08 16:47:25 +01:00
neo-nb3
a38aea5e5c
file download from server wip
2024-11-06 21:00:17 +01:00
160af9de88
Merge remote-tracking branch 'origin/master'
2024-11-06 12:55:30 +01:00
c791ba76e9
IMPROVED ERROR FOR USB CONNECTIONS TECNA
2024-11-06 12:55:05 +01:00
e20c85cc62
status update rewrite wip
2024-11-06 12:37:19 +01:00
neo-2
5015d3a4ea
ST TEN 14
2024-11-06 09:37:54 +01:00
neo-2
93e0d8c050
Merge remote-tracking branch 'origin/master'
2024-11-06 08:57:25 +01:00
neo-2
d5c4fe420f
ST TEN 14
2024-11-06 08:57:08 +01:00
cbb8d81edb
FIX and labels
2024-11-05 17:19:17 +01:00
8324f34ca3
labels
2024-10-31 11:51:18 +01:00
994c9958a4
labels
2024-10-30 14:52:03 +01:00
Eduardo
1e9439268f
io id
2024-10-30 14:51:18 +01:00
df02f2e7fc
Merge remote-tracking branch 'origin/master'
2024-10-29 17:29:00 +01:00
118c0367b9
Refactor remote_fetch and add check_actions_to_do
...
Simplify the remote_fetch method by removing machine_status parameter and updating error handling. Introduce check_actions_to_do method to determine necessary actions for the machine, including invoking remote_fetch as a required action.
2024-10-29 17:28:35 +01:00
gg
115ae7bea4
Merge remote-tracking branch 'origin/master'
2024-10-29 13:19:13 +01:00
gg
f6b9bc568c
ferrari label flag qr only
2024-10-29 13:17:15 +01:00
3f4f0aab82
Set machine status to "logged-in" by default
...
Updated the default machine status from "offline" to "logged-in" in the ArchiveSynchronizer class. This ensures the correct initial status is set when the object is instantiated.
2024-10-29 12:04:28 +01:00
82c09a8ced
Refactor machine status updates
...
Removed unnecessary machine status update to "stand-by" and streamlined status changes to "working" and "logged-in" based on specific actions. This helps in maintaining a cleaner and more accurate status flow within the application logic.
2024-10-29 12:03:20 +01:00
bd0ea025f7
Update machine status handling and fix archive synchronizer init
...
Refactor machine status updates to include more states such as working" for better control. Also, ensure `ArchiveSynchronizer` is initialized with the `config` parameter where needed, improving consistency in object creation across multiple UI components.
2024-10-29 11:41:42 +01:00
a73fa2c66e
fix error during import
2024-10-29 10:00:56 +01:00
3f8630bd7f
Add error dialogs for USB connection issues
...
Introduce `QMessageBox` dialogs to notify users of USB connection errors in `modbus_component.py`. This provides immediate feedback to users, improving the usability and troubleshooting process. The change replaces previous warnings with more visible error messages.
2024-10-29 09:15:35 +01:00
Eduardo
58bc7c0477
fix
2024-10-28 15:58:46 +01:00
Eduardo
d3b7fcaecd
fix
2024-10-28 09:30:47 +01:00
