diff --git a/changelog.md b/changelog.md new file mode 100644 --- /dev/null +++ b/changelog.md @@ -0,0 +1,4 @@ +# Version 0.1.1 + +- exposed OpcXmlDaClient.Protocol.Types for documentation +- bugfix in XML generation of Subscribe messages which lead to OPC servers ignore our SubscriptionPingRate diff --git a/opc-xml-da-client.cabal b/opc-xml-da-client.cabal --- a/opc-xml-da-client.cabal +++ b/opc-xml-da-client.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: opc-xml-da-client -version: 0.1 +version: 0.1.1 synopsis: OPC XML-DA Client description: An implementation of OPC XML-DA protocol for client applications. The specification for the protocol can be found [here](http://www.diit.unict.it/users/scava/dispense/II/OPCDataAccessXMLSpecification.pdf). @@ -14,28 +14,41 @@ extra-source-files: protocol/*.domain.yaml xml-schema-values/*.domain.yaml + changelog.md source-repository head type: git location: git://github.com/mlabs-haskell/opc-xml-da-client.git library - hs-source-dirs: library + hs-source-dirs: library, protocol default-extensions: ApplicativeDo, BangPatterns, BinaryLiterals, BlockArguments, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveLift, DeriveTraversable, DerivingVia, DuplicateRecordFields, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, HexFloatLiterals, InstanceSigs, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NamedFieldPuns, NoImplicitPrelude, NoMonomorphismRestriction, NumericUnderscores, OverloadedLabels, OverloadedStrings, PatternGuards, PatternSynonyms, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, ScopedTypeVariables, StandaloneDeriving, StrictData, TemplateHaskell, TupleSections, TypeApplications, TypeFamilies, TypeOperators, UndecidableInstances, ViewPatterns default-language: Haskell2010 ghc-options: -funbox-strict-fields exposed-modules: OpcXmlDaClient + OpcXmlDaClient.Protocol.Types + OpcXmlDaClient.Protocol.XmlConstruction + OpcXmlDaClient.Protocol.XmlParsing + other-modules: + OpcXmlDaClient.Protocol.Namespaces build-depends: + attoparsec >=0.13.2.5 && <0.15, + attoparsec-data ^>=1.0.5.2, base >=4.14 && <5, + base64 ^>=0.4.2.3, bytestring >=0.10 && <0.12, containers ^>=0.6.2.1, + domain ^>=0.1.1, + domain-optics ^>=0.1.0.1, http-client >=0.7.8 && <0.8, opc-xml-da-client-base, - opc-xml-da-client-protocol, + opc-xml-da-client-xml-builder, opc-xml-da-client-xml-schema-values, scientific ^>=0.3.6.2, text >=1 && <2, + text-builder >=0.6.6.2 && <0.7, + time >=1.9.3 && <2, transformers ^>=0.5, vector ^>=0.12, xml-conduit ^>=1.9.1.1, @@ -59,37 +72,6 @@ tasty-hunit >=0.9 && <0.11, tasty-quickcheck >=0.9 && <0.11, -library opc-xml-da-client-protocol - hs-source-dirs: protocol - default-extensions: ApplicativeDo, BangPatterns, BinaryLiterals, BlockArguments, ConstraintKinds, DataKinds, DefaultSignatures, DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveLift, DeriveTraversable, DerivingVia, DuplicateRecordFields, EmptyDataDecls, FlexibleContexts, FlexibleInstances, FunctionalDependencies, GADTs, GeneralizedNewtypeDeriving, HexFloatLiterals, InstanceSigs, LambdaCase, LiberalTypeSynonyms, MagicHash, MultiParamTypeClasses, MultiWayIf, NamedFieldPuns, NoImplicitPrelude, NoMonomorphismRestriction, NumericUnderscores, OverloadedLabels, OverloadedStrings, PatternGuards, PatternSynonyms, ParallelListComp, QuasiQuotes, RankNTypes, RecordWildCards, ScopedTypeVariables, StandaloneDeriving, StrictData, TemplateHaskell, TupleSections, TypeApplications, TypeFamilies, TypeOperators, UndecidableInstances, ViewPatterns - default-language: Haskell2010 - ghc-options: -funbox-strict-fields - exposed-modules: - OpcXmlDaClient.Protocol.Types - OpcXmlDaClient.Protocol.XmlConstruction - OpcXmlDaClient.Protocol.XmlParsing - other-modules: - OpcXmlDaClient.Protocol.Namespaces - build-depends: - attoparsec >=0.13.2.5 && <0.15, - attoparsec-data ^>=1.0.5.2, - base >=4.14 && <5, - base64 ^>=0.4.2.3, - bytestring >=0.10 && <0.12, - containers ^>=0.6.2.1, - domain ^>=0.1.1, - domain-optics ^>=0.1.0.1, - opc-xml-da-client-base, - opc-xml-da-client-xml-builder, - opc-xml-da-client-xml-schema-values, - scientific ^>=0.3.6.2, - text >=1 && <2, - text-builder >=0.6.6.2 && <0.7, - time >=1.9.3 && <2, - vector ^>=0.12, - xml-conduit ^>=1.9.1.1, - xml-parser ^>=0.1, - test-suite protocol-test type: exitcode-stdio-1.0 hs-source-dirs: protocol-test @@ -100,7 +82,6 @@ build-depends: QuickCheck >=2.8.1 && <3, quickcheck-instances >=0.3.11 && <0.4, - opc-xml-da-client-protocol, opc-xml-da-client, rerebase >=1.13.0.1 && <2, tasty >=0.12 && <2, diff --git a/protocol/OpcXmlDaClient/Protocol/XmlConstruction.hs b/protocol/OpcXmlDaClient/Protocol/XmlConstruction.hs --- a/protocol/OpcXmlDaClient/Protocol/XmlConstruction.hs +++ b/protocol/OpcXmlDaClient/Protocol/XmlConstruction.hs @@ -98,7 +98,7 @@ (opcQName elementName) ( catMaybes [ Just ("ReturnValuesOnReply", booleanContent (#returnValuesOnReply x)), - ("SubcriptionPingRate",) . intContent <$> #subscriptionPingRate x + ("SubscriptionPingRate",) . intContent <$> #subscriptionPingRate x ] ) ( catMaybes @@ -355,7 +355,7 @@ ("ElementNameFilter",) . X.textContent <$> #elementNameFilter x, ("VendorFilter",) . X.textContent <$> #vendorFilter x, pure ("ReturnAllProperties", booleanContent (#returnAllProperties x)), - pure ("ReturnAllPropertyValues", booleanContent (#returnAllPropertyValues x)), + pure ("ReturnPropertyValues", booleanContent (#returnPropertyValues x)), pure ("ReturnErrorText", booleanContent (#returnErrorText x)) ] ) diff --git a/protocol/types.domain.yaml b/protocol/types.domain.yaml --- a/protocol/types.domain.yaml +++ b/protocol/types.domain.yaml @@ -233,7 +233,7 @@ elementNameFilter: Maybe Text vendorFilter: Maybe Text returnAllProperties: Bool - returnAllPropertyValues: Bool + returnPropertyValues: Bool returnErrorText: Bool BrowseFilter: