eduardo
|
f1f5aef5c8
|
labels
|
2025-01-30 10:34:38 +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 |
|
