[FE training-materials-updates] Fix overlapping lines in pinctrl diagram

Michael Opdenacker michael.opdenacker at free-electrons.com
Wed Apr 1 06:54:16 CEST 2015


Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=39bbf32763443f12d29450efa6da10a7cbd03885

>---------------------------------------------------------------

commit 39bbf32763443f12d29450efa6da10a7cbd03885
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Wed Apr 1 06:53:10 2015 +0200

    Fix overlapping lines in pinctrl diagram
    
    - Also ignore dia autosave files
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


>---------------------------------------------------------------

39bbf32763443f12d29450efa6da10a7cbd03885
 .gitignore                                    |  1 +
 slides/kernel-pinmuxing/pinctrl-subsystem.dia | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index f15b718..f780c9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ out/
 *.pdf
 *-labs/
 *~
+*.autosave
diff --git a/slides/kernel-pinmuxing/pinctrl-subsystem.dia b/slides/kernel-pinmuxing/pinctrl-subsystem.dia
index 5faed13..4e124e9 100644
--- a/slides/kernel-pinmuxing/pinctrl-subsystem.dia
+++ b/slides/kernel-pinmuxing/pinctrl-subsystem.dia
@@ -1423,10 +1423,10 @@ and devices#</dia:string>
     </dia:object>
     <dia:object type="Standard - Text" version="1" id="O41">
       <dia:attribute name="obj_pos">
-        <dia:point val="13.25,14.875"/>
+        <dia:point val="11.5,14.875"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="13.25,14.28;29.4725,15.0275"/>
+        <dia:rectangle val="11.5,14.28;27.7225,15.0275"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1440,7 +1440,7 @@ and devices#</dia:string>
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="13.25,14.875"/>
+            <dia:point val="11.5,14.875"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1649,16 +1649,16 @@ and devices#</dia:string>
     </dia:object>
     <dia:object type="Standard - ZigZagLine" version="1" id="O48">
       <dia:attribute name="obj_pos">
-        <dia:point val="30,19"/>
+        <dia:point val="30,19.9"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="26.8882,11.1382;30.05,19.05"/>
+        <dia:rectangle val="26.8882,12.0382;30.05,19.95"/>
       </dia:attribute>
       <dia:attribute name="orth_points">
-        <dia:point val="30,19"/>
-        <dia:point val="28.5143,19"/>
-        <dia:point val="28.5143,11.5"/>
-        <dia:point val="27,11.5"/>
+        <dia:point val="30,19.9"/>
+        <dia:point val="28.5143,19.9"/>
+        <dia:point val="28.5143,12.4"/>
+        <dia:point val="27,12.4"/>
       </dia:attribute>
       <dia:attribute name="orth_orient">
         <dia:enum val="0"/>



More information about the training-materials-updates mailing list