Merge branch 'feature/new_3D' into develop

4 years ago · cad4fa68f2
17 changed files with 5 additions and 5 deletions
--- a/3D/Anemometer/V3/Base.FCStd
+++ b/3D/Anemometer/V3/Base.FCStd
--- a/3D/Anemometer/V3/Base.stl
+++ b/3D/Anemometer/V3/Base.stl
--- a/3D/Anemometer/V3/Cup.FCStd
+++ b/3D/Anemometer/V3/Cup.FCStd
--- a/3D/Anemometer/V3/Cup.FCStd1
+++ b/3D/Anemometer/V3/Cup.FCStd1
--- a/3D/Anemometer/V3/Cup.stl
+++ b/3D/Anemometer/V3/Cup.stl
--- a/3D/Anemometer/V3/Pivot.FCStd
+++ b/3D/Anemometer/V3/Pivot.FCStd
--- a/3D/Anemometer/V3/Pivot.FCStd1
+++ b/3D/Anemometer/V3/Pivot.FCStd1
--- a/3D/Anemometer/V3/Pivot.stl
+++ b/3D/Anemometer/V3/Pivot.stl
--- a/3D/WindDirection/V3/Arrow.FCStd
+++ b/3D/WindDirection/V3/Arrow.FCStd
--- a/3D/WindDirection/V3/Arrow.stl
+++ b/3D/WindDirection/V3/Arrow.stl
--- a/3D/WindDirection/V3/Base.FCStd
+++ b/3D/WindDirection/V3/Base.FCStd
--- a/3D/WindDirection/V3/Base.stl
+++ b/3D/WindDirection/V3/Base.stl
--- a/3D/WindDirection/V3/Pivot.FCStd
+++ b/3D/WindDirection/V3/Pivot.FCStd
--- a/3D/WindDirection/V3/Pivot.stl
+++ b/3D/WindDirection/V3/Pivot.stl
--- a/Circuits/full.pdf
+++ b/Circuits/full.pdf
--- a/Circuits/sensors.pdf
+++ b/Circuits/sensors.pdf
--- a/Circuits/sensors.svg
+++ b/Circuits/sensors.svg
@ -23,9 +23,9 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
     inkscape:zoom="3.959798"
     inkscape:cx="46.307286"
     inkscape:cy="48.191376"
     inkscape:zoom="5.6"
     inkscape:cx="0.55679895"
     inkscape:cy="55.489352"
     inkscape:document-units="mm"
     inkscape:current-layer="svg8"
     inkscape:document-rotation="0"
@ -57,7 +57,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
        <dc:title></dc:title>
        <dc:title />
      </cc:Work>
    </rdf:RDF>
  </metadata>
@ -10743,6 +10743,6 @@
  <path
     id="path4088"
     style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.66929;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
     d="M 47.671875 6.4589844 L 32.671875 20.462891 L 14.53125 20.462891 A 2.6337591 2.8976224 0 0 1 15.300781 22.507812 A 2.6337591 2.8976224 0 0 1 12.785156 25.402344 L 12.785156 26.132812 L 34.908203 26.132812 L 40.230469 21.164062 A 2.6337591 2.8976224 0 0 1 39.287109 18.939453 A 2.6337591 2.8976224 0 0 1 41.910156 16.042969 A 2.6337591 2.8976224 0 0 1 41.921875 16.042969 A 2.6337591 2.8976224 0 0 1 44.189453 17.46875 L 49.908203 12.128906 L 54.789062 12.128906 L 126.95312 12.128906 L 126.95312 59.128906 L 135.78906 59.128906 L 135.78906 53.458984 L 132.62305 53.458984 L 132.62305 6.4589844 L 54.789062 6.4589844 L 47.671875 6.4589844 z M -0.044921875 10.460938 L -0.044921875 110.13086 L 140.625 110.13086 L 140.625 76.291016 L 134.95508 76.291016 L 134.95508 104.46094 L 5.625 104.46094 L 5.625 92.132812 L 10.792969 92.132812 L 10.792969 86.464844 L 5.625 86.464844 L 5.625 73.132812 L 10.792969 73.132812 L 10.792969 67.462891 L 5.625 67.462891 L 5.625 64.126953 L 11.824219 64.126953 A 2.6337591 2.8976224 0 0 1 9.9921875 61.367188 A 2.6337591 2.8976224 0 0 1 12.615234 58.46875 A 2.6337591 2.8976224 0 0 1 12.626953 58.46875 A 2.6337591 2.8976224 0 0 1 15.259766 61.367188 A 2.6337591 2.8976224 0 0 1 13.423828 64.126953 L 21.960938 64.126953 L 34.960938 51.126953 L 38.955078 51.126953 L 38.955078 55.296875 L 44.623047 55.296875 L 44.623047 51.126953 L 98.615234 51.126953 L 102.61523 55.128906 L 109.79102 55.128906 L 109.79102 49.458984 L 104.96289 49.458984 L 100.96289 45.457031 L 32.613281 45.457031 L 19.613281 58.457031 L 5.625 58.457031 L 5.625 54.130859 L 10.792969 54.130859 L 10.792969 48.462891 L 5.625 48.462891 L 5.625 35.130859 L 10.792969 35.130859 L 10.792969 29.460938 L 5.625 29.460938 L 5.625 16.128906 L 10.792969 16.128906 L 10.792969 10.460938 L -0.044921875 10.460938 z M 73.951172 16.460938 L 73.951172 17.5625 A 2.6337591 2.8976224 0 0 1 74.90625 16.460938 L 73.951172 16.460938 z M 77.628906 16.460938 A 2.6337591 2.8976224 0 0 1 78.900391 18.939453 A 2.6337591 2.8976224 0 0 1 76.265625 21.837891 A 2.6337591 2.8976224 0 0 1 73.951172 20.320312 L 73.951172 31.291016 L 79.621094 31.291016 L 79.621094 22.130859 L 117.95508 22.130859 L 117.95508 91.460938 L 96.058594 91.460938 A 2.6337591 2.8976224 0 0 1 93.439453 94.064453 A 2.6337591 2.8976224 0 0 1 90.818359 91.460938 L 86.966797 91.460938 L 78.625 83.119141 L 78.625 79.421875 A 2.6337591 2.8976224 0 0 1 76.013672 81.941406 A 2.6337591 2.8976224 0 0 1 73.392578 79.296875 L 72.955078 79.296875 L 72.955078 85.466797 L 84.611328 97.130859 L 123.625 97.130859 L 123.625 16.460938 L 105.72852 16.460938 A 2.6337591 2.8976224 0 0 1 106.67969 18.6875 A 2.6337591 2.8976224 0 0 1 104.04492 21.585938 A 2.6337591 2.8976224 0 0 1 101.41211 18.6875 A 2.6337591 2.8976224 0 0 1 102.36328 16.460938 L 77.628906 16.460938 z M 135.95312 21.296875 L 135.95312 35.292969 L 141.62109 35.292969 L 141.62109 21.296875 L 135.95312 21.296875 z M 12.785156 38.458984 L 12.785156 38.892578 A 2.6337591 2.8976224 0 0 1 15.259766 41.785156 A 2.6337591 2.8976224 0 0 1 14.173828 44.128906 L 107.61328 44.128906 L 107.7832 44.298828 L 111.79102 40.291016 L 109.96094 38.458984 L 12.785156 38.458984 z M 77.791016 53.458984 L 77.791016 59.128906 L 92.791016 59.128906 L 92.791016 58.451172 A 2.6337591 2.8976224 0 0 1 90.300781 55.558594 A 2.6337591 2.8976224 0 0 1 91.117188 53.458984 L 77.791016 53.458984 z M 101.61133 59.460938 L 99.611328 61.460938 L 56.611328 61.460938 L 42 76.074219 A 2.6337591 2.8976224 0 0 1 43.955078 78.873047 A 2.6337591 2.8976224 0 0 1 41.322266 81.771484 A 2.6337591 2.8976224 0 0 1 38.6875 78.873047 A 2.6337591 2.8976224 0 0 1 39.023438 77.458984 L 13.789062 77.458984 L 13.789062 83.126953 L 42.962891 83.126953 L 58.966797 67.130859 L 101.9668 67.130859 L 103.9668 65.130859 L 109.79102 65.130859 L 109.79102 59.460938 L 101.61133 59.460938 z M 66.613281 68.458984 L 43.597656 91.476562 A 2.6337591 2.8976224 0 0 1 44.330078 93.478516 A 2.6337591 2.8976224 0 0 1 41.695312 96.376953 A 2.6337591 2.8976224 0 0 1 39.703125 95.371094 L 39.611328 95.462891 L 13.611328 95.462891 L 12.466797 96.607422 A 2.6337591 2.8976224 0 0 1 12.615234 96.601562 A 2.6337591 2.8976224 0 0 1 12.626953 96.601562 A 2.6337591 2.8976224 0 0 1 15.259766 99.5 A 2.6337591 2.8976224 0 0 1 14.263672 101.76953 L 14.792969 102.29883 L 15.958984 101.13281 L 41.966797 101.13281 L 68.960938 74.128906 L 112.78711 74.128906 L 112.78711 73.40625 A 2.6337591 2.8976224 0 0 1 111.43945 73.816406 A 2.6337591 2.8976224 0 0 1 108.80469 70.917969 A 2.6337591 2.8976224 0 0 1 110.04883 68.458984 L 66.613281 68.458984 z "
     d="M 47.671875 6.4589844 L 32.671875 20.462891 L 14.53125 20.462891 A 2.6337591 2.8976224 0 0 1 15.300781 22.507812 A 2.6337591 2.8976224 0 0 1 12.785156 25.402344 L 12.785156 26.132812 L 34.908203 26.132812 L 40.230469 21.164062 A 2.6337591 2.8976224 0 0 1 39.287109 18.939453 A 2.6337591 2.8976224 0 0 1 41.910156 16.042969 A 2.6337591 2.8976224 0 0 1 41.921875 16.042969 A 2.6337591 2.8976224 0 0 1 44.189453 17.46875 L 49.908203 12.128906 L 54.789062 12.128906 L 126.95312 12.128906 L 126.95312 59.128906 L 135.78906 59.128906 L 135.78906 53.458984 L 132.62305 53.458984 L 132.62305 6.4589844 L 54.789062 6.4589844 L 47.671875 6.4589844 z M -0.044921875 10.460938 L -0.044921875 110.13086 L 140.625 110.13086 L 140.625 76.291016 L 134.95508 76.291016 L 134.95508 104.46094 L 5.625 104.46094 L 5.625 92.132812 L 10.792969 92.132812 L 10.792969 86.464844 L 5.625 86.464844 L 5.625 73.132812 L 10.792969 73.132812 L 10.792969 67.478516 L 5.6191406 67.478516 L 5.6191406 54.128906 L 10.792969 54.128906 L 10.792969 48.462891 L 5.625 48.462891 L 5.625 35.130859 L 10.792969 35.130859 L 10.792969 29.460938 L 5.625 29.460938 L 5.625 16.128906 L 10.792969 16.128906 L 10.792969 10.460938 L -0.044921875 10.460938 z M 73.951172 16.460938 L 73.951172 17.5625 A 2.6337591 2.8976224 0 0 1 74.90625 16.460938 L 73.951172 16.460938 z M 77.628906 16.460938 A 2.6337591 2.8976224 0 0 1 78.900391 18.939453 A 2.6337591 2.8976224 0 0 1 76.265625 21.837891 A 2.6337591 2.8976224 0 0 1 73.951172 20.320312 L 73.951172 31.291016 L 79.621094 31.291016 L 79.621094 22.130859 L 117.95508 22.130859 L 117.95508 91.460938 L 96.058594 91.460938 A 2.6337591 2.8976224 0 0 1 93.439453 94.064453 A 2.6337591 2.8976224 0 0 1 90.818359 91.460938 L 86.966797 91.460938 L 78.625 83.119141 L 78.625 79.421875 A 2.6337591 2.8976224 0 0 1 76.013672 81.941406 A 2.6337591 2.8976224 0 0 1 73.392578 79.296875 L 72.955078 79.296875 L 72.955078 85.466797 L 84.611328 97.130859 L 123.625 97.130859 L 123.625 16.460938 L 105.72852 16.460938 A 2.6337591 2.8976224 0 0 1 106.67969 18.6875 A 2.6337591 2.8976224 0 0 1 104.04492 21.585938 A 2.6337591 2.8976224 0 0 1 101.41211 18.6875 A 2.6337591 2.8976224 0 0 1 102.36328 16.460938 L 77.628906 16.460938 z M 135.95312 21.296875 L 135.95312 35.292969 L 141.62109 35.292969 L 141.62109 21.296875 L 135.95312 21.296875 z M 38.855469 35.523438 L 38.855469 38.458984 L 12.785156 38.458984 L 12.785156 38.892578 A 2.6337591 2.8976224 0 0 1 15.259766 41.785156 A 2.6337591 2.8976224 0 0 1 14.173828 44.128906 L 107.61328 44.128906 L 107.7832 44.298828 L 111.79102 40.291016 L 109.96094 38.458984 L 44.404297 38.458984 L 44.404297 35.523438 L 38.855469 35.523438 z M 32.613281 45.457031 L 19.613281 58.457031 L 15.423828 58.457031 L 15.423828 64.126953 L 21.960938 64.126953 L 34.960938 51.126953 L 38.955078 51.126953 L 38.955078 55.296875 L 44.623047 55.296875 L 44.623047 51.126953 L 98.615234 51.126953 L 102.61523 55.128906 L 109.79102 55.128906 L 109.79102 49.458984 L 104.96289 49.458984 L 100.96289 45.457031 L 32.613281 45.457031 z M 77.791016 53.458984 L 77.791016 59.128906 L 92.791016 59.128906 L 92.791016 58.451172 A 2.6337591 2.8976224 0 0 1 90.300781 55.558594 A 2.6337591 2.8976224 0 0 1 91.117188 53.458984 L 77.791016 53.458984 z M 101.61133 59.460938 L 99.611328 61.460938 L 56.611328 61.460938 L 42 76.074219 A 2.6337591 2.8976224 0 0 1 43.955078 78.873047 A 2.6337591 2.8976224 0 0 1 41.322266 81.771484 A 2.6337591 2.8976224 0 0 1 38.6875 78.873047 A 2.6337591 2.8976224 0 0 1 39.023438 77.458984 L 13.789062 77.458984 L 13.789062 83.126953 L 42.962891 83.126953 L 58.966797 67.130859 L 101.9668 67.130859 L 103.9668 65.130859 L 109.79102 65.130859 L 109.79102 59.460938 L 101.61133 59.460938 z M 66.613281 68.458984 L 43.597656 91.476562 A 2.6337591 2.8976224 0 0 1 44.330078 93.478516 A 2.6337591 2.8976224 0 0 1 41.695312 96.376953 A 2.6337591 2.8976224 0 0 1 39.703125 95.371094 L 39.611328 95.462891 L 13.611328 95.462891 L 12.466797 96.607422 A 2.6337591 2.8976224 0 0 1 12.615234 96.601562 A 2.6337591 2.8976224 0 0 1 12.626953 96.601562 A 2.6337591 2.8976224 0 0 1 15.259766 99.5 A 2.6337591 2.8976224 0 0 1 14.263672 101.76953 L 14.792969 102.29883 L 15.958984 101.13281 L 41.966797 101.13281 L 68.960938 74.128906 L 112.78711 74.128906 L 112.78711 73.40625 A 2.6337591 2.8976224 0 0 1 111.43945 73.816406 A 2.6337591 2.8976224 0 0 1 108.80469 70.917969 A 2.6337591 2.8976224 0 0 1 110.04883 68.458984 L 66.613281 68.458984 z "
     transform="scale(0.26458333)" />
 </svg>