Commit Graph
870 Commits
Author SHA1 Message Date
Stoyan Zlatev 58720f9c6d Merge branch 'temperature_calibration' into 'main'
Temperature calibration

See merge request la_operations/laa_production!11
2023-09-04 12:43:00 +00:00
Stoyan Zlatev 4b808005e7 version changed back to 2.6.0 2023-09-04 14:34:54 +02:00
Stoyan Zlatev 626baaf2d7 min and max TOF's 2023-09-04 14:10:04 +02:00
Stoyan Zlatev b269fa4c04 error fixes 2023-09-04 13:43:04 +02:00
Stoyan Zlatev 2adc8756bc mudbus_master_csharp project added directly to the solution 2023-09-04 13:38:00 +02:00
Stoyan Zlatev f83e576be3 Merge branch 'main' into temperature_calibration 2023-09-04 13:31:43 +02:00
Stoyan Zlatev 7581691405 Revert "adding modbus_master_csharp project directly to magflux"
This reverts commit 0f65c78d80.
2023-09-04 13:27:37 +02:00
Stoyan Zlatev 0f65c78d80 adding modbus_master_csharp project directly to magflux 2023-09-04 13:25:27 +02:00
Stoyan Zlatev 22dc798fe0 removing test mvc project 2023-09-04 12:32:57 +02:00
Stoyan Zlatev 92086f3c58 values and units getters and setters 2023-09-04 12:32:29 +02:00
Stoyan Zlatev 5b6385b7b5 Merge branch 'configuration_json' into temperature_calibration 2023-09-04 11:25:14 +02:00
Stoyan Zlatev 16d2d3d210 json config 2023-09-04 11:22:43 +02:00
Stoyan Zlatev 8ed7a5bebe main in tempratur_calibration merged - source taken 2023-09-04 10:44:06 +02:00
Stoyan Zlatev 24ac31d5da configuration json register detail access 2023-09-04 10:38:49 +02:00
Stoyan Zlatev b1bff73973 references added 2023-09-01 13:48:55 +02:00
Stoyan Zlatev af4d27b061 merge main on configuration_json, by conflicts source taken 2023-09-01 09:47:34 +02:00
Stoyan Zlatev 2704c3c646 /api/jsonconfiguration - output encoding in UTF8 2023-09-01 09:44:51 +02:00
Stoyan Zlatev e1524efc87 Access fields to upper case 2023-09-01 09:43:49 +02:00
Stoyan Zlatev 539ed9e3ed Endpoint: /api/jsonconfiguration - reads json configuration from the root of the IIS App 2023-09-01 09:31:14 +02:00
Stoyan Zlatev 776452b04e Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-09-01 08:50:13 +02:00
Stoyan Zlatev 5a70560137 equipments testing 2023-09-01 08:50:08 +02:00
Thomas Wiedebusch 3b60dcc25f GenesisMeter: - corrected region detection of "NA"
ServiceFwUpdateSw: - output of FW version in report file
2023-08-31 11:39:55 +02:00
Stoyan Zlatev 3e36514085 Configuration json API endpoint 2023-08-31 11:09:16 +02:00
Roland Drabesch 330417b355 version nummber +1 2023-08-31 09:50:36 +02:00
Roland Drabesch bc0d758ac3 Merge and versionnumber +1 2023-08-31 09:50:25 +02:00
Roland Drabesch 254fd75664 fixing progressbar for Zeroflow magflux and move it into a task 2023-08-31 09:45:28 +02:00
Roland Drabesch 07963e2f61 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-08-31 09:45:14 +02:00
Roland Drabesch 57cf172d65 Fixing Zerflow progressbar for magflux and move zeroflow into a task 2023-08-31 09:43:34 +02:00
Roland Drabesch ed51e2cd34 Add Progressbar for magflux zeroflow 2023-08-30 16:45:39 +02:00
Stoyan Zlatev ab7e208ce2 new branch for configuration_json 2023-08-30 16:41:56 +02:00
Roland Drabesch bbbaa8f7a1 MagFlux 5 min Zeroflow, Magflux testresult mit abfrage 2023-08-30 16:18:15 +02:00
Stoyan Zlatev 222001ebc5 TestBench sql connection from laa_packages implemented 2023-08-30 14:28:52 +02:00
Stoyan Zlatev 604472c1b7 sql connection changed for old endpoints in TestBenchController 2023-08-29 15:00:13 +02:00
Stoyan Zlatev eba79a4d75 API for Cordonel Calibrations offsets 2023-08-29 13:56:24 +02:00
Roland Drabesch 3f40b39b39 merge 2023-08-28 13:30:51 +02:00
Roland Drabesch a9d1c77716 data an 2023-08-28 13:28:22 +02:00
Stoyan Zlatev 032bf1a37e friday 2023-08-25 16:09:00 +02:00
Stoyan Zlatev 56ed57f15b secondary commit 2023-08-25 15:56:36 +02:00
Stoyan Zlatev 83359fc4d7 cleaning from old unused projects 2023-08-25 15:49:27 +02:00
Stoyan Zlatev 2d707d9e0a commit staged LegacyGenesisCtl 2023-08-25 15:46:44 +02:00
Stoyan Zlatev 8a019b643c mps stage commit 2023-08-25 15:45:37 +02:00
Stoyan Zlatev 6e506068fe adding messurement units and sirt to main 2023-08-25 15:41:24 +02:00
Stoyan Zlatev 4c761e4669 line commented 2023-08-25 15:34:50 +02:00
Stoyan Zlatev 67e433e007 line commented 2023-08-25 15:30:37 +02:00
Stoyan Zlatev b8e7ef8ea4 Merge branch 'main' into entwicklung_eregister 2023-08-25 15:26:38 +02:00
Stoyan Zlatev 56bd35d9a2 CommonMessurementUnits 2023-08-25 15:23:57 +02:00
Thomas Wiedebusch e16fb6166e SI-Units PTB docu added 2023-08-24 16:00:55 +02:00
Roland Drabesch e4fecbf9d8 Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production 2023-08-23 14:45:36 +02:00
Roland Drabesch edebf29ba3 getProgramming parameters now with real data types 2023-08-23 14:45:24 +02:00
Stoyan Zlatev f02f9223ab Merge branch 'main' into entwicklung_eregister 2023-08-23 09:13:58 +02:00