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
087d3a48d6
Refactor ArchiveSynchronizer usage and clean up code
...
Refactor code to properly utilize `ArchiveSynchronizer` class across multiple modules. Adjust conditional statements and imports for consistency. Remove unnecessary debug outputs and redundant code, ensuring more streamlined and maintainable codebase.
2024-10-25 17:11:00 +02:00
1722ad260d
auto import wip
2024-10-25 14:38:28 +02:00
ec54636257
fix dynamic export
2024-10-25 11:34:25 +02:00
bfa5ee8d74
fix merge
2024-10-25 10:07:22 +02:00
e9d83f1fce
fix merge
2024-10-25 09:29:22 +02:00
4853e7883c
new export logic
2024-10-25 09:18:44 +02:00
32e858f0f7
fix merge
2024-10-25 09:18:10 +02:00
cb9abeb46f
fix merge
2024-10-24 16:58:31 +02:00
84c22c8035
fix merge
2024-10-24 16:55:55 +02:00
e940964f84
merge
2024-10-24 16:47:56 +02:00
0a6edec384
fix q dialog linux
2024-10-24 15:57:49 +02:00
7b316bad18
fix QFileDialog.getSaveFileName
2024-10-24 13:14:52 +02:00
gg
3239e6de5c
Merge branch 'remove-steps-table' of https://gitlab.com/neosystems/errecinque/mappano/st-ten-1 into remove-steps-table
2024-10-24 12:54:54 +02:00
gg
a60a2d945e
ferrari label 203dpi
2024-10-24 12:42:03 +02:00
27fd430a0b
auto import wip
...
Updated remote_fetch to allow flexible machine_status input and reorganized file saving logic to categorize downloads based on file types. Modified test configuration to ensure compatibility with the new changes.
2024-10-24 11:11:03 +02:00
fce0151ecc
Refactor remote_fetch method to improve file management
...
Updated remote_fetch to allow flexible machine_status input and reorganized file saving logic to categorize downloads based on file types. Modified test configuration to ensure compatibility with the new changes.
2024-10-23 16:51:27 +02:00
1da8c3ae39
Add machine_id parameter to remote_fetch method
...
Updated the remote_fetch method to accept a mandatory machine_id parameter and adjusted the URL endpoint accordingly. Modified relevant invocation and added error handling for missing machine_id. Updated the corresponding tests to include the machine_id parameter.
2024-10-23 15:00:17 +02:00
e6c7b76ccd
dev.r5portal remote_fetch
...
fix
2024-10-23 11:46:57 +02:00
2c01810685
dev.r5portal remote_fetch
...
ok
2024-10-23 11:30:30 +02:00
7261f2d1e0
dev.r5portal upload system unit test ok
2024-10-23 09:45:57 +02:00
61b7fc98a5
dev.r5portal upload system unit test ok
2024-10-23 09:36:55 +02:00
4c056f72f1
dev.r5portal upload system unit test ok
2024-10-23 09:22:30 +02:00
d5a4813b58
dev.r5portal upload system unit test ok
2024-10-23 09:20:41 +02:00
e1289065c8
dev.r5portal upload system wip 2
2024-10-22 16:37:55 +02:00
5464f9a9c4
dev.r5portal upload system wip
2024-10-22 12:11:56 +02:00
a54935fcad
initial commit dev.r5portal upload system
2024-10-21 17:17:10 +02:00
847338984d
fixme prod server status
2024-10-21 12:50:44 +02:00
c4e83468c8
new extra synchronizer endpoint wip
2024-10-18 12:37:07 +02:00
eduardo
88c45fc9c4
dev
2024-10-10 08:49:36 +02:00
6467307957
dev
2024-10-09 12:07:41 +02:00
7ee96d63dd
advantech digital I/O ok on linux, tbt
2024-10-08 15:36:05 +02:00
3a163bfab4
dima Mclaren
2024-10-08 16:24:35 +02:00
6113da2f7b
unit test usb586x
2024-10-08 09:35:47 +02:00
eb0c876aeb
second test instruction step for st-ten-11 tbt sim ok
2024-10-08 09:35:29 +02:00
363021c8d9
Merge remote-tracking branch 'origin/master'
2024-10-07 11:49:51 +02:00
f7355805e7
Add default value to 'codice_prodotto' if missing
...
Ensure 'codice_prodotto' has a default value in recipe selection. Additionally, appended 'archived' column in st-ten-11.csv to indicate archived status.
2024-10-07 11:49:40 +02:00
fc105eadf0
second test instruction step for st-ten-11 tbt sim ok
2024-10-07 11:49:38 +02:00
gg
486e09b479
new recipe and import svg rows names
2024-10-07 09:33:11 +02:00
9bf55ee87f
remove steps table wip editor modify ok
2024-10-05 17:16:57 +02:00
fd632bee8e
remove steps table wip add recipe & first save ok
2024-10-04 19:06:04 +02:00
gg
700849ef9b
save recipes OK
2024-10-04 15:52:54 +02:00
dd88b1eafa
save recipes wip
2024-10-04 11:39:16 +02:00
stres1
92abd632b2
Merge remote-tracking branch 'origin/master'
2024-10-01 13:08:58 +02:00
stres1
b0584851f5
stten1
2024-10-01 13:08:49 +02:00
e3db54583d
Tecna recipe reader tool WIP
2024-09-27 19:11:49 +02:00
982c44793c
Merge remote-tracking branch 'origin/master' into remove-steps-table
2024-09-23 17:29:35 +02:00
stten7
5ea6a58101
dev st ten 7
2024-09-19 12:53:03 +02:00
stten7
ed6d2e263b
fix
2024-09-19 11:04:02 +02:00
938e420800
wtf
2024-09-18 18:15:01 +02:00
e7fc30d5f6
remove steps table wip
2024-09-18 18:03:13 +02:00
gg
8abc123b49
dogotal i/o
2024-09-18 14:48:21 +02:00
gg
e2cfa8204f
dogotal i/o
2024-09-18 14:47:54 +02:00
d65e2a03ea
remove steps table wip, import ok
2024-09-18 14:18:07 +02:00
b5d4a07ab2
remove steps table wip
2024-09-17 15:19:36 +02:00
9e0bc33904
ferrari label ok
2024-09-13 11:32:14 +02:00
a4b06e3f47
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# config/label_templates/st-ten-1/ferrari_30x16_203.prn
2024-09-11 15:56:20 +02:00
8b22158d0a
ferrari label wip
2024-09-11 15:52:01 +02:00
eduardo
201a3ed18d
st_ten 12/13 update
2024-09-11 13:54:38 +02:00
gg
6eb3c0608f
Merge remote-tracking branch 'origin/master'
2024-09-10 18:02:31 +02:00
gg
b5fb437519
ferrari new label wip
2024-09-10 17:57:46 +02:00
gg
bbb053462a
_stat implementation tbt
2024-07-18 09:43:42 +02:00
gg
debafdbf18
_stat implementation
2024-07-16 13:08:40 +02:00
gg
4243507d62
_stat implementation
2024-07-16 13:02:01 +02:00
ST-TEN-11
978df8ff01
Add inverse sensor monitoring in test instructions
...
Expanded the functionality in test_instructions.py to also monitor and record the state of inverse sensors (inv_sensor). This was done in the checking phase, following similar logic that is used for regular sensors (sensor). Also adjusted the sensor index referencing for these inverse sensors.
2024-07-12 11:03:32 +02:00
ST-TEN-11
7351f66d61
Add inverse sensor monitoring in test instructions
...
Expanded the functionality in test_instructions.py to also monitor and record the state of inverse sensors (inv_sensor). This was done in the checking phase, following similar logic that is used for regular sensors (sensor). Also adjusted the sensor index referencing for these inverse sensors.
2024-07-11 08:53:59 +02:00
eduardo
d0de088e22
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# src/test/rfid.py
2024-06-25 07:52:12 +02:00
eduardo
0068ce6d49
Add error handling and print traceback in RFID tests
...
The update introduces IOError specific exception handling in the RFID tests. It also prints a traceback for both IOError and general exceptions. This is done to better diagnose issues related to connectivity and IO in the tests as and when they occur. The code is also cleaned for better readability by fixing indentation and removing unnecessary comments and spaces.
2024-06-25 07:51:38 +02:00
eduardo
e2d344cf1e
Add error handling and print traceback in RFID tests
...
The update introduces IOError specific exception handling in the RFID tests. It also prints a traceback for both IOError and general exceptions. This is done to better diagnose issues related to connectivity and IO in the tests as and when they occur. The code is also cleaned for better readability by fixing indentation and removing unnecessary comments and spaces.
2024-06-20 08:01:06 +02:00
eduardo
f2afea6110
fix
2024-06-11 06:58:03 +02:00
Eduardo
c6717c3ae6
fix
2024-06-05 11:20:28 +02:00
eduardo
ba1bb3f559
Merge remote-tracking branch 'origin/master'
2024-05-28 07:41:47 +02:00
eduardo
47a77d83c5
supporto assemblati ok
2024-05-28 07:35:58 +02:00
gg
244f5195dc
op sys fix
2024-05-27 13:35:31 +02:00
eduardo
8e87c5b212
supporto assemblati ok
2024-05-24 13:40:48 +02:00
eduardo
b6e294151a
supporto assemblati ok
2024-05-24 09:24:06 +02:00
eduardo
8f7868c8b7
supporto assemblati whip
2024-05-24 08:45:04 +02:00
eduardo
941e3ba764
supporto assemblati whip
2024-05-23 15:08:22 +02:00
eduardo
3f72be3abc
supporto assemblati whip
2024-05-23 14:26:01 +02:00
eduardo
51ba135e14
supporto assemblati whip
2024-05-23 09:09:05 +02:00
eduardo
7f489d6634
supporto assemblati whip
2024-05-21 08:45:27 +02:00
eduardo
057baabcdd
supporto assemblati whip
2024-05-21 07:56:15 +02:00
eduardo
4c1d1fff6c
last csv update
2024-05-17 11:07:07 +02:00
ST-TEN-1
b5b7af6d56
Merge branch 'master' of https://gitlab.com/neosystems/errecinque/mappano/st-ten-1
...
Conflicts:
src/ui/test/test.py
2024-05-17 09:13:04 +02:00
ST-TEN-1
90de35b498
DEV
2024-05-17 09:09:46 +02:00
neo-dl
91597533de
fix
2024-05-14 10:04:12 +02:00
neo-dl
25291bf0ff
fix
2024-05-14 09:22:19 +02:00
eduardo
e18f597b76
Warning for st-ten-2
2024-05-13 09:34:06 +02:00
eduardo
c8333273ff
Updated data processing in barcode_recipe_selection
...
In the barcode_recipe_selection.py script, the way data is split and processed has been revised. 'Splitlines' is now used instead of 'split("-")', and the length for candidates was changed from 8 to 10.
FIX
2024-05-13 09:02:44 +02:00
Edo
9f90343666
st ten 10
2024-05-09 12:07:15 +02:00
eduardo
e40d0e7fa7
Update label text and warning images configurations
...
Updated the text displayed on the brother label printer to only show "ST-TEN-10" instead of "ETICHETTA \nST-TEN-10". Also changed the warning images in machine settings for st-ten-3 and st-ten-2 to use a generic image instead of their specific ones.
2024-05-08 12:39:28 +02:00
eduardo
53c34957cc
Update printing labels and warning images in config files
...
Updated the printing labels in the brother_label_printer.py file and added warning images fields across multiple configuration files. This includes changes in machine settings for st-ten-3.ini, st-ten-2.ini and st-ten-10.ini. Also, modified the "labeltxt_5" field in the test.py file and in recipe_selection.py to fetch the correct value.
2024-05-08 11:46:03 +02:00
Eduardo
0f8b54b81c
image_for_warnig uddate every machi has his own folder the images, also addede warnig images for ST-TEN-10 a last update csv for it
2024-05-08 07:45:19 +02:00
Eduardo
c43a870db5
Merge remote-tracking branch 'origin/master'
2024-04-23 11:15:53 +02:00
Eduardo
85c1ec2d2d
Add machine status tracking and update for ArchiveSynchronizer
...
The ArchiveSynchronizer now tracks machine status and sends updates about it. Options of status are tracked as "working", "logged-in", and "logged-out". This implementation includes configuration changes for the st-ten-10 machine and error reporting for failures during remote archive operations.
2024-04-23 11:15:23 +02:00
gg
5fcb04f969
-various fixes
...
-st-ten-8 tested ok with new flush blow valves
2024-04-22 18:38:34 +02:00
stten7
ed13b91073
fix
2024-03-21 14:30:03 +01:00
Edo
dfcdf31d29
st ten 10 wip
2024-03-19 14:23:58 +01:00
Edo
07007c69b1
st ten 10 print_button and instructions wip
2024-03-19 10:23:59 +01:00
Edo
bd37d53bb4
st ten 10 print_button and instructions wip
2024-03-18 13:22:19 +01:00
Edo
89fae6cfa1
st ten 10 printing ok
2024-03-18 11:02:01 +01:00
Edo
d0ac7c5d9b
win32 print image to be finished, test ok
2024-03-15 10:42:58 +01:00
Edo
428d28297d
st ten 10 wip
2024-03-14 13:15:08 +01:00
Edo
4fb3cdd676
st-ten-10 wip
2024-03-12 13:48:00 +01:00
STTEN8
7174fd84d4
stten8 auto select recipe from RFID at startup
2024-02-23 18:34:17 +01:00
STTEN8
f24669f18a
Merge remote-tracking branch 'origin/master'
2024-02-23 17:28:01 +01:00
gg
3eb19be036
fix leak sign
2024-02-23 16:01:43 +01:00
STTEN8
0e7fc9bb36
Merge remote-tracking branch 'origin/master'
2024-02-03 09:55:51 +01:00
stten7
7a9e4b805b
instruction folder
2024-02-01 14:53:00 +01:00
stten7
6d1f6c71b9
instruction folder
2024-02-01 14:50:45 +01:00
gg
dea95e6d76
serial test linux
2024-01-26 10:12:45 +01:00
Eduardo
6810b9c63f
Serial test
2024-01-26 10:05:47 +01:00
STTEN8
6249abf014
Merge remote-tracking branch 'origin/master'
2024-01-17 09:05:05 +01:00
neo-nb3
e3542ceb25
ref
2024-01-16 19:12:06 +01:00
STTEN8
d54ca99bfd
Merge remote-tracking branch 'origin/master'
2023-11-15 15:57:19 +01:00
STTEN8
bcb3ff2936
stten8 fix & reprint label
2023-11-13 15:00:55 +01:00
gg
936647379a
pid correction via config file tbt
2023-11-07 16:57:58 +01:00
gg
ca2fffabfc
fix
2023-11-02 09:51:47 +01:00
st-ten-9
cfb33edeeb
Merge remote-tracking branch 'origin/master'
2023-10-19 09:40:54 +02:00
st-ten-9
3f3c82661a
fco730 alpha
2023-10-19 09:37:45 +02:00
stten5
1a31be38ee
STTEN5
2023-10-19 08:52:16 +02:00
st-ten-9
464d8d532e
fco730 alpha
2023-10-13 17:52:41 +02:00
st-ten-9
f2075d1c76
fco730 dev
2023-10-13 13:34:21 +02:00
st-ten-9
dce65caa55
fco730 dev
2023-10-12 19:37:39 +02:00
neo-nb3
6a254e7922
fco730
2023-10-11 22:01:05 +02:00
st-ten-9
5b0aee7437
fco730 dev
2023-10-11 16:40:46 +02:00
