From db5ae7e626ead23efbb43c344c04cf2437ed0c89 Mon Sep 17 00:00:00 2001 From: Daniel Ottiger Date: Mon, 13 Nov 2023 10:23:50 +0100 Subject: [PATCH 1/6] Added packages for Delphi 12 Athens (#62) --- docs/history.txt | 4 + packages/DelphiModbus12Athens.dpk | 46 ++++ packages/DelphiModbus12Athens.dproj | 206 ++++++++++++++++++ packages/DelphiModbus12Athens.res | Bin 0 -> 712 bytes .../PackagesDelphiModbus12Athens.groupproj | 48 ++++ packages/dclDelphiModbus12Athens.dpk | 49 +++++ packages/dclDelphiModbus12Athens.dproj | 124 +++++++++++ packages/dclDelphiModbus12Athens.res | Bin 0 -> 724 bytes source/ModBusCompiler.inc | 32 ++- 9 files changed, 508 insertions(+), 1 deletion(-) create mode 100644 packages/DelphiModbus12Athens.dpk create mode 100644 packages/DelphiModbus12Athens.dproj create mode 100644 packages/DelphiModbus12Athens.res create mode 100644 packages/PackagesDelphiModbus12Athens.groupproj create mode 100644 packages/dclDelphiModbus12Athens.dpk create mode 100644 packages/dclDelphiModbus12Athens.dproj create mode 100644 packages/dclDelphiModbus12Athens.res diff --git a/docs/history.txt b/docs/history.txt index 01d0b32..27a595b 100644 --- a/docs/history.txt +++ b/docs/history.txt @@ -1,3 +1,7 @@ +Version 1.6.11 +================================= +- Added support for Delphi 12 Athens. + Version 1.6.10 ================================= - Added support for Delphi 11 Alexandria. diff --git a/packages/DelphiModbus12Athens.dpk b/packages/DelphiModbus12Athens.dpk new file mode 100644 index 0000000..c65640c --- /dev/null +++ b/packages/DelphiModbus12Athens.dpk @@ -0,0 +1,46 @@ +package DelphiModbus12Athens; + +{$R *.res} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO OFF} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'Delphi Modbus components runtime package'} +{$RUNONLY} +{$IMPLICITBUILD OFF} + +requires + rtl, + IndyCore, + IndyProtocols, + IndySystem; + +contains + IdModbusClient in '..\source\IdModbusClient.pas', + IdModbusServer in '..\source\IdModbusServer.pas', + ModbusConsts in '..\source\ModbusConsts.pas', + ModbusTypes in '..\source\ModbusTypes.pas', + ModbusStrConsts in '..\source\ModbusStrConsts.pas', + ModbusUtils in '..\source\ModbusUtils.pas'; + +end. diff --git a/packages/DelphiModbus12Athens.dproj b/packages/DelphiModbus12Athens.dproj new file mode 100644 index 0000000..cba3947 --- /dev/null +++ b/packages/DelphiModbus12Athens.dproj @@ -0,0 +1,206 @@ + + + {28B7A78E-A6F3-4863-930B-6EE725B5663B} + DelphiModbus12Athens.dpk + True + Debug + 1 + Package + None + 20.1 + Win32 + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + true + Cfg_2 + true + true + + + false + false + false + false + false + 00400000 + true + true + DelphiModbus12Athens + Delphi Modbus components runtime package + true + true + 1033 + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName= + System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) + + + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + Debug + activity-1.7.2.dex.jar;annotation-experimental-1.3.0.dex.jar;annotation-jvm-1.6.0.dex.jar;annotations-13.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;billing-6.0.1.dex.jar;biometric-1.1.0.dex.jar;browser-1.4.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;concurrent-futures-1.1.0.dex.jar;core-1.10.1.dex.jar;core-common-2.2.0.dex.jar;core-ktx-1.10.1.dex.jar;core-runtime-2.2.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;error_prone_annotations-2.9.0.dex.jar;exifinterface-1.3.6.dex.jar;firebase-annotations-16.2.0.dex.jar;firebase-common-20.3.1.dex.jar;firebase-components-17.1.0.dex.jar;firebase-datatransport-18.1.7.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-encoders-proto-16.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.1.3.dex.jar;firebase-installations-interop-17.1.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-23.1.2.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;kotlin-stdlib-1.8.22.dex.jar;kotlin-stdlib-common-1.8.22.dex.jar;kotlin-stdlib-jdk7-1.8.22.dex.jar;kotlin-stdlib-jdk8-1.8.22.dex.jar;kotlinx-coroutines-android-1.6.4.dex.jar;kotlinx-coroutines-core-jvm-1.6.4.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.6.1.dex.jar;lifecycle-livedata-2.6.1.dex.jar;lifecycle-livedata-core-2.6.1.dex.jar;lifecycle-runtime-2.6.1.dex.jar;lifecycle-service-2.6.1.dex.jar;lifecycle-viewmodel-2.6.1.dex.jar;lifecycle-viewmodel-savedstate-2.6.1.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;okio-jvm-3.4.0.dex.jar;play-services-ads-22.2.0.dex.jar;play-services-ads-base-22.2.0.dex.jar;play-services-ads-identifier-18.0.0.dex.jar;play-services-ads-lite-22.2.0.dex.jar;play-services-appset-16.0.1.dex.jar;play-services-base-18.1.0.dex.jar;play-services-basement-18.1.0.dex.jar;play-services-cloud-messaging-17.0.1.dex.jar;play-services-location-21.0.1.dex.jar;play-services-maps-18.1.0.dex.jar;play-services-measurement-base-20.1.2.dex.jar;play-services-measurement-sdk-api-20.1.2.dex.jar;play-services-stats-17.0.2.dex.jar;play-services-tasks-18.0.2.dex.jar;print-1.0.0.dex.jar;profileinstaller-1.3.0.dex.jar;room-common-2.2.5.dex.jar;room-runtime-2.2.5.dex.jar;savedstate-1.2.1.dex.jar;sqlite-2.1.0.dex.jar;sqlite-framework-2.1.0.dex.jar;startup-runtime-1.1.1.dex.jar;tracing-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.1.8.dex.jar;transport-runtime-3.1.8.dex.jar;user-messaging-platform-2.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.7.0.dex.jar + + + package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= + Debug + activity-1.7.2.dex.jar;annotation-experimental-1.3.0.dex.jar;annotation-jvm-1.6.0.dex.jar;annotations-13.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;billing-6.0.1.dex.jar;biometric-1.1.0.dex.jar;browser-1.4.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;concurrent-futures-1.1.0.dex.jar;core-1.10.1.dex.jar;core-common-2.2.0.dex.jar;core-ktx-1.10.1.dex.jar;core-runtime-2.2.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;error_prone_annotations-2.9.0.dex.jar;exifinterface-1.3.6.dex.jar;firebase-annotations-16.2.0.dex.jar;firebase-common-20.3.1.dex.jar;firebase-components-17.1.0.dex.jar;firebase-datatransport-18.1.7.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-encoders-proto-16.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.1.3.dex.jar;firebase-installations-interop-17.1.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-23.1.2.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;kotlin-stdlib-1.8.22.dex.jar;kotlin-stdlib-common-1.8.22.dex.jar;kotlin-stdlib-jdk7-1.8.22.dex.jar;kotlin-stdlib-jdk8-1.8.22.dex.jar;kotlinx-coroutines-android-1.6.4.dex.jar;kotlinx-coroutines-core-jvm-1.6.4.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.6.1.dex.jar;lifecycle-livedata-2.6.1.dex.jar;lifecycle-livedata-core-2.6.1.dex.jar;lifecycle-runtime-2.6.1.dex.jar;lifecycle-service-2.6.1.dex.jar;lifecycle-viewmodel-2.6.1.dex.jar;lifecycle-viewmodel-savedstate-2.6.1.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;okio-jvm-3.4.0.dex.jar;play-services-ads-22.2.0.dex.jar;play-services-ads-base-22.2.0.dex.jar;play-services-ads-identifier-18.0.0.dex.jar;play-services-ads-lite-22.2.0.dex.jar;play-services-appset-16.0.1.dex.jar;play-services-base-18.1.0.dex.jar;play-services-basement-18.1.0.dex.jar;play-services-cloud-messaging-17.0.1.dex.jar;play-services-location-21.0.1.dex.jar;play-services-maps-18.1.0.dex.jar;play-services-measurement-base-20.1.2.dex.jar;play-services-measurement-sdk-api-20.1.2.dex.jar;play-services-stats-17.0.2.dex.jar;play-services-tasks-18.0.2.dex.jar;print-1.0.0.dex.jar;profileinstaller-1.3.0.dex.jar;room-common-2.2.5.dex.jar;room-runtime-2.2.5.dex.jar;savedstate-1.2.1.dex.jar;sqlite-2.1.0.dex.jar;sqlite-framework-2.1.0.dex.jar;startup-runtime-1.1.1.dex.jar;tracing-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.1.8.dex.jar;transport-runtime-3.1.8.dex.jar;user-messaging-platform-2.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.7.0.dex.jar + + + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;NSLocationAlwaysAndWhenInUseUsageDescription=The reason for accessing the location information of the user;UIBackgroundModes=;NSContactsUsageDescription=The reason for accessing the contacts;NSPhotoLibraryUsageDescription=The reason for accessing the photo library;NSPhotoLibraryAddUsageDescription=The reason for adding to the photo library;NSCameraUsageDescription=The reason for accessing the camera;NSFaceIDUsageDescription=The reason for accessing the face id;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSSiriUsageDescription=The reason for accessing Siri;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing bluetooth;NSBluetoothPeripheralUsageDescription=The reason for accessing bluetooth peripherals;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSMotionUsageDescription=The reason for accessing the accelerometer;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers + iPhoneAndiPad + true + Debug + $(MSBuildProjectName) + + + CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;NSLocationAlwaysAndWhenInUseUsageDescription=The reason for accessing the location information of the user;UIBackgroundModes=;NSContactsUsageDescription=The reason for accessing the contacts;NSPhotoLibraryUsageDescription=The reason for accessing the photo library;NSPhotoLibraryAddUsageDescription=The reason for adding to the photo library;NSCameraUsageDescription=The reason for accessing the camera;NSFaceIDUsageDescription=The reason for accessing the face id;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSSiriUsageDescription=The reason for accessing Siri;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing bluetooth;NSBluetoothPeripheralUsageDescription=The reason for accessing bluetooth peripherals;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSMotionUsageDescription=The reason for accessing the accelerometer;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers + iPhoneAndiPad + true + + + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface + Debug + + + CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface + Debug + + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) + 1033 + + + RELEASE;$(DCC_Define) + 0 + false + 0 + + + DEBUG;$(DCC_Define) + false + true + + + true + + + true + + + true + + + true + + + + MainSource + + + Base + + + Cfg_1 + Base + + + Cfg_2 + Base + + + + Delphi.Personality.12 + Package + + + + DelphiModbus12Athens.dpk + + + Microsoft Office 2000 Sample Automation Server Wrapper Components + Microsoft Office XP Sample Automation Server Wrapper Components + + + + False + False + False + False + False + False + True + False + + + 12 + + + + diff --git a/packages/DelphiModbus12Athens.res b/packages/DelphiModbus12Athens.res new file mode 100644 index 0000000000000000000000000000000000000000..d3ba5ad67cfbb4c9672101b5b93be48a882b59d8 GIT binary patch literal 712 zcmb7?Jx;?w5QU#37lew2o&s9rAU8-z2#KE<0YSz}i;|E(DRH8ZT!6!H3vNTt4KUxV zS;a}0k#@a1^XAR-&PdV`t0>CFal@K5A3p#SxLBlm=t0d|%(1N(y|UjZ<&>zUC+-RR zEoZZ@@aI>u{F1|eFI`kJLLd2e=@Ul)-%<;Wm1_vwSQGVO&Na{s;D^IRiWTXc6{Eov zr8*?n=`=?=(DvGTs&Sm%KqVsU5r8n_Sxpw(Adcg5EM`hzhHmP}Qu5rYTzc>|G)Y zJRMZpKh5y(qRkisx^FE0#n&B@j$L;%r@-EF0B!FPD)oY RZmI6*Y{oQ{R-Hkcn?HieV|f4o literal 0 HcmV?d00001 diff --git a/packages/PackagesDelphiModbus12Athens.groupproj b/packages/PackagesDelphiModbus12Athens.groupproj new file mode 100644 index 0000000..9a2cf10 --- /dev/null +++ b/packages/PackagesDelphiModbus12Athens.groupproj @@ -0,0 +1,48 @@ + + + {45F9476B-22CE-429A-9796-F37870CF3483} + + + + + + + + + + + Default.Personality.12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/dclDelphiModbus12Athens.dpk b/packages/dclDelphiModbus12Athens.dpk new file mode 100644 index 0000000..c12c791 --- /dev/null +++ b/packages/dclDelphiModbus12Athens.dpk @@ -0,0 +1,49 @@ +package dclDelphiModbus12Athens; + +{$R *.res} +{$R '..\source\ModbusReg.dcr'} +{$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} +{$ALIGN 8} +{$ASSERTIONS ON} +{$BOOLEVAL OFF} +{$DEBUGINFO ON} +{$EXTENDEDSYNTAX ON} +{$IMPORTEDDATA ON} +{$IOCHECKS ON} +{$LOCALSYMBOLS ON} +{$LONGSTRINGS ON} +{$OPENSTRINGS ON} +{$OPTIMIZATION OFF} +{$OVERFLOWCHECKS OFF} +{$RANGECHECKS OFF} +{$REFERENCEINFO ON} +{$SAFEDIVIDE OFF} +{$STACKFRAMES ON} +{$TYPEDADDRESS OFF} +{$VARSTRINGCHECKS ON} +{$WRITEABLECONST OFF} +{$MINENUMSIZE 1} +{$IMAGEBASE $400000} +{$DEFINE DEBUG} +{$ENDIF IMPLICITBUILDING} +{$DESCRIPTION 'Delphi Modbus components'} +{$DESIGNONLY} +{$IMPLICITBUILD OFF} + +requires + rtl, + DelphiModbus12Athens, + vcl, + designide, + xmlrtl, + vclactnband, + vclx, + vclimg; + +contains + ModbusReg in '..\source\ModbusReg.pas', + frm_About in '..\source\frm_About.pas' {frmAbout}, + AboutComponentEditor in '..\source\AboutComponentEditor.pas', + ModbusSplash in '..\source\ModbusSplash.pas'; + +end. diff --git a/packages/dclDelphiModbus12Athens.dproj b/packages/dclDelphiModbus12Athens.dproj new file mode 100644 index 0000000..23d650a --- /dev/null +++ b/packages/dclDelphiModbus12Athens.dproj @@ -0,0 +1,124 @@ + + + {4DDA62BC-A063-44C9-9409-2393797D14A8} + dclDelphiModbus12Athens.dpk + True + Debug + 1 + Package + VCL + 20.1 + Win32 + + + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + true + Base + true + + + false + false + false + false + false + 00400000 + true + true + dclDelphiModbus12Athens + Delphi Modbus components + true + true + Vcl;Vcl.Imaging;Vcl.Touch;Vcl.Samples;Vcl.Shell;System;Xml;Data;Datasnap;Web;Soap;DUnitX.Loggers.GUI;Winapi;$(DCC_Namespace) + 1033 + CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName= + + + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) + 1033 + vcl;rtl;xmlrtl;vclimg;vclactnband;vclx;DelphiModbus12Athens;$(DCC_UsePackage) + + + vcl;rtl;xmlrtl;vclimg;vclactnband;vclx;$(DCC_UsePackage) + + + RELEASE;$(DCC_Define) + 0 + false + 0 + + + DEBUG;$(DCC_Define) + false + true + + + + MainSource + + + + + + + + + + + + +
frmAbout
+ + + + + Base + + + Cfg_1 + Base + + + Cfg_2 + Base + + + + Delphi.Personality.12 + Package + + + + dclDelphiModbus12Athens.dpk + + + + True + False + + + 12 + + + + diff --git a/packages/dclDelphiModbus12Athens.res b/packages/dclDelphiModbus12Athens.res new file mode 100644 index 0000000000000000000000000000000000000000..05005fd8033e072812d8aca4d2b78668ba4917c3 GIT binary patch literal 724 zcmb7?%Syvg5QhJhEUYV+E?u~AC8=a12qJhP;HAV++(~b?g)}X(eGebTt#9MrH!yy4 z;-Qya2j*nXT>klUW+dqdt*TlvHzaHL_yIYAi$!XNJ}GO&m>oUqmGed^R-z|8a!)vK zu}!|hpI^!9YYhLrbWzCwedOPzPaFYw3zeFv&N}h{coS+1*Jgk>m&J3vY@nW&RJ3%aEAq$03+|%B-WqNPe~EvE z*U~9DUZu9<(I(4Kmvme3DqT&fG}*O(?D}uwZL`?skn04_b_u}j*XPj;ze83|7id-O!}^{HWNwdA UW|MJCb;p!5HlvpHeY73=0|aJgVE_OC literal 0 HcmV?d00001 diff --git a/source/ModBusCompiler.inc b/source/ModBusCompiler.inc index 968fdba..36a9674 100644 --- a/source/ModBusCompiler.inc +++ b/source/ModBusCompiler.inc @@ -442,7 +442,37 @@ SOFTWARE. {$DEFINE DMB_DELPHI10_3_RIO} {$DEFINE DMB_DELPHI10_4_SYDNEY} {$DEFINE DMB_DELPHI11_ALEXANDRIA} - {$DEFINE DMB_DELPHI11_ALEXANDRIA_ONLY} +{$ENDIF} + +{$IFDEF VER360} + {$DEFINE DMB_DELPHI1} + {$DEFINE DMB_DELPHI2} + {$DEFINE DMB_DELPHI3} + {$DEFINE DMB_DELPHI4} + {$DEFINE DMB_DELPHI5} + {$DEFINE DMB_DELPHI6} + {$DEFINE DMB_DELPHI7} + {$DEFINE DMB_DELPHI2005} + {$DEFINE DMB_DELPHI2006} + {$DEFINE DMB_DELPHI2007} + {$DEFINE DMB_DELPHI2009} + {$DEFINE DMB_DELPHI2010} + {$DEFINE DMB_DELPHIXE} + {$DEFINE DMB_DELPHIXE2} + {$DEFINE DMB_DELPHIXE3} + {$DEFINE DMB_DELPHIXE4} + {$DEFINE DMB_DELPHIXE5} + {$DEFINE DMB_DELPHIXE6} + {$DEFINE DMB_DELPHIXE7} + {$DEFINE DMB_DELPHIXE8} + {$DEFINE DMB_DELPHI10_SEATTLE} + {$DEFINE DMB_DELPHI10_1_BERLIN} + {$DEFINE DMB_DELPHI10_2_TOKYO} + {$DEFINE DMB_DELPHI10_3_RIO} + {$DEFINE DMB_DELPHI10_4_SYDNEY} + {$DEFINE DMB_DELPHI11_ALEXANDRIA} + {$DEFINE DMB_DELPHI12_ATHENS} + {$DEFINE DMB_DELPHI12_ATHENS_ONLY} {$ENDIF} {$IFDEF DMB_DELPHI2005} From 9708ba4d8376c62f14c2622d59a1e18d1079c428 Mon Sep 17 00:00:00 2001 From: Pieter Polak Date: Wed, 14 Aug 2024 09:25:24 +0200 Subject: [PATCH 2/6] Added function 'ReportSlaveID' to TIdModbusClient --- source/IdModbusClient.pas | 39 +++++++++++++++++++++++++++++++++++++++ source/ModbusConsts.pas | 3 ++- source/ModbusUtils.pas | 18 ++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/source/IdModbusClient.pas b/source/IdModbusClient.pas index fbe4189..ba75d33 100644 --- a/source/IdModbusClient.pas +++ b/source/IdModbusClient.pas @@ -95,6 +95,7 @@ TIdModBusClient = class(TIdTCPClient) function ReadInputRegisters(const RegNo: Word; const Blocks: Word; var RegisterData: array of Word): Boolean; function ReadSingle(const RegNo: Word; out Value: Single): Boolean; function ReadString(const RegNo: Word; const ALength: Word): String; + function ReportSlaveID(const Blocks: Word; out RegisterData: array of Word):boolean; function WriteCoil(const RegNo: Word; const Value: Boolean): Boolean; function WriteCoils(const RegNo: Word; const Blocks: Word; const RegisterData: array of Boolean): Boolean; function WriteRegister(const RegNo: Word; const Value: Word): Boolean; @@ -235,6 +236,16 @@ function TIdModBusClient.SendCommand(const AModBusFunction: TModBusFunction; SendBuffer.MBPData[3] := Lo(BlockLength); SendBuffer.Header.RecLength := Swap16(6); { This includes UnitID/FuntionCode } end; + mbfReportSlaveID: + begin + BlockLength := ABlockLength; + if (BlockLength > 125) then + BlockLength := 125; { Don't exceed max length } + { Initialise the data part } + SendBuffer.FunctionCode := Byte(AModBusFunction); { Write appropriate function code } + SendBuffer.Header.UnitID := FUnitID; + SendBuffer.Header.RecLength := Swap16(2); { This includes UnitID/FuntionCode } + end; mbfWriteOneCoil: begin { Initialise the data part } @@ -347,6 +358,11 @@ function TIdModBusClient.SendCommand(const AModBusFunction: TModBusFunction; BlockLength := 2000; GetCoilsFromBuffer(@ReceiveBuffer.MBPData[1], BlockLength, Data); end; + mbfReportSlaveID: + begin + BlockLength := Swap16(ReceiveBuffer.Header.RecLength) - 2; + GetReportFromBuffer(@ReceiveBuffer.MBPData[0], BlockLength, Data); + end; mbfReadHoldingRegs, mbfReadInputRegs: begin @@ -585,6 +601,29 @@ function TIdModbusClient.ReadString(const RegNo: Word; const ALength: Word): Str end; end; +function TIdModbusClient.ReportSlaveID(const Blocks: Word; out RegisterData: array of Word): Boolean; +var + bNewConnection: Boolean; + i: integer; +begin + bNewConnection := False; + if FAutoConnect and not Connected then + begin + {$IFDEF DMB_INDY10} + Connect; + {$ELSE} + Connect(FConnectTimeOut); + {$ENDIF} + bNewConnection := True; + end; + FillChar(RegisterData[0], Length(RegisterData), 0); + try + Result := SendCommand(mbfReportSlaveID, 1, 2, RegisterData); + finally + if bNewConnection then + DisConnect; + end; +end; function TIdModBusClient.GetVersion: String; begin diff --git a/source/ModbusConsts.pas b/source/ModbusConsts.pas index 5e48dca..54887c4 100644 --- a/source/ModbusConsts.pas +++ b/source/ModbusConsts.pas @@ -43,7 +43,8 @@ interface mbfWriteOneCoil = $05; mbfWriteOneReg = $06; mbfWriteCoils = $0F; - mbfWriteRegs = $10; + mbfWriteRegs = $10; + mbfReportSlaveID = $11; mbfReadFileRecord = $14; mbfWriteFileRecord = $15; mbfMaskWriteReg = $16; diff --git a/source/ModbusUtils.pas b/source/ModbusUtils.pas index f6dfcae..8d27548 100644 --- a/source/ModbusUtils.pas +++ b/source/ModbusUtils.pas @@ -38,6 +38,8 @@ function Swap16(const DataToSwap: Word): Word; procedure GetCoilsFromBuffer(const Buffer: PByte; const Count: Word; var Data: array of Word); procedure PutCoilsIntoBuffer(const Buffer: PByte; const Count: Word; const Data: array of Word); +procedure GetReportFromBuffer(const Buffer: PByte; const Count: Word; var Data: array of Word); + procedure GetRegistersFromBuffer(const Buffer: PWord; const Count: Word; var Data: array of Word); procedure PutRegistersIntoBuffer(const Buffer: PWord; const Count: Word; const Data: array of Word); @@ -205,6 +207,22 @@ procedure GetRegistersFromBuffer(const Buffer: PWord; const Count: Word; var Dat end; end; +procedure GetReportFromBuffer(const Buffer: PByte; const Count: Word; var Data: array of Word); +var + WordPtr: PByte; + i: Word; +begin + if (Length(Data) < (Count - 1)) or (Length(Data) = 0) or (Count = 0) then + raise Exception.Create('GetRegistersFromBuffer: Data array length cannot be less then Count'); + + WordPtr := Buffer; + i:= 0; + for i:= 0 to (Count - 1) do + begin + Data[i] := Lo(WordPtr^); + Inc(WordPtr); + end; +end; procedure PutRegistersIntoBuffer(const Buffer: PWord; const Count: Word; const Data: array of Word); var From 167859d252350c092b3168426287ea73d8623675 Mon Sep 17 00:00:00 2001 From: Pieter Polak Date: Tue, 27 Aug 2024 15:20:39 +0200 Subject: [PATCH 3/6] Explicitly mention MIT license as the license type --- docs/license.txt | 2 ++ source/AboutComponentEditor.pas | 2 ++ source/IdModbusClient.pas | 2 ++ source/IdModbusServer.pas | 2 ++ source/ModBusCompiler.inc | 2 ++ source/ModbusConsts.pas | 2 ++ source/ModbusReg.pas | 2 ++ source/ModbusSplash.pas | 2 ++ source/ModbusStrConsts.pas | 2 ++ source/ModbusTypes.pas | 2 ++ source/ModbusUtils.pas | 2 ++ source/frm_About.pas | 2 ++ 12 files changed, 24 insertions(+) diff --git a/docs/license.txt b/docs/license.txt index 6728344..b34da58 100644 --- a/docs/license.txt +++ b/docs/license.txt @@ -1,5 +1,7 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/AboutComponentEditor.pas b/source/AboutComponentEditor.pas index fa428ca..fa08400 100644 --- a/source/AboutComponentEditor.pas +++ b/source/AboutComponentEditor.pas @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/IdModbusClient.pas b/source/IdModbusClient.pas index ba75d33..2fca3bc 100644 --- a/source/IdModbusClient.pas +++ b/source/IdModbusClient.pas @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/IdModbusServer.pas b/source/IdModbusServer.pas index 110c50d..02a04ec 100644 --- a/source/IdModbusServer.pas +++ b/source/IdModbusServer.pas @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/ModBusCompiler.inc b/source/ModBusCompiler.inc index 36a9674..1160ec0 100644 --- a/source/ModBusCompiler.inc +++ b/source/ModBusCompiler.inc @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/ModbusConsts.pas b/source/ModbusConsts.pas index 54887c4..8eaf597 100644 --- a/source/ModbusConsts.pas +++ b/source/ModbusConsts.pas @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/ModbusReg.pas b/source/ModbusReg.pas index d47841e..7f864bf 100644 --- a/source/ModbusReg.pas +++ b/source/ModbusReg.pas @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/ModbusSplash.pas b/source/ModbusSplash.pas index cf0eb08..3edb8b0 100644 --- a/source/ModbusSplash.pas +++ b/source/ModbusSplash.pas @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/ModbusStrConsts.pas b/source/ModbusStrConsts.pas index 1baa90d..aa914d8 100644 --- a/source/ModbusStrConsts.pas +++ b/source/ModbusStrConsts.pas @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/ModbusTypes.pas b/source/ModbusTypes.pas index ae93e1d..08239ab 100644 --- a/source/ModbusTypes.pas +++ b/source/ModbusTypes.pas @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/ModbusUtils.pas b/source/ModbusUtils.pas index 8d27548..2ed21af 100644 --- a/source/ModbusUtils.pas +++ b/source/ModbusUtils.pas @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights diff --git a/source/frm_About.pas b/source/frm_About.pas index cffa416..5ae9446 100644 --- a/source/frm_About.pas +++ b/source/frm_About.pas @@ -2,6 +2,8 @@ Copyright (c) 2010 P.L. Polak +The MIT License (MIT) + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights From 53395b66284e1098734689a26a18d4035dc49765 Mon Sep 17 00:00:00 2001 From: Pieter Polak Date: Thu, 29 Aug 2024 08:57:04 +0200 Subject: [PATCH 4/6] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..5775d74 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 COAS Software Systems + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From e115670799393188f39c7be4d894f8d081c0dff1 Mon Sep 17 00:00:00 2001 From: Pieter Polak Date: Thu, 29 Aug 2024 08:59:34 +0200 Subject: [PATCH 5/6] Move license file to root to satisfy github requirements --- docs/license.txt | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 docs/license.txt diff --git a/docs/license.txt b/docs/license.txt deleted file mode 100644 index b34da58..0000000 --- a/docs/license.txt +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (c) 2010 P.L. Polak - -The MIT License (MIT) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. From 6cc72803b45ca405b14f9d9218d10d8fa95aad0d Mon Sep 17 00:00:00 2001 From: Pieter Polak Date: Wed, 23 Oct 2024 12:28:09 +0200 Subject: [PATCH 6/6] FIx version numbers in history --- docs/history.txt | 8 +- packages/DelphiModbus12Athens.dpk | 12 +-- packages/DelphiModbus12Athens.dproj | 128 +++++-------------------- packages/DelphiModbus12Athens.res | Bin 712 -> 712 bytes packages/dclDelphiModbus12Athens.dproj | 18 +++- packages/dclDelphiModbus12Athens.res | Bin 724 -> 724 bytes source/ModbusConsts.pas | 2 +- 7 files changed, 52 insertions(+), 116 deletions(-) diff --git a/docs/history.txt b/docs/history.txt index 27a595b..cef0cb5 100644 --- a/docs/history.txt +++ b/docs/history.txt @@ -1,16 +1,16 @@ -Version 1.6.11 +Version 1.7.3 ================================= - Added support for Delphi 12 Athens. -Version 1.6.10 +Version 1.7.2 ================================= - Added support for Delphi 11 Alexandria. -Version 1.6.9 +Version 1.7.1 ================================= - Added support for Delphi 10.4 Sydney. -Version 1.6.8 - December 19, 2018 +Version 1.7.0 - December 19, 2018 ================================= - Fix: IdModBusServer: Invalid check on databuffer length when reading/writing coils. - Server sends an error response, when the received request contains invalid data. diff --git a/packages/DelphiModbus12Athens.dpk b/packages/DelphiModbus12Athens.dpk index c65640c..4be9dc2 100644 --- a/packages/DelphiModbus12Athens.dpk +++ b/packages/DelphiModbus12Athens.dpk @@ -1,6 +1,6 @@ -package DelphiModbus12Athens; - -{$R *.res} +package DelphiModbus12Athens; + +{$R *.res} {$IFDEF IMPLICITBUILDING This IFDEF should not be used by users} {$ALIGN 8} {$ASSERTIONS ON} @@ -29,13 +29,13 @@ package DelphiModbus12Athens; {$RUNONLY} {$IMPLICITBUILD OFF} -requires +requires rtl, IndyCore, IndyProtocols, IndySystem; -contains +contains IdModbusClient in '..\source\IdModbusClient.pas', IdModbusServer in '..\source\IdModbusServer.pas', ModbusConsts in '..\source\ModbusConsts.pas', @@ -43,4 +43,4 @@ contains ModbusStrConsts in '..\source\ModbusStrConsts.pas', ModbusUtils in '..\source\ModbusUtils.pas'; -end. +end. diff --git a/packages/DelphiModbus12Athens.dproj b/packages/DelphiModbus12Athens.dproj index cba3947..8448d12 100644 --- a/packages/DelphiModbus12Athens.dproj +++ b/packages/DelphiModbus12Athens.dproj @@ -4,47 +4,23 @@ DelphiModbus12Athens.dpk True Debug - 1 + 1048577 Package None - 20.1 + 20.2 Win32 + DelphiModbus12Athens true - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true - Base - true - - - true + + true Base true - - true + + true Base true @@ -58,30 +34,6 @@ Base true - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - - - true - Cfg_2 - true - true - false false @@ -99,36 +51,6 @@ CompanyName=;FileDescription=;FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.0.0.0;Comments=;CFBundleName= System;Xml;Data;Datasnap;Web;Soap;$(DCC_Namespace) - - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= - Debug - activity-1.7.2.dex.jar;annotation-experimental-1.3.0.dex.jar;annotation-jvm-1.6.0.dex.jar;annotations-13.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;billing-6.0.1.dex.jar;biometric-1.1.0.dex.jar;browser-1.4.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;concurrent-futures-1.1.0.dex.jar;core-1.10.1.dex.jar;core-common-2.2.0.dex.jar;core-ktx-1.10.1.dex.jar;core-runtime-2.2.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;error_prone_annotations-2.9.0.dex.jar;exifinterface-1.3.6.dex.jar;firebase-annotations-16.2.0.dex.jar;firebase-common-20.3.1.dex.jar;firebase-components-17.1.0.dex.jar;firebase-datatransport-18.1.7.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-encoders-proto-16.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.1.3.dex.jar;firebase-installations-interop-17.1.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-23.1.2.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;kotlin-stdlib-1.8.22.dex.jar;kotlin-stdlib-common-1.8.22.dex.jar;kotlin-stdlib-jdk7-1.8.22.dex.jar;kotlin-stdlib-jdk8-1.8.22.dex.jar;kotlinx-coroutines-android-1.6.4.dex.jar;kotlinx-coroutines-core-jvm-1.6.4.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.6.1.dex.jar;lifecycle-livedata-2.6.1.dex.jar;lifecycle-livedata-core-2.6.1.dex.jar;lifecycle-runtime-2.6.1.dex.jar;lifecycle-service-2.6.1.dex.jar;lifecycle-viewmodel-2.6.1.dex.jar;lifecycle-viewmodel-savedstate-2.6.1.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;okio-jvm-3.4.0.dex.jar;play-services-ads-22.2.0.dex.jar;play-services-ads-base-22.2.0.dex.jar;play-services-ads-identifier-18.0.0.dex.jar;play-services-ads-lite-22.2.0.dex.jar;play-services-appset-16.0.1.dex.jar;play-services-base-18.1.0.dex.jar;play-services-basement-18.1.0.dex.jar;play-services-cloud-messaging-17.0.1.dex.jar;play-services-location-21.0.1.dex.jar;play-services-maps-18.1.0.dex.jar;play-services-measurement-base-20.1.2.dex.jar;play-services-measurement-sdk-api-20.1.2.dex.jar;play-services-stats-17.0.2.dex.jar;play-services-tasks-18.0.2.dex.jar;print-1.0.0.dex.jar;profileinstaller-1.3.0.dex.jar;room-common-2.2.5.dex.jar;room-runtime-2.2.5.dex.jar;savedstate-1.2.1.dex.jar;sqlite-2.1.0.dex.jar;sqlite-framework-2.1.0.dex.jar;startup-runtime-1.1.1.dex.jar;tracing-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.1.8.dex.jar;transport-runtime-3.1.8.dex.jar;user-messaging-platform-2.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.7.0.dex.jar - - - package=com.embarcadero.$(MSBuildProjectName);label=$(MSBuildProjectName);versionCode=1;versionName=1.0.0;persistent=False;restoreAnyVersion=False;installLocation=auto;largeHeap=False;theme=TitleBar;hardwareAccelerated=true;apiKey= - Debug - activity-1.7.2.dex.jar;annotation-experimental-1.3.0.dex.jar;annotation-jvm-1.6.0.dex.jar;annotations-13.0.dex.jar;appcompat-1.2.0.dex.jar;appcompat-resources-1.2.0.dex.jar;billing-6.0.1.dex.jar;biometric-1.1.0.dex.jar;browser-1.4.0.dex.jar;cloud-messaging.dex.jar;collection-1.1.0.dex.jar;concurrent-futures-1.1.0.dex.jar;core-1.10.1.dex.jar;core-common-2.2.0.dex.jar;core-ktx-1.10.1.dex.jar;core-runtime-2.2.0.dex.jar;cursoradapter-1.0.0.dex.jar;customview-1.0.0.dex.jar;documentfile-1.0.0.dex.jar;drawerlayout-1.0.0.dex.jar;error_prone_annotations-2.9.0.dex.jar;exifinterface-1.3.6.dex.jar;firebase-annotations-16.2.0.dex.jar;firebase-common-20.3.1.dex.jar;firebase-components-17.1.0.dex.jar;firebase-datatransport-18.1.7.dex.jar;firebase-encoders-17.0.0.dex.jar;firebase-encoders-json-18.0.0.dex.jar;firebase-encoders-proto-16.0.0.dex.jar;firebase-iid-interop-17.1.0.dex.jar;firebase-installations-17.1.3.dex.jar;firebase-installations-interop-17.1.0.dex.jar;firebase-measurement-connector-19.0.0.dex.jar;firebase-messaging-23.1.2.dex.jar;fmx.dex.jar;fragment-1.2.5.dex.jar;google-play-licensing.dex.jar;interpolator-1.0.0.dex.jar;javax.inject-1.dex.jar;kotlin-stdlib-1.8.22.dex.jar;kotlin-stdlib-common-1.8.22.dex.jar;kotlin-stdlib-jdk7-1.8.22.dex.jar;kotlin-stdlib-jdk8-1.8.22.dex.jar;kotlinx-coroutines-android-1.6.4.dex.jar;kotlinx-coroutines-core-jvm-1.6.4.dex.jar;legacy-support-core-utils-1.0.0.dex.jar;lifecycle-common-2.6.1.dex.jar;lifecycle-livedata-2.6.1.dex.jar;lifecycle-livedata-core-2.6.1.dex.jar;lifecycle-runtime-2.6.1.dex.jar;lifecycle-service-2.6.1.dex.jar;lifecycle-viewmodel-2.6.1.dex.jar;lifecycle-viewmodel-savedstate-2.6.1.dex.jar;listenablefuture-1.0.dex.jar;loader-1.0.0.dex.jar;localbroadcastmanager-1.0.0.dex.jar;okio-jvm-3.4.0.dex.jar;play-services-ads-22.2.0.dex.jar;play-services-ads-base-22.2.0.dex.jar;play-services-ads-identifier-18.0.0.dex.jar;play-services-ads-lite-22.2.0.dex.jar;play-services-appset-16.0.1.dex.jar;play-services-base-18.1.0.dex.jar;play-services-basement-18.1.0.dex.jar;play-services-cloud-messaging-17.0.1.dex.jar;play-services-location-21.0.1.dex.jar;play-services-maps-18.1.0.dex.jar;play-services-measurement-base-20.1.2.dex.jar;play-services-measurement-sdk-api-20.1.2.dex.jar;play-services-stats-17.0.2.dex.jar;play-services-tasks-18.0.2.dex.jar;print-1.0.0.dex.jar;profileinstaller-1.3.0.dex.jar;room-common-2.2.5.dex.jar;room-runtime-2.2.5.dex.jar;savedstate-1.2.1.dex.jar;sqlite-2.1.0.dex.jar;sqlite-framework-2.1.0.dex.jar;startup-runtime-1.1.1.dex.jar;tracing-1.0.0.dex.jar;transport-api-3.0.0.dex.jar;transport-backend-cct-3.1.8.dex.jar;transport-runtime-3.1.8.dex.jar;user-messaging-platform-2.0.0.dex.jar;vectordrawable-1.1.0.dex.jar;vectordrawable-animated-1.1.0.dex.jar;versionedparcelable-1.1.1.dex.jar;viewpager-1.0.0.dex.jar;work-runtime-2.7.0.dex.jar - - - CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;NSLocationAlwaysAndWhenInUseUsageDescription=The reason for accessing the location information of the user;UIBackgroundModes=;NSContactsUsageDescription=The reason for accessing the contacts;NSPhotoLibraryUsageDescription=The reason for accessing the photo library;NSPhotoLibraryAddUsageDescription=The reason for adding to the photo library;NSCameraUsageDescription=The reason for accessing the camera;NSFaceIDUsageDescription=The reason for accessing the face id;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSSiriUsageDescription=The reason for accessing Siri;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing bluetooth;NSBluetoothPeripheralUsageDescription=The reason for accessing bluetooth peripherals;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSMotionUsageDescription=The reason for accessing the accelerometer;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers - iPhoneAndiPad - true - Debug - $(MSBuildProjectName) - - - CFBundleName=$(MSBuildProjectName);CFBundleDevelopmentRegion=en;CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleInfoDictionaryVersion=7.1;CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;LSRequiresIPhoneOS=true;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);UIDeviceFamily=iPhone & iPad;NSLocationAlwaysUsageDescription=The reason for accessing the location information of the user;NSLocationWhenInUseUsageDescription=The reason for accessing the location information of the user;NSLocationAlwaysAndWhenInUseUsageDescription=The reason for accessing the location information of the user;UIBackgroundModes=;NSContactsUsageDescription=The reason for accessing the contacts;NSPhotoLibraryUsageDescription=The reason for accessing the photo library;NSPhotoLibraryAddUsageDescription=The reason for adding to the photo library;NSCameraUsageDescription=The reason for accessing the camera;NSFaceIDUsageDescription=The reason for accessing the face id;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSSiriUsageDescription=The reason for accessing Siri;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing bluetooth;NSBluetoothPeripheralUsageDescription=The reason for accessing bluetooth peripherals;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSMotionUsageDescription=The reason for accessing the accelerometer;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers - iPhoneAndiPad - true - - - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface - Debug - - - CFBundleName=$(MSBuildProjectName);CFBundleDisplayName=$(MSBuildProjectName);CFBundleIdentifier=$(MSBuildProjectName);CFBundleVersion=1.0.0;CFBundleShortVersionString=1.0.0;CFBundlePackageType=APPL;CFBundleSignature=????;CFBundleAllowMixedLocalizations=YES;CFBundleExecutable=$(MSBuildProjectName);NSHighResolutionCapable=true;LSApplicationCategoryType=public.app-category.utilities;NSLocationUsageDescription=The reason for accessing the location information of the user;NSContactsUsageDescription=The reason for accessing the contacts;NSCalendarsUsageDescription=The reason for accessing the calendar data;NSRemindersUsageDescription=The reason for accessing the reminders;NSCameraUsageDescription=The reason for accessing the camera;NSMicrophoneUsageDescription=The reason for accessing the microphone;NSMotionUsageDescription=The reason for accessing the accelerometer;NSDesktopFolderUsageDescription=The reason for accessing the Desktop folder;NSDocumentsFolderUsageDescription=The reason for accessing the Documents folder;NSDownloadsFolderUsageDescription=The reason for accessing the Downloads folder;NSNetworkVolumesUsageDescription=The reason for accessing files on a network volume;NSRemovableVolumesUsageDescription=The reason for accessing files on a removable volume;NSSpeechRecognitionUsageDescription=The reason for requesting to send user data to Apple's speech recognition servers;ITSAppUsesNonExemptEncryption=false;NSBluetoothAlwaysUsageDescription=The reason for accessing the Bluetooth interface - Debug - Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;Bde;$(DCC_Namespace) Debug @@ -136,6 +58,13 @@ CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments=;ProgramID=com.embarcadero.$(MSBuildProjectName) 1033 + + Winapi;System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + true + RELEASE;$(DCC_Define) 0 @@ -147,22 +76,20 @@ false true - - true - - - true - - - true - - - true - MainSource + + + + + + + + + + Base @@ -189,14 +116,9 @@ - False - False - False - False - False - False True False + True 12 diff --git a/packages/DelphiModbus12Athens.res b/packages/DelphiModbus12Athens.res index d3ba5ad67cfbb4c9672101b5b93be48a882b59d8..cf945355c98c78e81e012c7463f68a080d0cfe79 100644 GIT binary patch delta 16 XcmX@XdV+OB2NNU9dclDelphiModbus12Athens.dpk True Debug - 1 + 1048577 Package VCL - 20.1 + 20.2 Win32 + dclDelphiModbus12Athens true @@ -23,6 +24,11 @@ Base true + + true + Base + true + true Base @@ -61,6 +67,13 @@ vcl;rtl;xmlrtl;vclimg;vclactnband;vclx;$(DCC_UsePackage) + + System.Win;Data.Win;Datasnap.Win;Web.Win;Soap.Win;Xml.Win;$(DCC_Namespace) + Debug + true + CompanyName=;FileDescription=$(MSBuildProjectName);FileVersion=1.0.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProgramID=com.embarcadero.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=1.0.0.0;Comments= + true + RELEASE;$(DCC_Define) 0 @@ -115,6 +128,7 @@ True False + True 12 diff --git a/packages/dclDelphiModbus12Athens.res b/packages/dclDelphiModbus12Athens.res index 05005fd8033e072812d8aca4d2b78668ba4917c3..994c59398a31e03cff8e3783d3735ba5ecb5ced6 100644 GIT binary patch delta 16 Xcmcb@dWChv6edQN$y1qZnFJUBF!Tg> delta 16 Xcmcb@dWChv6edQd$y1qZnHU%VFvJ99 diff --git a/source/ModbusConsts.pas b/source/ModbusConsts.pas index 8eaf597..1dd6e28 100644 --- a/source/ModbusConsts.pas +++ b/source/ModbusConsts.pas @@ -70,7 +70,7 @@ interface MaxCoils = 2000; const - DMB_VERSION = '1.7.0'; {Do not Localize} + DMB_VERSION = '1.7.3'; {Do not Localize} const DefaultLogTimeFormat = 'yyyy-mm-dd hh:nn:ss.zzz'; {Do not Localize}