Many changes to add EV3 support

Author: afanofosc

BrickTool.dpr

@@ -72,7 +72,7 @@ var
   memFree : Cardinal;
   pressed : boolean;
   btncount : byte;
-  Msg : NXTMessage;
+  Msg : PBRMessage;
 
 
 
@@ -184,12 +184,12 @@ begin
   Writeln('   -btreset : reset the NXT bluetooth to factory settings (usb only)');
   Writeln('   -defrag : defragment the NXT filesystem');
 {
-SetNXTOutputState
-SetNXTInputMode
-NXTPollCommandLen
-NXTPollCommand
-NXTWriteIOMap
-NXTReadIOMap
+DCSetOutputState
+DCSetInputMode
+SCPollCommandLen
+SCPollCommand
+SCWriteIOMap
+SCReadIOMap
 NXTLowSpeed[port : byte]
 }
   Writeln('General:');
@@ -308,7 +308,7 @@ begin
     end;
     if ParamSwitch('-clear') then
       if IsNXT then
-        BrickComm.NXTDeleteUserFlash(True)
+        BrickComm.SCDeleteUserFlash(True)
       else
         BrickComm.ClearMemory;
     if ParamSwitch('-near') and NotNXT then
@@ -326,7 +326,7 @@ begin
     if ParamSwitch('-run') then begin
       // run with filename for NXT
       if IsNXT then
-        BrickComm.NXTStartProgram(ParamValue('-run'))
+        BrickComm.DCStartProgram(ParamValue('-run'))
       else
         BrickComm.StartTask(ParamIntValue('-run', 0));
     end;
@@ -335,7 +335,7 @@ begin
     if ParamSwitch('-msg') then
     begin
       if IsNXT then
-        BrickComm.NXTMessageWrite(ParamIntValue('/Inbox', 0), ParamValue('-msg'))
+        BrickComm.DCMessageWrite(ParamIntValue('/Inbox', 0), ParamValue('-msg'))
       else
         BrickComm.SendMessage(ParamIntValue('-msg', 0));
     end;
@@ -352,7 +352,7 @@ begin
       if IsNXT then
       begin
         port := ParamIntValue('-input', 0);
-        if BrickComm.GetNXTInputValues(port, valid,
+        if BrickComm.DCGetInputValues(port, valid,
           calibrated, stype, smode, raw, normalized, scaled, calvalue) then
         begin
           Writeln(Format('Port: %d'#13#10 +
@@ -379,7 +379,7 @@ begin
       if IsNXT then
       begin
         port := ParamIntValue('-output', 0);
-        if BrickComm.GetNXTOutputState(port, power, mode,
+        if BrickComm.DCGetOutputState(port, power, mode,
           regmode, turnratio, runstate, tacholimit, tachocount, blocktachocount, rotationcount) then
         begin
           Writeln(Format('Port: %d'#13#10 +
@@ -419,33 +419,33 @@ begin
       BrickComm.PlayTone(ParamIntValue('-playtone', 440), ParamIntValue('/Duration', 500));
     // NXT actions
     if ParamSwitch('-stop') and IsNXT then
-      BrickComm.NXTStopProgram;
+      BrickComm.DCStopProgram;
     if ParamSwitch('-playfile') and IsNXT then
-      BrickComm.NXTPlaySoundFile(ParamValue('-playfile'), ParamSwitch('/L'));
+      BrickComm.DCPlaySoundFile(ParamValue('-playfile'), ParamSwitch('/L'));
     if ParamSwitch('-keepalive') and IsNXT then
     begin
-      if BrickComm.NXTKeepAlive(cvalue) then
+      if BrickComm.DCKeepAlive(cvalue) then
         OutputValue(cvalue);
     end;
     if ParamSwitch('-resetoutputposition') and IsNXT then
-      BrickComm.NXTResetOutputPosition(ParamIntValue('-resetoutputposition', 0), ParamSwitch('/Relative'));
+      BrickComm.DCResetOutputPosition(ParamIntValue('-resetoutputposition', 0), ParamSwitch('/Relative'));
     if ParamSwitch('-resetinputsv') and IsNXT then
-      BrickComm.NXTResetInputScaledValue(ParamIntValue('-resetinputsv', 0));
+      BrickComm.DCResetInputScaledValue(ParamIntValue('-resetinputsv', 0));
     if ParamSwitch('-upload') and IsNXT then
-      BrickComm.NXTUploadFile(ParamValue('-upload'));
+      BrickComm.UploadFile(ParamValue('-upload'));
     if ParamSwitch('-download') and IsNXT then
     begin
       pattern := ParamValue('-download');
-      BrickComm.NXTDownloadFile(pattern, NameToNXTFileType(pattern));
+      BrickComm.DownloadFile(pattern, NXTNameToPBRFileType(pattern));
     end;
     if ParamSwitch('-delete') and IsNXT then
     begin
       pattern := ParamValue('-delete');
-      BrickComm.NXTDeleteFile(pattern, True);
+      BrickComm.SCDeleteFile(pattern, True);
     end;
     if ParamSwitch('-defrag') then
     begin
-      if not BrickComm.NXTDefragmentFlash then
+      if not BrickComm.SCDefragmentFlash then
         WriteLn('Defragmentation failed');
     end;
     if ParamSwitch('-listfiles') and IsNXT then
@@ -454,7 +454,7 @@ begin
       if pattern = '' then
         pattern := '*.*';
       SL.Clear;
-      BrickComm.NXTListFiles(pattern, SL);
+      BrickComm.ListFiles(pattern, SL);
       for i := 0 to SL.Count - 1 do
         WriteLn(SL[i]);
     end;
@@ -464,32 +464,32 @@ begin
       if pattern = '' then
         pattern := '*.*';
       SL.Clear;
-      BrickComm.NXTListModules(pattern, SL);
+      BrickComm.ListModules(pattern, SL);
       for i := 0 to SL.Count - 1 do
         WriteLn(SL[i]);
     end;
     if ParamSwitch('-runningprogram') and IsNXT then
     begin
-      if BrickComm.NXTGetCurrentProgramName(pattern) then
+      if BrickComm.DCGetCurrentProgramName(pattern) then
         Writeln(pattern);
     end;
     if ParamSwitch('-setname') and IsNXT then
-      BrickComm.NXTSetBrickName(ParamValue('-setname'), True);
+      BrickComm.SCSetBrickName(ParamValue('-setname'), True);
     if ParamSwitch('-boot') and IsNXT then
-      BrickComm.NXTBootCommand(True);
+      BrickComm.SCBootCommand(True);
     if ParamSwitch('-btreset') and IsNXT then
-      BrickComm.NXTBTFactoryReset(True);
+      BrickComm.SCBTFactoryReset(True);
     if ParamSwitch('-versions') and IsNXT then
     begin
-      if BrickComm.NXTGetVersions(pmin, pmaj, fmin, fmaj) then
+      if BrickComm.SCGetVersions(pmin, pmaj, fmin, fmaj) then
       begin
         Writeln(Format('Protocol version = %d.%d', [pmaj, pmin]));
         Writeln(Format('Firmware version = %d.%d', [fmaj, fmin]));
       end;
     end;
     if ParamSwitch('-deviceinfo') and IsNXT then
     begin
-      if BrickComm.NXTGetDeviceInfo(pattern, btaddr, btsig, memFree) then
+      if BrickComm.SCGetDeviceInfo(pattern, btaddr, btsig, memFree) then
       begin
         Writeln(Format('Brick name = %s', [pattern]));
         Writeln(Format('Bluetooth Address = %s', [btaddr]));
@@ -499,35 +499,35 @@ begin
     end;
     if ParamSwitch('-getname') and IsNXT then
     begin
-      if BrickComm.NXTGetDeviceInfo(pattern, btaddr, btsig, memFree) then
+      if BrickComm.SCGetDeviceInfo(pattern, btaddr, btsig, memFree) then
         Writeln(pattern);
     end;
     if ParamSwitch('-freemem') and IsNXT then
     begin
-      if BrickComm.NXTGetDeviceInfo(pattern, btaddr, btsig, memFree) then
+      if BrickComm.SCGetDeviceInfo(pattern, btaddr, btsig, memFree) then
         OutputValue(memFree);
     end;
     if ParamSwitch('-lsstatus') and IsNXT then
     begin
       port := ParamIntValue('-lsstatus', 0);
-      if BrickComm.NXTLSGetStatus(port, bytesReady, lsstate) then
+      if BrickComm.DCLSGetStatus(port, bytesReady, lsstate) then
         OutputValue(bytesReady);
     end;
     if ParamSwitch('-btnstate') and IsNXT then
     begin
       port := ParamIntValue('-btnstate', 0);
-      if BrickComm.NXTGetButtonState(port, False, pressed, btncount) then
+      if BrickComm.DCGetButtonState(port, False, pressed, btncount) then
         Writeln(Format('Button %d: pressed = %s, count = %d', [port, BoolToStr(pressed, True), btncount]));
     end;
     if ParamSwitch('-resetbtnstate') and IsNXT then
     begin
       port := ParamIntValue('-resetbtnstate', 0);
-      BrickComm.NXTGetButtonState(port, True, pressed, btncount);
+      BrickComm.DCGetButtonState(port, True, pressed, btncount);
     end;
     if ParamSwitch('-readmsg') and IsNXT then
     begin
       port := ParamIntValue('-readmsg', 0);
-      if BrickComm.NXTMessageRead(port, ParamIntValue('/Inbox', 0), ParamSwitch('/Empty'), Msg) then
+      if BrickComm.DCMessageRead(port, ParamIntValue('/Inbox', 0), ParamSwitch('/Empty'), Msg) then
       begin
         for i := 0 to Msg.Size - 1 do
           OutputValue(Msg.Data[i]);

BricxCC.cfg

@@ -31,12 +31,12 @@
 -M
 -$M16384,1048576
 -K$00400000
--LE"c:\winapps\borland\delphi7\Projects\Bpl"
--LN"c:\winapps\borland\delphi7\Projects\Bpl"
--U"bricktools;NXT;samplerate;png;grep;pbr"
--O"bricktools;NXT;samplerate;png;grep;pbr"
--I"bricktools;NXT;samplerate;png;grep;pbr"
--R"bricktools;NXT;samplerate;png;grep;pbr"
+-LE"c:\win32apps\borland\delphi7\Projects\Bpl"
+-LN"c:\win32apps\borland\delphi7\Projects\Bpl"
+-U"c:\win32apps\borland\delphi7\Lib\Debug;bricktools;NXT;samplerate;png;grep;pbr"
+-O"c:\win32apps\borland\delphi7\Lib\Debug;bricktools;NXT;samplerate;png;grep;pbr"
+-I"c:\win32apps\borland\delphi7\Lib\Debug;bricktools;NXT;samplerate;png;grep;pbr"
+-R"c:\win32apps\borland\delphi7\Lib\Debug;bricktools;NXT;samplerate;png;grep;pbr"
 -DFAST_MM, CAN_DOWNLOAD
 -w-UNSAFE_TYPE
 -w-UNSAFE_CODE

BricxCC.dof

@@ -94,10 +94,10 @@ OutputDir=
 UnitOutputDir=
 PackageDLLOutputDir=
 PackageDCPOutputDir=
-SearchPath=bricktools;NXT;samplerate;png;grep;pbr
+SearchPath=$(DELPHI)\Lib\Debug;bricktools;NXT;samplerate;png;grep;pbr
 Packages=Vcl50;Vclx50;VclSmp50;Vcldb50;vclado50;ibevnt50;Vclbde50;vcldbx50;Qrpt50;TeeUI50;TeeDB50;Tee50;Dss50;TeeQR50;VCLIB50;Vclmid50;vclie50;Inetdb50;Inet50;NMFast50;webmid50;dclocx50;dclaxserver50;O217_R50;O217BR50;TCSComp_50
 Conditionals=FAST_MM, CAN_DOWNLOAD
-DebugSourceDirs=D:\BricxCC\NXT\;D:\bricxcc\bricktools\
+DebugSourceDirs=D:\BricxCC\NXT\;D:\bricxcc\bricktools\;D:\bricxcc_new\bricktools\;D:\bricxcc_new\grep\
 UsePackages=0
 [Parameters]
 RunParams=
@@ -122,7 +122,7 @@ AutoIncBuild=0
 MajorVer=3
 MinorVer=3
 Release=8
-Build=10
+Build=11
 Debug=0
 PreRelease=0
 Special=0
@@ -133,24 +133,14 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=JoCar Consulting
 FileDescription=Programmable Brick IDE
-FileVersion=3.3.8.10
+FileVersion=3.3.8.11
 InternalName=Bricx Command Center
 LegalCopyright=Copyright (c) 1998-2013 John Hansen
 LegalTrademarks=
 OriginalFilename=bricxcc.exe
 ProductName=Bricx Command Center
 ProductVersion=3.3
 Comments=NQC (c) 1998-2013 David Baum, John Hansen
-[Excluded Packages]
-C:\Program Files (x86)\Dev Express.VCL\Library\Delphi7\dcldxCoreD7.bpl=ExpressCoreLibrary by Developer Express Inc.
-C:\Program Files (x86)\Dev Express.VCL\Library\Delphi7\dclcxLibraryD7.bpl=Express Cross Platform Library by Developer Express Inc.
-C:\Program Files (x86)\Dev Express.VCL\Library\Delphi7\dclcxPageControlD7.bpl=ExpressPageControl by Developer Express Inc.
-C:\Program Files (x86)\Dev Express.VCL\Library\Delphi7\dclcxEditorsD7.bpl=ExpressEditors Library by Developer Express Inc.
-C:\Program Files (x86)\Dev Express.VCL\Library\Delphi7\dclcxEditorFieldLinkD7.bpl=ExpressEditors FieldLink by Developer Express Inc.
-C:\Program Files (x86)\Dev Express.VCL\Library\Delphi7\dcldxLayoutControlD7.bpl=ExpressLayout Control by Developer Express Inc.
-C:\Program Files (x86)\Dev Express.VCL\Library\Delphi7\dclcxGridD7.bpl=ExpressQuantumGrid by Developer Express Inc.
-C:\Program Files (x86)\Dev Express.VCL\Library\Delphi7\dcldxmdsD7.bpl=ExpressMemData by Developer Express Inc.
-C:\Program Files (x86)\Dev Express.VCL\Library\Delphi7\dcldxNavBarD7.bpl=ExpressNavBar by Developer Express Inc.
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=G:\nxt\BricxCC\source\NXT\

BricxCC.dpr

@@ -122,7 +122,15 @@ uses
   uTextViewer in 'uTextViewer.pas' {frmTextView},
   uNXTWatchList in 'uNXTWatchList.pas' {frmNXTWatchList},
   uSimpleTerm in 'uSimpleTerm.pas' {frmSimpleTerm},
-  uNXTImage in 'uNXTImage.pas' {frmNXTImage};
+  uNXTImage in 'uNXTImage.pas' {frmNXTImage},
+  uBrickImage in 'uBrickImage.pas' {frmBrickImage},
+  uLiveSensors in 'uLiveSensors.pas' {frmLiveSensors},
+  ev3RGFedit_MainForm in 'ev3RGFedit_MainForm.pas' {frmEV3RGFEDIT},
+  ev3RGFedit_AddText in 'ev3RGFedit_AddText.pas' {frmAddText},
+  ev3RGFedit_Basis in 'ev3RGFedit_Basis.pas',
+  ev3RGFedit_FileImport in 'ev3RGFedit_FileImport.pas' {frmImageImport},
+  ev3RGFEdit_FileOpen in 'ev3RGFEdit_FileOpen.pas' {frmFileOpen},
+  ev3RGFedit_FileSave in 'ev3RGFedit_FileSave.pas' {frmFileSave};
 
 {$IFNDEF FPC}
 {.$R *.TLB}
@@ -184,8 +192,13 @@ begin
   Application.CreateForm(TfrmNXTExplorer, frmNXTExplorer);
   Application.CreateForm(TfrmNXTController, frmNXTController);
   Application.CreateForm(TfrmNXTImage, frmNXTImage);
+  Application.CreateForm(TfrmBrickImage, frmBrickImage);
   Application.CreateForm(TfrmNXTWatchList, frmNXTWatchList);
+  Application.CreateForm(TfrmLiveSensors, frmLiveSensors);
   Application.CreateForm(TfrmSimpleTerm, frmSimpleTerm);
+  Application.CreateForm(TfrmEV3RGFEDIT, frmEV3RGFEDIT);
+  Application.CreateForm(TfrmAddText, frmAddText);
+  Application.CreateForm(TfrmFileSave, frmFileSave);
   if not ParamSwitch('/RESET') then
     UpgradeRegistry(nil, nil, nil, nil, nil, nil); // must be done before creating preferences form
   if ParamSwitch('-EMBEDDING') or ParamSwitch('-AUTOMATION') then