marekf
4124443f36
Cause: - Preadjustment Completion and TBF Q3 calibration results required configurable database persistence. - Both write operations required diagnostics and simulation support. Solution: 1. Added independent database writer configurations - Added PreadjustmentCompletionWriter and Q3CalibrationWriter to gci_config. - Support SQL commands, stored procedures and parameter mappings. - Added SQL table creation and verification scripts. 2. Added Preadjustment Completion storage - Store PCB ID, meter size, amplitude settings, temperature offsets, zero-flow offsets, timestamp and overall result. - Use captured Completion readout values. - Preserve the original HTTP reporting. - Report SQL connection and write status in the corresponding slot diagnostics. 3. Added Q3 calibration storage - Forward TBF results through GCI Bridge to the GCI database API. - Store signed deviations and written calibration factors for all three paths. - Write to SQL after successful calibration register writes and StoreCalibration. - Include PCB ID and UTC timestamp. 4. Added simulation support - Generate sample Completion and Q3 records for simulated slots. - Perform real SQL writes when the corresponding writer is enabled. - Log connection progress, write outcomes and generated record IDs. 5. Separated calibration and database outcomes - Preserve meter operation results when database storage fails. - Expose database write status independently. 6. Increased revision - Updated revision from 3.9.3146.108 to 3.9.3146.109. Validation: - Confirmed successful SQL storage for simulated Completion. - Confirmed successful Q3 calibration result storage. ToDo: - Use the GCI Q3 storage API as the foundation for future migration of Q3 calibration from the direct TBF communication branch to GCI.
75 lines
3.1 KiB
C#
75 lines
3.1 KiB
C#
using GenesisCordonelInterface.API;
|
|
using GenesisCordonelInterface.Core.Config;
|
|
using GenesisCordonelInterface.Core.DataStorage.Reading.Common.Models;
|
|
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Security.AccessControl;
|
|
using System.Text;
|
|
using System.Threading.Tasks;
|
|
using System.Windows.Forms;
|
|
using UdsReaderType_CalibrationParams = GenesisCordonelInterface.Core.DataStorage.Reading.Implementation.PreAdjustmentCalibrationParams.PreAdjustmentCalibrationParamsReader;
|
|
using UdsReaderType_LoginPasswords = GenesisCordonelInterface.Core.DataStorage.Reading.Implementation.MeterLoginPasswords.MeterLoginPasswordReader;
|
|
using GciPublicModels = GenesisCordonelInterface.API.PublicModels;
|
|
using GciEnums = GenesisCordonelInterface.API.Enums;
|
|
using GciType = GenesisCordonelInterface.API.InterfaceOutsideToGCI;
|
|
using GciDataStorageReadingModels = GenesisCordonelInterface.Core.DataStorage.Reading.Common.Models;
|
|
using GciGUIType = GenesisCordonelInterface.UI.MainView;
|
|
|
|
namespace GenesisCordonelInterface.Core
|
|
{
|
|
public class Engine
|
|
{
|
|
GciConfig gciConfig;
|
|
|
|
public UdsReaderType_LoginPasswords loginPasswordsDataStorageReader;
|
|
public UdsReaderType_CalibrationParams calibrationParamsStorageReader;
|
|
//readonly UdsWriterType writer;
|
|
|
|
//diag GUI for GCI
|
|
GciGUIType gciGUI;
|
|
Form gciGuiHostForm;
|
|
|
|
//diag GUI for GciBridge
|
|
public UserControl gciBridgeGUIUserControl;
|
|
public UI.MainForm gciBridgeGuiForm;
|
|
|
|
public InterfaceOutsideToGCI gciExternalInterface;
|
|
|
|
/// <summary>
|
|
/// Initializes a new instance of the public GCI facade.
|
|
/// </summary>
|
|
public Engine()
|
|
{
|
|
gciConfig = GciConfigLoader.LoadDefault();
|
|
|
|
loginPasswordsDataStorageReader = new UdsReaderType_LoginPasswords
|
|
(
|
|
new GciDataStorageReadingModels.DataStorageConfig
|
|
(
|
|
nameof(GciEnums.DataStorageReaderTypes.LoginPasswordsReader),
|
|
GciDataStorageReadingModels.DataStorageType.LocalDatabase,
|
|
gciConfig.DataStorageSection.MeterLoginPasswords.DataSource,
|
|
gciConfig.DataStorageSection.MeterLoginPasswords.QueryTemplate
|
|
)
|
|
);
|
|
calibrationParamsStorageReader = new UdsReaderType_CalibrationParams
|
|
(
|
|
new GciDataStorageReadingModels.DataStorageConfig
|
|
(
|
|
nameof(GciEnums.DataStorageReaderTypes.CalibrationParamsReader),
|
|
GciDataStorageReadingModels.DataStorageType.LocalDatabase,
|
|
gciConfig.DataStorageSection.PreAdjustmentCalibrationParams.DataSource,
|
|
gciConfig.DataStorageSection.PreAdjustmentCalibrationParams.QueryTemplate
|
|
)
|
|
);
|
|
|
|
gciExternalInterface = new InterfaceOutsideToGCI(
|
|
new InterfaceGCIToLaatzen(),
|
|
loginPasswordsDataStorageReader,
|
|
calibrationParamsStorageReader,
|
|
gciConfig.DataStorageSection);
|
|
}
|
|
}
|
|
}
|