marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
549 Commits 1 Branch 0 Tags
2d7089edf709c5b1676cacf37b96435b06e853b9
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Roland Drabesch 2d7089edf7 merge 2023-06-02 13:14:12 +02:00
Roland Drabesch 2edb09bfb5 Fix Zeroflow for magflux 2023-06-02 13:13:12 +02:00
Roland Drabesch cae8ba470d Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-01 14:37:45 +02:00
Roland Drabesch 765e8577b5 For now with correct index 2023-06-01 14:37:31 +02:00
Roland Drabesch 9d4d9d5c76 add Preadjsutement for flux 2023-06-01 14:35:36 +02:00
Roland Drabesch 3bee36749c Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-01 13:21:39 +02:00
Roland Drabesch 3acb7daead add MagFlux TestResults for calibration 2023-06-01 13:21:26 +02:00
Roland Drabesch 85e1b5acc1 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-06-01 10:23:26 +02:00
Roland Drabesch b2b6bd4a59 Fix magflux zeroflow bug 2023-06-01 10:23:09 +02:00
Roland Drabesch 9f4445b715 Merger 2023-05-31 16:59:00 +02:00
Roland Drabesch 994eb9e1dc Add MagFlux Zeroflow 2023-05-31 16:58:16 +02:00
Roland Drabesch 822a41522a merge 2023-05-31 10:36:39 +02:00
Roland Drabesch c17102651d AddFlowdeviation genral 2023-05-31 10:35:35 +02:00
Roland Drabesch ce33121ae6 merge 2023-05-23 08:45:16 +02:00
Roland Drabesch 0b560d2668 Add MAgFlux to legacy 2023-05-23 08:44:20 +02:00
Roland Drabesch 7cbc0b36b2 Cordonel is now default fpr legacy test insted ofMagFlux 2023-05-15 12:58:47 +02:00
Roland Drabesch 4c867e5e79 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-05-10 15:44:54 +02:00
Roland Drabesch 2db0e27fc0 MagFlux implemnted 2023-05-10 15:44:40 +02:00
Roland Drabesch 48e5f26913 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-05-08 17:26:58 +02:00
Roland Drabesch 377887ba08 Adding Magflux to legacyControll [Not working] 2023-05-08 17:26:40 +02:00
Roland Drabesch 3a212f0215 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-05-08 15:37:26 +02:00
Roland Drabesch 1ca0205e20 Merge remote-tracking branch 'origin/Dev_MagFlux' 2023-05-08 14:49:41 +02:00
Roland Drabesch a74419c1f0 assabley versioin up to 2.4.3 2023-05-08 14:46:39 +02:00
Roland Drabesch 742a26dff5 merge 2023-05-08 14:43:59 +02:00
Roland Drabesch 87bf6713ab quickfixes for FAI DN 50 2023-05-08 14:42:27 +02:00
Roland Drabesch 0523bb5fc0 change layout.cshtml 2023-04-17 14:57:35 +02:00
Roland Drabesch 6da5ecb652 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-04-14 13:37:37 +02:00
Roland Drabesch 8c634357a0 Change implementage of skip checks 2023-04-14 13:37:18 +02:00
Roland Drabesch a78d83328c Merge branch 'spzvtbg' into 'main' 
Add New Directory.

See merge request la_operations/laa_production!5
 2023-03-30 13:50:27 +00:00
Roland Drabesch a3c6804b86 Merge and fixing framework downgrade 2023-03-20 14:15:38 +01:00
Roland Drabesch 83c26d7eaf Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 
Merge
 2023-03-20 13:50:05 +01:00
Roland Drabesch 259e88f21d add new remort for nataila @easyaccess 2023-03-20 12:45:53 +01:00
Roland Drabesch 36f332ac8a Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production into main 2023-03-06 15:13:33 +01:00
Roland Drabesch c436e11f6c merge 2023-03-06 15:13:26 +01:00
Roland Drabesch adecd8c3bd finalcheck add 2023-03-06 15:10:37 +01:00
Roland Drabesch f61fe1b99f Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production into main 2023-02-27 10:53:21 +01:00
Roland Drabesch 050fd97aaa Prductionsdate now from RadioTest 2023-02-27 10:53:10 +01:00
Roland Drabesch 204377fb30 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production into main 2023-01-26 11:14:47 +01:00
Roland Drabesch 3dea2d19a1 Add register watch on pui 2023-01-26 11:12:09 +01:00
Roland Drabesch 43a29dd57e passwords handling now safe 
bin verfify  and fix code
 2023-01-24 16:36:01 +01:00
Roland Drabesch 86dd19230f version auf 6 geändert 2023-01-24 10:15:25 +01:00
Roland Drabesch 4107eafe03 Merge 2023-01-24 10:12:01 +01:00
Roland Drabesch 023d67fe40 Change Password procces 2023-01-24 10:08:37 +01:00
Roland Drabesch 0cc67bf0e9 merge 2023-01-16 11:41:05 +01:00
Roland Drabesch af20391d8c radio system state need a logout to refresh 2023-01-16 11:40:39 +01:00
Roland Drabesch cd3de05b81 Merge and shipping state now with log out 2023-01-16 11:40:00 +01:00
Roland Drabesch 04b893d79d Stand von WE . Prüfung laufen gut 2023-01-06 17:23:32 +01:00
Roland Drabesch 8cb13dff88 not working version of state machine 2023-01-03 16:32:39 +01:00
Roland Drabesch 4397b90381 merge 2023-01-03 14:48:32 +01:00
Roland Drabesch 78e7f6eb16 add task list for addallmeters 2023-01-03 14:47:41 +01:00
Roland Drabesch 448ddece71 merge 2023-01-03 13:08:42 +01:00
Roland Drabesch 0c27595b8e add comments clen up interface 2023-01-03 13:05:45 +01:00
Roland Drabesch 443c984655 Legacy messument now wihzout tasks 2023-01-02 17:23:24 +01:00
Roland Drabesch 2654f70bf2 delay beim versandfertigamchen 2022-12-09 16:58:08 +01:00
Roland Drabesch 51c5934b8b add battery check 2022-11-30 17:19:26 +01:00
Roland Drabesch 966ba57131 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production into main 2022-11-30 11:32:31 +01:00
Roland Drabesch 5527dc83e8 chage cordonel fw naming and add more col 2022-11-30 11:32:00 +01:00
Roland Drabesch 2e27eaeb35 comm 2022-11-30 09:36:31 +01:00
Roland Drabesch 2325046e07 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production into main 2022-11-07 15:27:41 +01:00
Roland Drabesch 5076118fc0 try to add batterylifetimer 2022-11-07 15:27:28 +01:00
Roland Drabesch c150c538c2 adding NA meters to the Proccess (Picking, Webservice and Finaltest) 2022-10-28 15:48:24 +02:00
Roland Drabesch 4fc949d328 merge 2022-10-21 13:52:05 +02:00
Roland Drabesch 001c47f9f2 merge 2022-10-21 13:51:49 +02:00
Roland Drabesch 1a3a47920b pui and legaxy fix (no no static check for meters) 2022-10-21 13:49:45 +02:00
Roland Drabesch 3a6bd5d508 Renaiming Enums 2022-09-22 16:12:58 +02:00
Roland Drabesch 581f40ea03 Merge done 2022-09-22 16:11:42 +02:00
Roland Drabesch e293fc408e After FAI 2022-09-22 16:07:58 +02:00
Roland Drabesch 8472b242ee merge 2022-09-06 16:23:09 +02:00
Roland Drabesch b65026ce01 still fixing fai bugs 2022-09-06 16:22:09 +02:00
Roland Drabesch 58358332c6 and merge 2022-08-30 11:54:34 +02:00
Roland Drabesch 5875bcd5d0 fix fai issuses, no encr key and radio test is skipable 2022-08-30 11:54:10 +02:00
Roland Drabesch f2bff1d39c FinalCheck is ready for fai 2022-08-26 16:14:40 +02:00
Roland Drabesch c5dbb895d2 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production into main 2022-08-23 17:17:00 +02:00
Roland Drabesch dadf582624 Adding SkipProcces for SONDERLOCKEN 2022-08-23 17:16:33 +02:00
Roland Drabesch 8e9114dd30 CordonelAssemblyLine is now released and reday for FAI 2022-08-22 17:31:35 +02:00
Roland Drabesch ac7460f07c Picking is now fine for FAI 2022-08-19 17:22:05 +02:00
Roland Drabesch 0b9f98aa1f fix bugs 2022-08-12 15:18:51 +02:00
Roland Drabesch 4d3f2779a0 Fix last things on LUT update 2022-08-12 09:33:04 +02:00
Roland Drabesch 5fb9a2e9b8 Add LUT management and merge# 2022-08-12 08:55:24 +02:00
Roland Drabesch 3f41a67c92 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production into main 2022-08-10 17:06:18 +02:00
Roland Drabesch 0c3e28b8bd Mostly EOL and LUT Management 2022-08-10 17:06:09 +02:00
Roland Drabesch f819392e7e merge one 2022-07-21 12:33:47 +02:00
Roland Drabesch adc43d756b change paramet on finla check 2022-07-20 11:25:23 +02:00
Roland Drabesch 5d05d267ce merge 2022-07-13 17:40:16 +02:00
Roland Drabesch 5de78cb4b1 radio param change 2022-07-13 17:39:04 +02:00
Roland Drabesch 8e49e3b42f psuh 2022-06-23 10:20:26 +02:00
Roland Drabesch d66a53a63a merge 2022-06-21 12:55:58 +02:00
Roland Drabesch 768d4e110a vergessen 2022-06-21 12:54:26 +02:00
Roland Drabesch 482e69803d Merge branch '3-preadjustment-tempflansch-read-error' into 'main' 
to long no commit

Closes #3

See merge request la_operations/laa_production!4
 2022-05-10 13:39:50 +00:00
Roland Drabesch 8c5dfba956 to long no commit 2022-05-10 15:34:48 +02:00
Roland Drabesch 4c758809ad Merge branch '2-add-file-for-register-recovery' into 'main' 
base classes and fake function created

Closes #2

See merge request la_operations/laa_production!2
 2022-05-02 08:59:01 +00:00
Roland Drabesch b1adcd0d7f base classes and fake function created 
wait for file format aproval
 2022-04-29 09:58:45 +02:00
Roland Drabesch 62903f39ec Add base classes 2022-04-29 09:12:50 +02:00
Roland Drabesch ad752435c1 release 2022-04-21 11:31:41 +02:00
Roland Drabesch 81e7e16653 revert merge and 2022-04-06 13:36:43 +02:00
Roland Drabesch 152e775310 merge done 2022-04-06 12:38:36 +02:00
Roland Drabesch 80c0b07305 Merge 
Common\Hardware\WaterMeter\Genesis\GenesisFile\MeterFile.cs
 2022-04-06 12:38:28 +02:00
Roland Drabesch ec37bb9b9e Long time no commit 2022-04-06 10:42:16 +02:00
Rowlander 0a72be12ab add toss weatherstation 2021-10-04 14:04:07 +02:00
Rowlander d6c41b6b9f now with better references 2021-10-04 09:36:33 +02:00