 Samuele Locatelli
|
2758f66471
|
Merge branch 'feature/S7Net' into develop
|
2020-06-30 11:30:58 +02:00 |
|
|
Samuele Locatelli
|
c78f187523
|
manage label translation messages + ack for prod
|
2020-06-30 11:30:22 +02:00 |
|
|
Samuele Locatelli
|
02aa343f99
|
Added path for PLC Alarm/message decoding + other translations
|
2020-06-29 18:56:26 +02:00 |
|
|
Samuele Locatelli
|
a7a49ec19b
|
S7Net: start alarm decoding
|
2020-06-29 15:02:32 +02:00 |
|
|
Samuele Locatelli
|
addd758ed0
|
Merge branch 'feature/S7Net' into develop
|
2020-06-26 11:34:00 +02:00 |
|
|
Samuele Locatelli
|
012e2dc9e8
|
FIX decoding struct for RECIPE (not word, struct!)
|
2020-06-26 11:33:39 +02:00 |
|
|
Samuele Locatelli
|
69ad4bf18c
|
Added method for barriers not ok (pre poweron) management
|
2020-06-26 10:07:53 +02:00 |
|
|
Samuele Locatelli
|
2fed33f02a
|
Added BarriersNotOk for new data for icons
|
2020-06-26 08:57:48 +02:00 |
|
|
Samuele Locatelli
|
a38176fdca
|
Merge branch 'feature/S7Net' into develop
|
2020-06-25 18:10:39 +02:00 |
|
|
Samuele Locatelli
|
02032c7a85
|
change reading status data (as bytelist)
|
2020-06-25 18:10:22 +02:00 |
|
|
Samuele Locatelli
|
5d815f0fd9
|
fix NC Staticdata
|
2020-06-25 16:09:45 +02:00 |
|
|
luciomaranta
|
8dadd7f0e5
|
Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_core_library into develop
|
2020-06-25 13:02:17 +02:00 |
|
|
luciomaranta
|
2533be1e62
|
Fix balluf double writing
Added baluff option
Added balluf cleat tablet
|
2020-06-25 13:01:49 +02:00 |
|
|
Samuele Locatelli
|
ea162ac6e8
|
Merge branch 'feature/S7Net' into develop
|
2020-06-24 14:05:03 +02:00 |
|
|
Samuele Locatelli
|
6613a5d40f
|
S7net: Fix lock object (static)
|
2020-06-24 14:04:46 +02:00 |
|
|
Samuele Locatelli
|
c5e8dce878
|
test s7 with lock object on read
|
2020-06-24 14:04:25 +02:00 |
|
|
Samuele Locatelli
|
93f17b9242
|
Merge branch 'feature/S7Net' into develop
|
2020-06-23 18:28:54 +02:00 |
|
|
Samuele Locatelli
|
36a8ac2fd5
|
Added lock for avoid connect resource contention
|
2020-06-23 18:28:43 +02:00 |
|
|
Samuele Locatelli
|
81f05f615f
|
fix error type for memread
|
2020-06-23 15:55:20 +02:00 |
|
|
Samuele Locatelli
|
162e4b949a
|
Merge branch 'feature/S7Net' into develop
|
2020-06-22 09:21:28 +02:00 |
|
|
Samuele Locatelli
|
62325e52a8
|
Typo & code cleanup vari
|
2020-06-22 09:21:13 +02:00 |
|
|
Samuele Locatelli
|
c240bc04a5
|
Merge branch 'feature/S7Net' into develop
|
2020-06-19 18:37:01 +02:00 |
|
|
Samuele Locatelli
|
006f9d4b0d
|
if false cleanup
|
2020-06-19 18:32:53 +02:00 |
|
|
Samuele Locatelli
|
6c1b449816
|
Check and reorder memory setup
|
2020-06-19 17:45:53 +02:00 |
|
|
Samuele Locatelli
|
4c8c8912b2
|
fix CmsError instance name (libraryError)
|
2020-06-19 15:16:57 +02:00 |
|
|
Samuele Locatelli
|
a91189e73e
|
Merge branch 'develop' into feature/S7Net
|
2020-06-18 17:12:24 +02:00 |
|
|
Samuele Locatelli
|
a65a832b2c
|
Change prod mod notification (str/ack)
|
2020-06-18 17:12:12 +02:00 |
|
|
Samuele Locatelli
|
f5ec10a691
|
Added method for prodInfo reset and setup
|
2020-06-17 18:27:12 +02:00 |
|
|
Samuele Locatelli
|
fbaa46b9a8
|
Merge branch 'feature/S7Net' into develop
|
2020-06-16 18:04:06 +02:00 |
|
|
Samuele Locatelli
|
a7ba4c3345
|
Fix init for excluding reset actions + fix thread close
|
2020-06-16 18:02:15 +02:00 |
|
|
Samuele Locatelli
|
f532680641
|
Merge branch 'feature/S7Net' into develop
|
2020-06-16 08:30:26 +02:00 |
|
|
Samuele Locatelli
|
c1b69bd6e8
|
try/catch on warmers readout
|
2020-06-16 08:29:36 +02:00 |
|
|
Samuele Locatelli
|
50e78813bd
|
Merge branch 'feature/S7Net' into develop
|
2020-06-15 19:29:29 +02:00 |
|
|
Samuele Locatelli
|
31624c5ee7
|
Removed old method + fix startup
|
2020-06-15 19:29:02 +02:00 |
|
|
Samuele Locatelli
|
d4324ad50f
|
Remove old method (single param)
|
2020-06-15 19:13:01 +02:00 |
|
|
Samuele E. Locatelli
|
63388dd7ca
|
Added return error on reacipe read
|
2020-06-15 16:43:43 +02:00 |
|
|
Samuele Locatelli
|
61f7f1c7a0
|
Merge branch 'feature/S7Net' into develop
|
2020-06-15 11:42:12 +02:00 |
|
|
Samuele Locatelli
|
f1d7da00c0
|
Added method for mode selection
|
2020-06-15 11:41:31 +02:00 |
|
|
Samuele Locatelli
|
530b351c80
|
Continued ScaleFactor implementation
|
2020-06-15 10:08:22 +02:00 |
|
|
Samuele Locatelli
|
b189f52db8
|
Merge branch 'feature/S7Net' into develop
|
2020-06-12 17:21:43 +02:00 |
|
|
Samuele Locatelli
|
6df07aaf2e
|
fix try/catch data...
|
2020-06-12 16:59:47 +02:00 |
|
|
Samuele Locatelli
|
642b22c76d
|
fixed and tested ACK to PLC (window response time)
|
2020-06-12 15:06:49 +02:00 |
|
|
Samuele Locatelli
|
03b108dac8
|
Update method for ack/strobe on status/command
|
2020-06-12 11:38:13 +02:00 |
|
|
Samuele Locatelli
|
614e21af78
|
added method for ack to PLC + conf write on request
|
2020-06-11 19:45:20 +02:00 |
|
|
Samuele Locatelli
|
d80ecbd099
|
Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_core_library into feature/S7Net
|
2020-06-11 14:34:57 +02:00 |
|
|
Samuele Locatelli
|
783cd1affc
|
Merge branch 'feature/S7Net' into develop
|
2020-06-11 14:31:30 +02:00 |
|
|
Samuele Locatelli
|
e4144c1c90
|
Added methods for write/read WARMERS model
|
2020-06-11 14:30:51 +02:00 |
|
|
luciomaranta
|
132c106e97
|
Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_core_library into develop
|
2020-06-11 13:27:21 +02:00 |
|
|
luciomaranta
|
adcb2da51d
|
Fix siemens balluf -> double writing
|
2020-06-11 13:26:59 +02:00 |
|
|
Samuele Locatelli
|
0d6ee055a7
|
Merge branch 'feature/S7Net' into develop
|
2020-06-11 11:11:27 +02:00 |
|