willie 4 лет назад
Родитель
Сommit
54f69f704b
5 измененных файлов с 49 добавлено и 141 удалено
  1. 2 2
      SPS_EMU.000
  2. 19 6
      SPS_Emu.lpi
  3. BIN
      SPS_Emu.lsu
  4. 27 132
      ugui.lfm
  5. 1 1
      ugui.pas

+ 2 - 2
SPS_EMU.000

@@ -2,8 +2,8 @@
 LSUTextFile=1
 Copyrigth=MCS Media Computer Software
 [LSUInfo]
-CompileDate=14.12.2018
-CompileTime=19:52:33
+CompileDate=11.07.2020
+CompileTime=12:45:46
 Name=Wilfried Klaas
 LSUBinFile=E:\daten\git-sourcen\SPS_Emulator\SPS_Emu.lsu
 LSUTextFile=E:\daten\git-sourcen\SPS_Emulator\SPS_Emu.

+ 19 - 6
SPS_Emu.lpi

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CONFIG>
   <ProjectOptions>
-    <Version Value="10"/>
+    <Version Value="11"/>
     <PathDelim Value="\"/>
     <General>
       <SessionStorage Value="InProjectDir"/>
@@ -22,7 +22,7 @@
       <AutoIncrementBuild Value="True"/>
       <MinorVersionNr Value="2"/>
       <RevisionNr Value="1"/>
-      <BuildNr Value="58"/>
+      <BuildNr Value="59"/>
       <Language Value="0407"/>
       <StringTable CompanyName="MCS" FileDescription="TPS/SPS Emulator" InternalName="SPS_EMU" LegalCopyright="MCS (C) Wilfried Klaas" OriginalFilename="SPS_EMU.exe" ProductName="TPS/SPS Emulator" ProductVersion="0.2"/>
     </VersionInfo>
@@ -32,12 +32,9 @@
     <PublishOptions>
       <Version Value="2"/>
       <DestinationDirectory Value="$(ProjPath)\published\"/>
-      <IncludeFileFilter Value="*.(pas|pp|inc|lfm|lpr|lrs|lpi|lpk|sh|xml)"/>
-      <ExcludeFileFilter Value="*.(bak|ppu|o|so);*~;backup"/>
     </PublishOptions>
     <RunParams>
       <local>
-        <FormatVersion Value="1"/>
         <CommandLineParams Value="beispiele/tone.tps"/>
       </local>
       <environment>
@@ -45,6 +42,19 @@
           <Variable0 Name="lazarus_debuglog" Value="c:\temp\debug.txt"/>
         </UserOverrides>
       </environment>
+      <FormatVersion Value="2"/>
+      <Modes Count="1">
+        <Mode0 Name="default">
+          <local>
+            <CommandLineParams Value="beispiele/tone.tps"/>
+          </local>
+          <environment>
+            <UserOverrides Count="1">
+              <Variable0 Name="lazarus_debuglog" Value="c:\temp\debug.txt"/>
+            </UserOverrides>
+          </environment>
+        </Mode0>
+      </Modes>
     </RunParams>
     <RequiredPackages Count="2">
       <Item1>
@@ -136,7 +146,7 @@
     </Linking>
   </CompilerOptions>
   <Debugging>
-    <Exceptions Count="4">
+    <Exceptions Count="5">
       <Item1>
         <Name Value="EAbort"/>
       </Item1>
@@ -149,6 +159,9 @@
       <Item4>
         <Name Value="Exception"/>
       </Item4>
+      <Item5>
+        <Name Value="EScannerError"/>
+      </Item5>
     </Exceptions>
   </Debugging>
 </CONFIG>


+ 27 - 132
ugui.lfm

@@ -1,12 +1,12 @@
 object Form1: TForm1
-  Left = 234
+  Left = 266
   Height = 582
   Top = 104
-  Width = 717
+  Width = 685
   AllowDropFiles = True
   Caption = 'SPS Emulator'
   ClientHeight = 582
-  ClientWidth = 717
+  ClientWidth = 685
   Constraints.MinHeight = 582
   Constraints.MinWidth = 684
   OnCloseQuery = FormCloseQuery
@@ -14,9 +14,9 @@ object Form1: TForm1
   OnDropFiles = FormDropFiles
   SessionProperties = 'cbAdrActual.Checked;Height;Left;StringGrid1.Columns;Top;Width'
   ShowHint = True
-  LCLVersion = '1.8.4.0'
+  LCLVersion = '2.0.2.0'
   object Panel1: TPanel
-    Left = 393
+    Left = 361
     Height = 533
     Top = 26
     Width = 324
@@ -40,14 +40,7 @@ object Form1: TForm1
         Height = 23
         Top = 120
         Width = 40
-        EditLabel.AnchorSideTop.Control = PWM1
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = PWM1
-        EditLabel.AnchorSideBottom.Control = PWM1
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 16
         EditLabel.Height = 15
-        EditLabel.Top = 124
         EditLabel.Width = 38
         EditLabel.Caption = 'PWM.1'
         EditLabel.ParentColor = False
@@ -60,14 +53,7 @@ object Form1: TForm1
         Height = 23
         Top = 148
         Width = 40
-        EditLabel.AnchorSideTop.Control = PWM2
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = PWM2
-        EditLabel.AnchorSideBottom.Control = PWM2
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 16
         EditLabel.Height = 15
-        EditLabel.Top = 152
         EditLabel.Width = 38
         EditLabel.Caption = 'PWM.2'
         EditLabel.ParentColor = False
@@ -79,7 +65,7 @@ object Form1: TForm1
         Left = 6
         Height = 15
         Top = 25
-        Width = 73
+        Width = 71
         Caption = 'ID_OUTPUT_1'
         ParentColor = False
       end
@@ -87,7 +73,7 @@ object Form1: TForm1
         Left = 6
         Height = 15
         Top = 47
-        Width = 73
+        Width = 71
         Caption = 'ID_OUTPUT_2'
         ParentColor = False
       end
@@ -95,7 +81,7 @@ object Form1: TForm1
         Left = 6
         Height = 15
         Top = 71
-        Width = 73
+        Width = 71
         Caption = 'ID_OUTPUT_3'
         ParentColor = False
       end
@@ -103,7 +89,7 @@ object Form1: TForm1
         Left = 6
         Height = 15
         Top = 95
-        Width = 73
+        Width = 71
         Caption = 'ID_OUTPUT_4'
         ParentColor = False
       end
@@ -140,14 +126,7 @@ object Form1: TForm1
         Height = 23
         Top = 178
         Width = 40
-        EditLabel.AnchorSideTop.Control = Servo1
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = Servo1
-        EditLabel.AnchorSideBottom.Control = Servo1
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 16
         EditLabel.Height = 15
-        EditLabel.Top = 182
         EditLabel.Width = 38
         EditLabel.Caption = 'Servo.1'
         EditLabel.ParentColor = False
@@ -160,14 +139,7 @@ object Form1: TForm1
         Height = 23
         Top = 205
         Width = 40
-        EditLabel.AnchorSideTop.Control = Servo2
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = Servo2
-        EditLabel.AnchorSideBottom.Control = Servo2
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 16
         EditLabel.Height = 15
-        EditLabel.Top = 209
         EditLabel.Width = 38
         EditLabel.Caption = 'Servo.2'
         EditLabel.ParentColor = False
@@ -195,7 +167,7 @@ object Form1: TForm1
         Left = 16
         Height = 15
         Top = 240
-        Width = 26
+        Width = 25
         Caption = 'Tone'
         ParentColor = False
       end
@@ -223,7 +195,7 @@ object Form1: TForm1
         Left = 14
         Height = 19
         Top = 95
-        Width = 81
+        Width = 80
         Caption = 'ID_INPUT_4'
         ParentBidiMode = False
         TabOrder = 0
@@ -232,7 +204,7 @@ object Form1: TForm1
         Left = 14
         Height = 19
         Top = 71
-        Width = 81
+        Width = 80
         Caption = 'ID_INPUT_3'
         ParentBidiMode = False
         TabOrder = 1
@@ -241,7 +213,7 @@ object Form1: TForm1
         Left = 14
         Height = 19
         Top = 47
-        Width = 81
+        Width = 80
         Caption = 'ID_INPUT_2'
         ParentBidiMode = False
         TabOrder = 2
@@ -250,7 +222,7 @@ object Form1: TForm1
         Left = 14
         Height = 19
         Top = 25
-        Width = 81
+        Width = 80
         Caption = 'ID_INPUT_1'
         ParentBidiMode = False
         TabOrder = 3
@@ -447,14 +419,7 @@ object Form1: TForm1
         Height = 23
         Top = 4
         Width = 40
-        EditLabel.AnchorSideTop.Control = EditA
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditA
-        EditLabel.AnchorSideBottom.Control = EditA
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 11
         EditLabel.Height = 15
-        EditLabel.Top = 8
         EditLabel.Width = 8
         EditLabel.Caption = 'A'
         EditLabel.ParentColor = False
@@ -467,14 +432,7 @@ object Form1: TForm1
         Height = 23
         Top = 32
         Width = 40
-        EditLabel.AnchorSideTop.Control = EditC
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditC
-        EditLabel.AnchorSideBottom.Control = EditC
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 11
         EditLabel.Height = 15
-        EditLabel.Top = 36
         EditLabel.Width = 8
         EditLabel.Caption = 'C'
         EditLabel.ParentColor = False
@@ -487,14 +445,7 @@ object Form1: TForm1
         Height = 23
         Top = 60
         Width = 40
-        EditLabel.AnchorSideTop.Control = EditE
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditE
-        EditLabel.AnchorSideBottom.Control = EditE
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 13
         EditLabel.Height = 15
-        EditLabel.Top = 64
         EditLabel.Width = 6
         EditLabel.Caption = 'E'
         EditLabel.ParentColor = False
@@ -507,14 +458,7 @@ object Form1: TForm1
         Height = 23
         Top = 4
         Width = 40
-        EditLabel.AnchorSideTop.Control = EditB
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditB
-        EditLabel.AnchorSideBottom.Control = EditB
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 76
         EditLabel.Height = 15
-        EditLabel.Top = 8
         EditLabel.Width = 7
         EditLabel.Caption = 'B'
         EditLabel.ParentColor = False
@@ -527,14 +471,7 @@ object Form1: TForm1
         Height = 23
         Top = 32
         Width = 40
-        EditLabel.AnchorSideTop.Control = EditD
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditD
-        EditLabel.AnchorSideBottom.Control = EditD
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 75
         EditLabel.Height = 15
-        EditLabel.Top = 36
         EditLabel.Width = 8
         EditLabel.Caption = 'D'
         EditLabel.ParentColor = False
@@ -547,14 +484,7 @@ object Form1: TForm1
         Height = 23
         Top = 60
         Width = 40
-        EditLabel.AnchorSideTop.Control = EditF
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditF
-        EditLabel.AnchorSideBottom.Control = EditF
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 77
         EditLabel.Height = 15
-        EditLabel.Top = 64
         EditLabel.Width = 6
         EditLabel.Caption = 'F'
         EditLabel.ParentColor = False
@@ -567,14 +497,7 @@ object Form1: TForm1
         Height = 23
         Top = 4
         Width = 48
-        EditLabel.AnchorSideTop.Control = EditAddr
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditAddr
-        EditLabel.AnchorSideBottom.Control = EditAddr
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 145
         EditLabel.Height = 15
-        EditLabel.Top = 8
         EditLabel.Width = 26
         EditLabel.Caption = 'Addr'
         EditLabel.ParentColor = False
@@ -588,14 +511,7 @@ object Form1: TForm1
         Hint = 'Rücksprungadresse'
         Top = 60
         Width = 48
-        EditLabel.AnchorSideTop.Control = EditRAdr
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditRAdr
-        EditLabel.AnchorSideBottom.Control = EditRAdr
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 145
         EditLabel.Height = 15
-        EditLabel.Top = 64
         EditLabel.Width = 26
         EditLabel.Caption = 'RAdr'
         EditLabel.ParentColor = False
@@ -624,14 +540,7 @@ object Form1: TForm1
         Height = 23
         Top = 88
         Width = 48
-        EditLabel.AnchorSideTop.Control = EditDelay
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditDelay
-        EditLabel.AnchorSideBottom.Control = EditDelay
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 142
         EditLabel.Height = 15
-        EditLabel.Top = 92
         EditLabel.Width = 29
         EditLabel.Caption = 'Delay'
         EditLabel.ParentColor = False
@@ -644,14 +553,7 @@ object Form1: TForm1
         Height = 23
         Top = 32
         Width = 48
-        EditLabel.AnchorSideTop.Control = EditPage
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditPage
-        EditLabel.AnchorSideBottom.Control = EditPage
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 145
         EditLabel.Height = 15
-        EditLabel.Top = 36
         EditLabel.Width = 26
         EditLabel.Caption = 'Page'
         EditLabel.ParentColor = False
@@ -664,14 +566,7 @@ object Form1: TForm1
         Height = 23
         Top = 88
         Width = 40
-        EditLabel.AnchorSideTop.Control = EditJump
-        EditLabel.AnchorSideTop.Side = asrCenter
-        EditLabel.AnchorSideRight.Control = EditJump
-        EditLabel.AnchorSideBottom.Control = EditJump
-        EditLabel.AnchorSideBottom.Side = asrBottom
-        EditLabel.Left = 40
         EditLabel.Height = 15
-        EditLabel.Top = 92
         EditLabel.Width = 43
         EditLabel.Caption = 'Jump to'
         EditLabel.ParentColor = False
@@ -703,7 +598,7 @@ object Form1: TForm1
     Left = 0
     Height = 26
     Top = 0
-    Width = 717
+    Width = 685
     ButtonHeight = 22
     ButtonWidth = 22
     Caption = 'ToolBar1'
@@ -756,7 +651,7 @@ object Form1: TForm1
       Caption = 'ID_EXEC_DEBUG'
     end
     object cbTPSVersion: TComboBox
-      Left = 457
+      Left = 456
       Height = 23
       Top = 2
       Width = 125
@@ -775,7 +670,7 @@ object Form1: TForm1
       Left = 369
       Height = 15
       Top = 2
-      Width = 88
+      Width = 87
       Alignment = taCenter
       Caption = 'ID_TPS_VERSION'
       Layout = tlCenter
@@ -838,19 +733,19 @@ object Form1: TForm1
       Caption = 'ID_DELLINE'
     end
     object ToolButton17: TToolButton
-      Left = 582
+      Left = 581
       Height = 22
       Top = 2
       Caption = 'ToolButton17'
       Style = tbsDivider
     end
     object ToolButton18: TToolButton
-      Left = 587
+      Left = 586
       Top = 2
       Action = acHelpAbout
     end
     object MCSLabel: TLabel
-      Left = 611
+      Left = 610
       Height = 22
       Top = 2
       Width = 20
@@ -878,25 +773,25 @@ object Form1: TForm1
     Left = 0
     Height = 23
     Top = 559
-    Width = 717
+    Width = 685
     Panels = <>
   end
   object Panel2: TPanel
     Left = 0
     Height = 533
     Top = 26
-    Width = 393
+    Width = 361
     Align = alClient
     BevelOuter = bvNone
     Caption = 'Panel2'
     ClientHeight = 533
-    ClientWidth = 393
+    ClientWidth = 361
     TabOrder = 3
     object StringGrid1: TStringGrid
       Left = 0
       Height = 499
       Top = 0
-      Width = 393
+      Width = 361
       Align = alClient
       Columns = <      
         item
@@ -936,12 +831,12 @@ object Form1: TForm1
       Left = 0
       Height = 34
       Top = 499
-      Width = 393
+      Width = 361
       Align = alBottom
       BevelInner = bvLowered
       BevelOuter = bvNone
       ClientHeight = 34
-      ClientWidth = 393
+      ClientWidth = 361
       TabOrder = 1
       object cbCommand: TComboBox
         Left = 64
@@ -1015,7 +910,7 @@ object Form1: TForm1
         Left = 184
         Height = 15
         Top = 8
-        Width = 76
+        Width = 75
         Caption = 'ID_MNE_DATA'
         ParentColor = False
       end

+ 1 - 1
ugui.pas

@@ -247,7 +247,7 @@ begin
   Infobox.Build := MCSGetVersion(Application.ExeName);
   Infobox.AppID := 31;
   Infobox.AppURL :=
-    'http://www.wk-music.de/pages/mcs/microcontroller/tps-sps-emulator.php';
+    'http://www.wk-music.de/willie/pages/mcs/microcontroller/tps-sps-emulator.php';
   sps := TSPS.Create();
   sps.setDelayCallback(@delayCallback);
   addHeaderText;