summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradrian-bowyer <adrian-bowyer@cb376a5e-1013-0410-a455-b6b1f9ac8223>2010-07-28 13:53:52 +0000
committeradrian-bowyer <adrian-bowyer@cb376a5e-1013-0410-a455-b6b1f9ac8223>2010-07-28 13:53:52 +0000
commitc6e782f0913b926b228d6dac80a7669d8557d0b2 (patch)
tree64d162c0a9c5710081e865cd7e70acdb26d99b12
parentb9a0e98e3dffdca955d8ea06bb443a9e78632cc6 (diff)
downloadreprap-backup-c6e782f0913b926b228d6dac80a7669d8557d0b2.tar.gz
reprap-backup-c6e782f0913b926b228d6dac80a7669d8557d0b2.zip
Redesign of Z flag; allows greater X movement.
Fuller error reporting of serial errors detected by the firmware. git-svn-id: https://reprap.svn.sourceforge.net/svnroot/reprap@3664 cb376a5e-1013-0410-a455-b6b1f9ac8223
-rwxr-xr-xtrunk/mendel/firmware/FiveD_GCode/FiveD_GCode_Interpreter/process_g_code.pde53
-rw-r--r--trunk/mendel/mechanics/solid-models/cartesian-robot-m4/imported-custom-parts/thin-sheet-templates/opto-flag-templates.dxf1690
2 files changed, 885 insertions, 858 deletions
diff --git a/trunk/mendel/firmware/FiveD_GCode/FiveD_GCode_Interpreter/process_g_code.pde b/trunk/mendel/firmware/FiveD_GCode/FiveD_GCode_Interpreter/process_g_code.pde
index 513885c3..7f14bff7 100755
--- a/trunk/mendel/firmware/FiveD_GCode/FiveD_GCode_Interpreter/process_g_code.pde
+++ b/trunk/mendel/firmware/FiveD_GCode/FiveD_GCode_Interpreter/process_g_code.pde
@@ -82,6 +82,9 @@ char cmdbuffer[COMMAND_SIZE];
char c = '?';
byte serial_count = 0;
boolean comment = false;
+// Serial error buffer
+char seBuffer[100];
+
FloatPoint fp;
FloatPoint sp;
@@ -310,7 +313,21 @@ void process_string(char instruction[], int size)
if( (bool)(gc.seen & GCODE_CHECKSUM) != (bool)(gc.seen & GCODE_N) )
{
if(SendDebug & DEBUG_ERRORS)
- Serial.println("Serial Error:Recieved a LineNr code without a Checksum code or Checksum without LineNr");
+ {
+ if(gc.seen & GCODE_CHECKSUM)
+ {
+ Serial.print("Serial Error: checksum without line number. Checksum: ");
+ Serial.flush();
+ itoa(gc.Checksum, seBuffer, 10);
+ Serial.println(seBuffer);
+ } else
+ {
+ Serial.print("Serial Error: line number without checksum. Linenumber: ");
+ Serial.flush();
+ ltoa(gc.LastLineNrRecieved+1, seBuffer, 10);
+ Serial.println(seBuffer);
+ }
+ }
FlushSerialRequestResend();
return;
}
@@ -326,7 +343,19 @@ void process_string(char instruction[], int size)
if(gc.Checksum != (int)checksum)
{
if(SendDebug & DEBUG_ERRORS)
- Serial.println("Serial Error: checksum mismatch");
+ {
+ Serial.print("Serial Error: checksum mismatch. Remote (");
+ Serial.flush();
+ itoa(gc.Checksum, seBuffer, 10);
+ Serial.print(seBuffer);
+ Serial.flush();
+ Serial.print(") not equal to local (");
+ Serial.flush();
+ itoa((int)checksum, seBuffer, 10);
+ Serial.print(seBuffer);
+ Serial.flush();
+ Serial.println(")");
+ }
FlushSerialRequestResend();
return;
}
@@ -335,7 +364,19 @@ void process_string(char instruction[], int size)
if(gc.N != gc.LastLineNrRecieved+1)
{
if(SendDebug & DEBUG_ERRORS)
- Serial.println("Serial Error: LineNr is not the last lineNr+1");
+ {
+ Serial.print("Serial Error: Linenumber (");
+ Serial.flush();
+ itoa(gc.N, seBuffer, 10);
+ Serial.print(seBuffer);
+ Serial.flush();
+ Serial.print(") is not last + 1 (");
+ Serial.flush();
+ itoa(gc.LastLineNrRecieved+1, seBuffer, 10);
+ Serial.print(seBuffer);
+ Serial.flush();
+ Serial.println(")");
+ }
FlushSerialRequestResend();
return;
}
@@ -746,9 +787,9 @@ void setupGcodeProcessor()
void FlushSerialRequestResend()
{
- char buffer[100]="Resend:";
- ltoa(gc.LastLineNrRecieved+1, buffer+7, 10);
Serial.flush();
- Serial.println(buffer);
+ strcpy(seBuffer, "Resend:");
+ ltoa(gc.LastLineNrRecieved+1, seBuffer+7, 10);
+ Serial.println(seBuffer);
}
diff --git a/trunk/mendel/mechanics/solid-models/cartesian-robot-m4/imported-custom-parts/thin-sheet-templates/opto-flag-templates.dxf b/trunk/mendel/mechanics/solid-models/cartesian-robot-m4/imported-custom-parts/thin-sheet-templates/opto-flag-templates.dxf
index 6bf218e7..6034fbf1 100644
--- a/trunk/mendel/mechanics/solid-models/cartesian-robot-m4/imported-custom-parts/thin-sheet-templates/opto-flag-templates.dxf
+++ b/trunk/mendel/mechanics/solid-models/cartesian-robot-m4/imported-custom-parts/thin-sheet-templates/opto-flag-templates.dxf
@@ -13,33 +13,37 @@ $HANDSEED
5
FFFF
9
-$DIMTAD
- 70
-1
+$USERR4
+ 40
+0.0
9
$DIMTDEC
70
2
9
-$USERR4
- 40
-0.0
+$DIMTAD
+ 70
+1
9
-$CLAYER
- 8
-0
+$CMLSTYLE
+ 2
+Standard
9
-$DIMALTZ
+$VISRETAIN
70
-0
+1
9
-$MENU
- 1
-.
+$TILEMODE
+ 70
+1
9
-$CHAMFERA
+$SHADEDIF
+ 70
+70
+ 9
+$USERR5
40
-10.0
+0.0
9
$UCSYDIR
10
@@ -49,137 +53,161 @@ $UCSYDIR
30
0.0
9
-$USERR5
+$CHAMFERA
40
-0.0
+10.0
9
-$SHADEDIF
- 70
-70
+$MENU
+ 1
+.
9
-$TILEMODE
+$DIMALTZ
70
-1
+0
9
-$VISRETAIN
- 70
-1
+$CLAYER
+ 8
+0
9
-$CMLSTYLE
- 2
-Standard
+$DIMASZ
+ 40
+2.5
9
-$EXTMIN
+$GRIDUNIT
10
0.0
20
0.0
- 30
-0.0
9
-$ORTHOMODE
+$DIMADEC
70
0
9
-$REGENMODE
- 70
-1
+$OLESTARTUP
+290
+0
9
-$TRACEWID
- 40
+$UCSXDIR
+ 10
1.0
+ 20
+0.0
+ 30
+0.0
9
-$DIMASZ
+$CHAMFERB
40
-2.5
+10.0
9
$DIMUPT
70
0
9
-$DIMADEC
+$TRACEWID
+ 40
+1.0
+ 9
+$REGENMODE
70
-0
+1
9
-$CHAMFERB
- 40
-10.0
+$ORTHOMODE
+ 70
+0
9
-$UCSXDIR
+$EXTMIN
10
-1.0
+0.0
20
0.0
30
0.0
9
-$OLESTARTUP
-290
+$DIMGAP
+ 40
+0.625
+ 9
+$ENDCAPS
+280
0
9
-$DIMSHO
+$MEASUREMENT
70
1
9
-$DIMALT
- 70
-0
- 9
-$DIMSAH
+$CMLJUST
70
0
9
-$DIMTFAC
- 40
+$PUCSYDIR
+ 10
+0.0
+ 20
1.0
+ 30
+0.0
9
-$DIMGAP
+$ANGBASE
+ 50
+0.0
+ 9
+$USRTIMER
+ 70
+1
+ 9
+$CHAMFERC
40
-0.625
+20.0
9
$SKETCHINC
40
1.0
9
-$CHAMFERC
+$DIMTFAC
40
-20.0
+1.0
9
-$USRTIMER
+$DIMSAH
+ 70
+0
+ 9
+$DIMALT
+ 70
+0
+ 9
+$DIMSHO
70
1
9
-$ANGBASE
- 50
-0.0
+$VERSIONGUID
+ 2
+{FAEB1C32-E019-11D5-929B-00C0DF256EC4}
9
-$PUCSYDIR
+$LWDISPLAY
+290
+0
+ 9
+$PUCSXDIR
10
-0.0
- 20
1.0
+ 20
+0.0
30
0.0
9
-$CMLJUST
+$SURFTYPE
70
-0
+6
9
-$MEASUREMENT
+$SPLFRAME
70
-1
- 9
-$ENDCAPS
-280
0
9
-$LIMMIN
- 10
-0.0
- 20
+$CHAMFERD
+ 40
0.0
9
-$DIMTSZ
+$DIMALTRND
40
0.0
9
@@ -187,151 +215,153 @@ $DIMALTTD
70
3
9
-$DIMALTRND
+$DIMTSZ
40
0.0
9
-$CHAMFERD
- 40
+$LIMMIN
+ 10
+0.0
+ 20
0.0
9
-$SPLFRAME
+$SPLINESEGS
70
-0
+8
9
-$SURFTYPE
+$AUPREC
70
-6
+0
9
-$PUCSXDIR
- 10
-1.0
- 20
-0.0
- 30
-0.0
+$LUNITS
+ 70
+2
9
-$LWDISPLAY
-290
-0
+$CELWEIGHT
+370
+-1
9
-$VERSIONGUID
- 2
-{FAEB1C32-E019-11D5-929B-00C0DF256EC4}
+$SURFTAB1
+ 70
+6
9
$DWGCODEPAGE
3
ANSI_1252
9
-$LUNITS
+$PSTYLEMODE
+290
+1
+ 9
+$UNITMODE
70
-2
+0
9
-$AUPREC
+$USERI1
70
0
9
-$SPLINESEGS
+$UCSORTHOVIEW
70
-8
+0
9
-$SURFTAB1
+$SURFTAB2
70
6
9
-$CELWEIGHT
-370
--1
- 9
-$INSBASE
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 9
-$DIMRND
+$TDUUPDATE
40
-0.0
+2455106.6155949770472944
9
-$DIMCEN
+$TDUCREATE
40
-2.5
+2455106.6155949649401009
9
-$DIMDSEP
+$SKPOLY
70
-44
+0
9
$ELEVATION
40
0.0
9
-$SKPOLY
+$DIMDSEP
70
-0
+44
9
-$TDUCREATE
+$DIMCEN
40
-2455106.6155949649401009
+2.5
9
-$TDUUPDATE
+$DIMRND
40
-2455106.6155949770472944
+0.0
9
-$SURFTAB2
- 70
-6
+$INSBASE
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
9
-$UCSORTHOVIEW
- 70
-0
+$DIMEXO
+ 40
+0.625
9
-$USERI1
+$INSUNITS
70
-0
+4
9
-$UNITMODE
+$USERI2
70
0
9
-$PSTYLEMODE
-290
-1
+$UCSORGRIGHT
+ 10
+0.0
+ 20
+0.0
+ 30
+0.0
9
-$EXTMAX
+$UCSORG
10
-210.0
+0.0
20
-297.0
+0.0
30
0.0
9
-$FILLMODE
- 70
-1
+$PELEVATION
+ 40
+0.0
9
$TEXTSIZE
40
2.5
9
-$DIMEXO
- 40
-0.625
- 9
-$PELEVATION
- 40
-0.0
+$FILLMODE
+ 70
+1
9
-$UCSORG
+$EXTMAX
10
-0.0
+210.0
20
-0.0
+297.0
30
0.0
9
-$UCSORGRIGHT
+$JOINSTYLE
+280
+0
+ 9
+$USERI3
+ 70
+0
+ 9
+$PUCSORGBOTTOM
10
0.0
20
@@ -339,23 +369,23 @@ $UCSORGRIGHT
30
0.0
9
-$USERI2
+$SURFU
70
-0
+6
9
-$INSUNITS
+$ANGDIR
70
-4
+0
9
-$DIMSCALE
+$TDUSRTIMER
40
-1.0
+0.0000000116
9
-$DIMDLE
- 40
-0.0
+$DIMLWD
+ 70
+-2
9
-$DIMZIN
+$DIMTZIN
70
8
9
@@ -363,117 +393,81 @@ $DIMTOLJ
70
0
9
-$DIMTZIN
+$DIMZIN
70
8
9
-$DIMLWD
- 70
--2
+$DIMDLE
+ 40
+0.0
9
-$TDUSRTIMER
+$DIMSCALE
40
-0.0000000116
+1.0
9
-$ANGDIR
+$DIMLUNIT
70
-0
+2
9
-$SURFU
+$WORLDVIEW
70
-6
- 9
-$PUCSORGBOTTOM
- 10
-0.0
- 20
-0.0
- 30
-0.0
+1
9
-$USERI3
+$USERI4
70
0
9
-$JOINSTYLE
-280
-0
- 9
-$ACADMAINTVER
+$SURFV
70
6
9
-$LIMMAX
- 10
-210.0
- 20
-297.0
- 9
-$QTEXTMODE
- 70
-0
- 9
-$DIMJUST
- 70
-0
- 9
-$DIMALTTZ
+$DIMLWE
70
-0
+-2
9
$DIMATFIT
70
3
9
-$DIMLUNIT
- 70
-2
- 9
-$DIMLWE
+$DIMALTTZ
70
--2
+0
9
-$SURFV
+$DIMJUST
70
-6
+0
9
-$USERI4
+$QTEXTMODE
70
0
9
-$WORLDVIEW
- 70
-1
+$LIMMAX
+ 10
+210.0
+ 20
+297.0
9
-$ATTMODE
+$ACADMAINTVER
70
-1
+6
9
$DIMTXT
40
2.5
9
-$DIMLIM
- 70
-0
- 9
-$DIMSE1
- 70
-0
- 9
-$DIMAZIN
+$GRIDMODE
70
-0
+1
9
-$THICKNESS
- 40
-0.0
+$EXTNAMES
+290
+1
9
-$LIMCHECK
+$PROXYGRAPHICS
70
-0
+1
9
-$PDMODE
+$USERI5
70
0
9
@@ -485,55 +479,47 @@ $UCSORGTOP
30
0.0
9
-$USERI5
+$PDMODE
70
0
9
-$PROXYGRAPHICS
+$LIMCHECK
70
-1
- 9
-$EXTNAMES
-290
-1
+0
9
-$CELTYPE
- 6
-ByLayer
+$THICKNESS
+ 40
+0.0
9
-$DIMTOH
+$DIMAZIN
70
0
9
-$DIMSE2
+$DIMSE1
70
0
9
-$DIMLFAC
- 40
-1.0
- 9
-$DIMSOXD
+$DIMLIM
70
0
9
+$ATTMODE
+ 70
+1
+ 9
$LUPREC
70
4
9
-$TDINDWG
- 40
-0.0000000116
- 9
-$SPLINETYPE
- 70
-6
+$XEDIT
+290
+1
9
-$PUCSORG
+$PEXTMAX
10
-0.0
+210.0
20
-0.0
+297.0
30
0.0
9
@@ -545,54 +531,54 @@ $PEXTMIN
30
0.0
9
-$PEXTMAX
+$PUCSORG
10
-210.0
+0.0
20
-297.0
+0.0
30
0.0
9
-$XEDIT
-290
-1
+$SPLINETYPE
+ 70
+6
9
-$CECOLOR
- 62
-256
+$TDINDWG
+ 40
+0.0000000116
9
-$DISPSILH
+$DIMSOXD
70
0
9
-$DIMDLI
+$DIMLFAC
40
-3.75
+1.0
9
-$DIMTM
- 40
-0.0
+$DIMSE2
+ 70
+0
9
-$DIMASO
+$DIMTOH
70
-1
+0
9
-$DIMTVP
+$CELTYPE
+ 6
+ByLayer
+ 9
+$PSVPSCALE
40
0.0
9
-$DIMSTYLE
+$FINGERPRINTGUID
2
-ISO-25
+{8C7C5B80-8E26-40F4-BA48-B0051130F571}
9
-$DIMFRAC
+$PLIMCHECK
70
0
9
-$PLINEWID
- 40
-0.0
- 9
$PUCSORGRIGHT
10
0.0
@@ -601,51 +587,63 @@ $PUCSORGRIGHT
30
0.0
9
-$PLIMCHECK
+$PLINEWID
+ 40
+0.0
+ 9
+$DIMFRAC
70
0
9
-$FINGERPRINTGUID
+$DIMSTYLE
2
-{8C7C5B80-8E26-40F4-BA48-B0051130F571}
+ISO-25
9
-$PSVPSCALE
+$DIMTVP
40
0.0
9
-$LTSCALE
+$DIMASO
+ 70
+1
+ 9
+$DIMTM
40
-1.0
+0.0
9
-$DIMTIH
+$DIMDLI
+ 40
+3.75
+ 9
+$DISPSILH
70
0
9
-$DIMALTD
- 70
-3
+$CECOLOR
+ 62
+256
9
-$DIMCLRT
- 70
-0
+$PLIMMAX
+ 10
+210.0
+ 20
+297.0
9
-$DIMDEC
- 70
-2
+$PLIMMIN
+ 10
+0.0
+ 20
+0.0
9
-$DIMALTU
+$TREEDEPTH
70
-2
- 9
-$FILLETRAD
- 40
-10.0
+3020
9
-$TDUPDATE
- 40
-2455106.6572616440244019
+$MAXACTVP
+ 70
+64
9
-$UCSORGLEFT
+$UCSORGBACK
10
0.0
20
@@ -653,7 +651,7 @@ $UCSORGLEFT
30
0.0
9
-$UCSORGBACK
+$UCSORGLEFT
10
0.0
20
@@ -661,53 +659,49 @@ $UCSORGBACK
30
0.0
9
-$MAXACTVP
- 70
-64
+$TDUPDATE
+ 40
+2455106.6572616440244019
9
-$PLIMMIN
- 10
-0.0
- 20
-0.0
+$FILLETRAD
+ 40
+10.0
9
-$PLIMMAX
- 10
-210.0
- 20
-297.0
+$DIMALTU
+ 70
+2
9
-$TREEDEPTH
+$DIMDEC
70
-3020
+2
9
-$CELTSCALE
- 40
-1.0
+$DIMCLRT
+ 70
+0
9
-$DIMEXE
- 40
-1.25
+$DIMALTD
+ 70
+3
9
-$DIMCLRD
+$DIMTIH
70
0
9
-$DIMTXSTY
- 7
-Standard
+$LTSCALE
+ 40
+1.0
9
-$PDSIZE
+$DIMEXE
40
-0.0
+1.25
9
-$PUCSORTHOVIEW
- 70
+$CEPSNTYPE
+380
0
9
-$USERR1
+$CMLSCALE
40
-0.0
+20.0
9
$PINSBASE
10
@@ -717,55 +711,51 @@ $PINSBASE
30
0.0
9
-$CMLSCALE
+$USERR1
40
-20.0
+0.0
9
-$CEPSNTYPE
-380
+$PUCSORTHOVIEW
+ 70
0
9
-$TEXTSTYLE
- 7
-Standard
- 9
-$DIMTP
+$PDSIZE
40
0.0
9
-$DIMTOL
+$DIMTXSTY
+ 7
+Standard
+ 9
+$DIMCLRD
70
0
9
-$DIMALTF
+$CELTSCALE
40
-0.0393700787
- 9
-$DIMTOFL
- 70
-1
+1.0
9
-$DIMCLRE
+$DIMAUNIT
70
0
9
-$DIMSD1
+$PSLTSCALE
70
-0
+1
9
-$DIMAUNIT
+$PLINEGEN
70
0
9
-$DIMTMOVE
+$SHADEDGE
70
-0
+3
9
-$TDCREATE
+$USERR2
40
-2455106.6572616319172084
+0.0
9
-$UCSORGFRONT
+$PUCSORGTOP
10
0.0
20
@@ -773,7 +763,7 @@ $UCSORGFRONT
30
0.0
9
-$PUCSORGTOP
+$UCSORGFRONT
10
0.0
20
@@ -781,39 +771,51 @@ $PUCSORGTOP
30
0.0
9
-$USERR2
+$TDCREATE
40
-0.0
+2455106.6572616319172084
9
-$SHADEDGE
+$DIMTMOVE
70
-3
+0
9
-$PLINEGEN
+$DIMSD1
70
0
9
-$PSLTSCALE
+$DIMCLRE
70
-1
+0
9
-$MIRRTEXT
+$DIMTOFL
70
1
9
-$DIMTIX
- 70
-0
+$DIMALTF
+ 40
+0.0393700787
9
-$DIMSD2
+$DIMTOL
70
0
9
+$DIMTP
+ 40
+0.0
+ 9
+$TEXTSTYLE
+ 7
+Standard
+ 9
$AUNITS
70
0
9
-$UCSORGBOTTOM
+$USERR3
+ 40
+0.0
+ 9
+$PUCSORGBACK
10
0.0
20
@@ -821,7 +823,7 @@ $UCSORGBOTTOM
30
0.0
9
-$PUCSORGLEFT
+$PUCSORGFRONT
10
0.0
20
@@ -829,7 +831,7 @@ $PUCSORGLEFT
30
0.0
9
-$PUCSORGFRONT
+$PUCSORGLEFT
10
0.0
20
@@ -837,7 +839,7 @@ $PUCSORGFRONT
30
0.0
9
-$PUCSORGBACK
+$UCSORGBOTTOM
10
0.0
20
@@ -845,9 +847,17 @@ $PUCSORGBACK
30
0.0
9
-$USERR3
- 40
-0.0
+$DIMSD2
+ 70
+0
+ 9
+$DIMTIX
+ 70
+0
+ 9
+$MIRRTEXT
+ 70
+1
0
ENDSEC
0
@@ -1789,7 +1799,7 @@ AcDbSymbolTableRecord
100
AcDbLayerTableRecord
2
-Z-FLAG-FLAT
+centres
70
0
62
@@ -1797,7 +1807,7 @@ Z-FLAG-FLAT
6
CONTINUOUS
370
--3
+0
390
F
0
@@ -1809,7 +1819,7 @@ AcDbSymbolTableRecord
100
AcDbLayerTableRecord
2
-centres
+Z-FLAG
70
0
62
@@ -2979,369 +2989,9 @@ SE2
1
0
-LINE
- 5
-6C
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-137.4402907035999988
- 20
-112.0839512570999972
- 30
-0.0
- 11
-137.4402907035999988
- 21
-137.0839512571000114
- 31
-0.0
- 0
-LINE
- 5
-6D
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-119.4402907035999988
- 20
-192.0839512571000114
- 30
-0.0
- 11
-137.4402907035999988
- 21
-192.0839512571000114
- 31
-0.0
- 0
-CIRCLE
- 5
-6E
-100
-AcDbEntity
-100
-AcDbCircle
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-125.4402907035999988
- 20
-186.0839512571000114
- 30
-0.0
- 40
-2.0
- 0
-LINE
- 5
-6F
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-119.4402907035999988
- 20
-174.0839512571000114
- 30
-0.0
- 11
-119.4402907035999988
- 21
-192.0839512571000114
- 31
-0.0
- 0
-LINE
- 5
-70
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-129.4402907035999988
- 20
-112.0839512570999972
- 30
-0.0
- 11
-137.4402907035999988
- 21
-112.0839512570999972
- 31
-0.0
- 0
-LINE
- 5
-71
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-129.4402907035999988
- 20
-112.0839512570999972
- 30
-0.0
- 11
-129.4402907035999988
- 21
-137.0839512571000114
- 31
-0.0
- 0
-LINE
- 5
-72
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-129.4402907035999988
- 20
-174.0839512571000114
- 30
-0.0
- 11
-119.4402907035999988
- 21
-174.0839512571000114
- 31
-0.0
- 0
-LINE
- 5
-73
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-129.4402907035999988
- 20
-151.9617879484999889
- 30
-0.0
- 11
-129.4402907035999988
- 21
-174.0839512571000114
- 31
-0.0
- 0
-LINE
- 5
-74
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-137.4402907035999988
- 20
-152.0839512571000114
- 30
-0.0
- 11
-137.4402907035999988
- 21
-192.0839512571000114
- 31
-0.0
- 0
-LINE
- 5
-75
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-129.4402907035999988
- 20
-151.9617879484999889
- 30
-0.0
- 11
-137.4402907035999988
- 21
-152.0839512571000114
- 31
-0.0
- 0
-LINE
- 5
-76
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-137.4402907035999988
- 20
-137.0839512571000114
- 30
-0.0
- 11
-129.4402907035999988
- 21
-137.0839512571000114
- 31
-0.0
- 0
-LINE
- 5
-77
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-137.4402907035999988
- 20
-152.0839512571000114
- 30
-0.0
- 11
-137.4402907035999988
- 21
-137.0839512571000114
- 31
-0.0
- 0
-LINE
- 5
-78
-100
-AcDbEntity
-100
-AcDbLine
- 8
-Z-FLAG-FLAT
- 62
-7
-370
--1
- 6
-CONTINUOUS
- 10
-129.4402907035999988
- 20
-137.0839512571000114
- 30
-0.0
- 11
-129.4402907035999988
- 21
-151.9617879484999889
- 31
-0.0
- 0
ENDBLK
5
-79
+6C
100
AcDbEntity
8
@@ -3351,7 +3001,7 @@ AcDbBlockEnd
0
BLOCK
5
-7A
+6D
100
AcDbEntity
8
@@ -3375,7 +3025,7 @@ _Oblique
0
LINE
5
-7B
+6E
100
AcDbEntity
100
@@ -3403,7 +3053,7 @@ ByBlock
0
ENDBLK
5
-7C
+6F
100
AcDbEntity
8
@@ -3413,7 +3063,7 @@ AcDbBlockEnd
0
BLOCK
5
-7D
+70
100
AcDbEntity
8
@@ -3437,7 +3087,7 @@ _Dot
0
LWPOLYLINE
5
-7E
+71
8
0
62
@@ -3469,7 +3119,7 @@ AcDbPolyline
0
LINE
5
-7F
+72
100
AcDbEntity
100
@@ -3497,7 +3147,7 @@ ByBlock
0
ENDBLK
5
-80
+73
100
AcDbEntity
8
@@ -3507,7 +3157,7 @@ AcDbBlockEnd
0
BLOCK
5
-81
+74
100
AcDbEntity
8
@@ -3531,7 +3181,7 @@ _SE_FILLED
0
LINE
5
-82
+75
100
AcDbEntity
100
@@ -3559,7 +3209,7 @@ ByLayer
0
ENDBLK
5
-83
+76
100
AcDbEntity
8
@@ -3569,7 +3219,7 @@ AcDbBlockEnd
0
BLOCK
5
-84
+77
100
AcDbEntity
8
@@ -3593,7 +3243,7 @@ DMBLK1
0
HATCH
5
-85
+78
8
Default
62
@@ -3635,31 +3285,31 @@ SOLID
10
155.4852275623505022
20
-188.5839511490827078
+115.5839531532888032
11
-154.9018942110116086
+154.3185608596726865
21
-192.0839512571160981
+115.5839531532888032
72
1
10
-154.9018942110116086
+154.3185608596726865
20
-192.0839512571160981
+115.5839531532888032
11
-154.3185608596726865
+154.9018942110116086
21
-188.5839511490827078
+112.0839530452553987
72
1
10
-154.3185608596726865
+154.9018942110116086
20
-188.5839511490827078
+112.0839530452553987
11
155.4852275623505022
21
-188.5839511490827078
+115.5839531532888032
97
0
75
@@ -3671,7 +3321,7 @@ SOLID
0
HATCH
5
-86
+79
8
Default
62
@@ -3713,31 +3363,31 @@ SOLID
10
155.4852275623505022
20
-115.5839531532888032
+188.5839511490827078
11
-154.3185608596726865
+154.9018942110116086
21
-115.5839531532888032
+192.0839512571160981
72
1
10
-154.3185608596726865
+154.9018942110116086
20
-115.5839531532888032
+192.0839512571160981
11
-154.9018942110116086
+154.3185608596726865
21
-112.0839530452553987
+188.5839511490827078
72
1
10
-154.9018942110116086
+154.3185608596726865
20
-112.0839530452553987
+188.5839511490827078
11
155.4852275623505022
21
-115.5839531532888032
+188.5839511490827078
97
0
75
@@ -3749,7 +3399,7 @@ SOLID
0
LINE
5
-87
+7A
100
AcDbEntity
100
@@ -3777,7 +3427,7 @@ CONTINUOUS
0
LINE
5
-88
+7B
100
AcDbEntity
100
@@ -3805,7 +3455,7 @@ CONTINUOUS
0
LINE
5
-89
+7C
100
AcDbEntity
100
@@ -3833,7 +3483,7 @@ CONTINUOUS
0
LINE
5
-8A
+7D
100
AcDbEntity
100
@@ -3861,7 +3511,7 @@ CONTINUOUS
0
LINE
5
-8B
+7E
100
AcDbEntity
100
@@ -3889,7 +3539,7 @@ CONTINUOUS
0
ARC
5
-8C
+7F
100
AcDbEntity
8
@@ -3919,7 +3569,7 @@ AcDbArc
0
ARC
5
-8D
+80
100
AcDbEntity
8
@@ -3949,7 +3599,7 @@ AcDbArc
0
MTEXT
5
-8E
+81
100
AcDbEntity
100
@@ -3983,13 +3633,13 @@ SEACAD_arial_ttf
50
90.0
73
-1
+0
44
1.0
0
ENDBLK
5
-8F
+82
100
AcDbEntity
8
@@ -4005,7 +3655,7 @@ ENTITIES
0
INSERT
5
-90
+83
100
AcDbEntity
100
@@ -4027,33 +3677,9 @@ SE1
30
0.0
0
-INSERT
- 5
-91
-100
-AcDbEntity
-100
-AcDbBlockReference
- 8
-Default
- 62
-256
-370
--1
- 6
-ByLayer
- 2
-SE2
- 10
-0.0
- 20
-0.0
- 30
-0.0
- 0
LINE
5
-92
+84
100
AcDbEntity
100
@@ -4081,7 +3707,7 @@ ByLayer
0
LINE
5
-93
+85
100
AcDbEntity
100
@@ -4109,7 +3735,7 @@ ByLayer
0
LINE
5
-94
+86
100
AcDbEntity
100
@@ -4137,7 +3763,7 @@ ByLayer
0
LINE
5
-95
+87
100
AcDbEntity
100
@@ -4165,7 +3791,7 @@ ByLayer
0
LINE
5
-96
+88
100
AcDbEntity
100
@@ -4193,7 +3819,7 @@ ByLayer
0
LINE
5
-97
+89
100
AcDbEntity
100
@@ -4221,7 +3847,7 @@ ByLayer
0
LINE
5
-98
+8A
100
AcDbEntity
100
@@ -4249,7 +3875,7 @@ ByLayer
0
LINE
5
-99
+8B
100
AcDbEntity
100
@@ -4277,7 +3903,7 @@ ByLayer
0
LINE
5
-9A
+8C
100
AcDbEntity
100
@@ -4305,7 +3931,7 @@ ByLayer
0
LINE
5
-9B
+8D
100
AcDbEntity
100
@@ -4333,7 +3959,7 @@ ByLayer
0
CIRCLE
5
-9C
+8E
100
AcDbEntity
100
@@ -4357,7 +3983,7 @@ ByLayer
0
CIRCLE
5
-9D
+8F
100
AcDbEntity
100
@@ -4381,7 +4007,7 @@ ByLayer
0
LINE
5
-9E
+90
100
AcDbEntity
100
@@ -4409,7 +4035,7 @@ ByLayer
0
LINE
5
-9F
+91
100
AcDbEntity
100
@@ -4437,7 +4063,7 @@ ByLayer
0
LINE
5
-A0
+92
100
AcDbEntity
100
@@ -4465,7 +4091,7 @@ ByLayer
0
LINE
5
-A1
+93
100
AcDbEntity
100
@@ -4493,7 +4119,7 @@ ByLayer
0
LINE
5
-A2
+94
100
AcDbEntity
100
@@ -4521,7 +4147,7 @@ ByLayer
0
LINE
5
-A3
+95
100
AcDbEntity
100
@@ -4549,7 +4175,7 @@ ByLayer
0
LINE
5
-A4
+96
100
AcDbEntity
100
@@ -4577,7 +4203,7 @@ ByLayer
0
LINE
5
-A5
+97
100
AcDbEntity
100
@@ -4603,6 +4229,366 @@ ByLayer
31
0.0
0
+LINE
+ 5
+98
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+137.4402907035999988
+ 20
+152.0839512571000114
+ 30
+0.0
+ 11
+129.4402907035999988
+ 21
+151.9617879484999605
+ 31
+0.0
+ 0
+LINE
+ 5
+99
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+137.4402907035999988
+ 20
+152.0839512571000114
+ 30
+0.0
+ 11
+137.4402907035999988
+ 21
+112.0839512571000256
+ 31
+0.0
+ 0
+LINE
+ 5
+9A
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+137.4402907035999988
+ 20
+112.0839512571000256
+ 30
+0.0
+ 11
+129.4402907035999988
+ 21
+112.0839512571000114
+ 31
+0.0
+ 0
+LINE
+ 5
+9B
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+129.4402907035999988
+ 20
+112.0839512571000114
+ 30
+0.0
+ 11
+129.4402907035999988
+ 21
+151.9617879484999605
+ 31
+0.0
+ 0
+LINE
+ 5
+9C
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+137.4402907035999988
+ 20
+137.0839512571000398
+ 30
+0.0
+ 11
+129.4402907035999988
+ 21
+137.0839512571000114
+ 31
+0.0
+ 0
+CIRCLE
+ 5
+9D
+100
+AcDbEntity
+100
+AcDbCircle
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+125.4402907035999988
+ 20
+186.0839512571000114
+ 30
+0.0
+ 40
+2.0597718193589594
+ 0
+LINE
+ 5
+9E
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+119.440290703600013
+ 20
+157.0
+ 30
+0.0
+ 11
+129.4402907035999988
+ 21
+157.0
+ 31
+0.0
+ 0
+LINE
+ 5
+9F
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+129.4402907035999988
+ 20
+151.9617879484999605
+ 30
+0.0
+ 11
+129.4402907035999988
+ 21
+157.0
+ 31
+0.0
+ 0
+LINE
+ 5
+A0
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+129.0
+ 20
+192.0839512571000398
+ 30
+0.0
+ 11
+129.0
+ 21
+166.0
+ 31
+0.0
+ 0
+LINE
+ 5
+A1
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+137.4402907035999988
+ 20
+166.0
+ 30
+0.0
+ 11
+137.4402907035999988
+ 21
+152.0839512571000114
+ 31
+0.0
+ 0
+LINE
+ 5
+A2
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+129.0
+ 20
+166.0
+ 30
+0.0
+ 11
+137.4402907035999988
+ 21
+166.0
+ 31
+0.0
+ 0
+LINE
+ 5
+A3
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+119.4402907035999988
+ 20
+192.0839512571000114
+ 30
+0.0
+ 11
+129.0
+ 21
+192.0839512571000398
+ 31
+0.0
+ 0
+LINE
+ 5
+A4
+100
+AcDbEntity
+100
+AcDbLine
+ 8
+Z-FLAG
+ 62
+256
+370
+-1
+ 6
+ByLayer
+ 10
+119.440290703600013
+ 20
+157.0
+ 30
+0.0
+ 11
+119.4402907035999988
+ 21
+192.0839512571000114
+ 31
+0.0
+ 0
ENDSEC
0
SECTION
@@ -4641,7 +4627,7 @@ E
3
AcDbVariableDictionary
350
-A6
+A5
0
DICTIONARY
5
@@ -5105,7 +5091,7 @@ Layout2
0
DICTIONARY
5
-A6
+A5
100
AcDbDictionary
281
@@ -5113,15 +5099,15 @@ AcDbDictionary
3
DIMASSOC
350
-A8
+A7
3
HIDETEXT
350
-A7
+A6
0
DICTIONARYVAR
5
-A7
+A6
100
DictionaryVariables
280
@@ -5131,7 +5117,7 @@ DictionaryVariables
0
DICTIONARYVAR
5
-A8
+A7
100
DictionaryVariables
280