Merge branch 'wearable-v2' of github_ntdquang:aqandu/airu-board into …

…wearable-v2 # Conflicts: # airu_wearable/WAirU_v1.1.b#1 # airu_wearable/WAirU_v1.1.b#2 # airu_wearable/WAirU_v1.1.b#3 # airu_wearable/WAirU_v1.1.b#4 # airu_wearable/WAirU_v1.1.b#5 # airu_wearable/WAirU_v1.1.b#6 # airu_wearable/WAirU_v1.1.b#8 # airu_wearable/WAirU_v1.1.b#9
aqandu · Oct 30, 2019 · efae337 · efae337
2 parents 20344cf + 4701ebf
commit efae337
Show file tree

Hide file tree

Showing 21 changed files with 2,003 additions and 2,745 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/airu_wearable/WAirU_v1.1.b#1 b/airu_wearable/WAirU_v1.1.b#1
@@ -1579,7 +1579,20 @@ design rules under a new name.</description>
 <wire x1="36.15715625" y1="43.70783125" x2="36.076121875" y2="43.626796875" width="0.1524" layer="16"/>
 <wire x1="33.4876" y1="41.556940625" x2="31.56079375" y2="41.556940625" width="0.1524" layer="16"/>
 <wire x1="31.56079375" y1="41.556940625" x2="31.554659375" y2="41.563075" width="0.1524" layer="16"/>
+<wire x1="38.4998" y1="42.31608125" x2="44.295821875" y2="42.25320625" width="0" layer="19" extent="1-1"/>
+<wire x1="30.3398" y1="34.61608125" x2="31.56079375" y2="41.556940625" width="0" layer="19" extent="1-16"/>
+<wire x1="28.12215625" y1="20.071890625" x2="28.11655625" y2="20.077490625" width="0" layer="19" extent="1-1"/>
+<wire x1="17.942815625" y1="23.94339375" x2="24.2998" y2="24.41608125" width="0" layer="19" extent="1-1"/>
+<wire x1="12.547475" y1="23.0398" x2="12.898296875" y2="22.410621875" width="0" layer="19" extent="1-1"/>
+<wire x1="10.155075" y1="20.7148" x2="12.402475" y2="21.9148" width="0" layer="19" extent="1-1"/>
+<wire x1="9.647075" y1="20.7148" x2="10.155075" y2="20.7148" width="0" layer="19" extent="1-1"/>
+<wire x1="9.139075" y1="20.7148" x2="9.647075" y2="20.7148" width="0" layer="19" extent="1-1"/>
 <wire x1="9.672475" y1="23.1398" x2="9.647075" y2="20.7148" width="0" layer="19" extent="1-1"/>
+<wire x1="9.672475" y1="25.5398" x2="9.672475" y2="23.1398" width="0" layer="19" extent="1-1"/>
+<wire x1="9.647075" y1="27.9648" x2="9.672475" y2="25.5398" width="0" layer="19" extent="1-1"/>
+<wire x1="10.155075" y1="27.9648" x2="9.647075" y2="27.9648" width="0" layer="19" extent="1-1"/>
+<wire x1="9.139075" y1="27.9648" x2="9.647075" y2="27.9648" width="0" layer="19" extent="1-1"/>
+<wire x1="12.402475" y1="26.7648" x2="10.155075" y2="27.9648" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="3.3V">
 <contactref element="U7" pad="2"/>
@@ -1881,9 +1894,9 @@ design rules under a new name.</description>
 <wire x1="49.17551875" y1="14.354659375" x2="49.17551875" y2="16.36855625" width="0.4064" layer="1"/>
 <wire x1="48.051721875" y1="39.84751875" x2="49.133759375" y2="39.84751875" width="0.4064" layer="16"/>
 <wire x1="49.133759375" y1="39.84751875" x2="49.133759375" y2="14.3129" width="0.4064" layer="16"/>
-<wire x1="15.72768125" y1="23.3019625" x2="22.189440625" y2="23.3019625" width="0.4064" layer="16"/>
-<wire x1="22.189440625" y1="23.3019625" x2="22.189440625" y2="28.55625625" width="0.4064" layer="16"/>
-<wire x1="22.189440625" y1="28.55625625" x2="22.1643" y2="28.55625625" width="0.4064" layer="16"/>
+<wire x1="15.72768125" y1="23.3019625" x2="22.29611875" y2="23.3019625" width="0.4064" layer="16"/>
+<wire x1="22.29611875" y1="23.3019625" x2="22.29611875" y2="28.55625625" width="0.4064" layer="16"/>
+<wire x1="22.29611875" y1="28.55625625" x2="22.1643" y2="28.55625625" width="0.4064" layer="16"/>
 <wire x1="22.1643" y1="28.55625625" x2="22.1643" y2="35.27551875" width="0.4064" layer="16"/>
 <wire x1="22.1643" y1="35.27551875" x2="22.16429375" y2="35.27551875" width="0.4064" layer="16"/>
 <wire x1="33.420259375" y1="44.058596875" x2="35.72535625" y2="44.058596875" width="0.4064" layer="16"/>

diff --git a/airu_wearable/WAirU_v1.1.b#2 b/airu_wearable/WAirU_v1.1.b#2
diff --git a/airu_wearable/WAirU_v1.1.b#3 b/airu_wearable/WAirU_v1.1.b#3
diff --git a/airu_wearable/WAirU_v1.1.b#4 b/airu_wearable/WAirU_v1.1.b#4
diff --git a/airu_wearable/WAirU_v1.1.b#5 b/airu_wearable/WAirU_v1.1.b#5
diff --git a/airu_wearable/WAirU_v1.1.b#6 b/airu_wearable/WAirU_v1.1.b#6
diff --git a/airu_wearable/WAirU_v1.1.b#7 b/airu_wearable/WAirU_v1.1.b#7
diff --git a/airu_wearable/WAirU_v1.1.b#8 b/airu_wearable/WAirU_v1.1.b#8
@@ -1476,16 +1476,10 @@ design rules under a new name.</description>
 <wire x1="45.44078125" y1="21.6863375" x2="45.311059375" y2="21.816059375" width="0.4064" layer="1"/>
 <wire x1="42.7144125" y1="23.355271875" x2="43.771846875" y2="23.355271875" width="0.4064" layer="1"/>
 <wire x1="43.771846875" y1="23.355271875" x2="45.311059375" y2="21.816059375" width="0.4064" layer="1"/>
-<wire x1="44.387678125" y1="28.685896875" x2="41.3884375" y2="28.685896875" width="0.4064" layer="1"/>
-<wire x1="41.353740625" y1="26.413490625" x2="41.562046875" y2="26.205184375" width="0.4064" layer="1"/>
-<wire x1="41.562046875" y1="26.205184375" x2="43.306996875" y2="26.205184375" width="0.4064" layer="1"/>
-<wire x1="41.3884375" y1="28.685896875" x2="41.353740625" y2="28.6512" width="0.4064" layer="1"/>
-<wire x1="41.353740625" y1="28.6512" x2="41.353740625" y2="26.413490625" width="0.4064" layer="1"/>
-<wire x1="43.771846875" y1="25.740334375" x2="43.771846875" y2="23.355271875" width="0.4064" layer="1"/>
-<wire x1="43.306996875" y1="26.205184375" x2="43.771846875" y2="25.740334375" width="0.4064" layer="1"/>
 <wire x1="41.940478125" y1="36.77488125" x2="45.628190625" y2="40.374609375" width="0" layer="19" extent="1-1"/>
 <wire x1="39.5259625" y1="42.31608125" x2="41.940478125" y2="36.77488125" width="0" layer="19" extent="1-1"/>
-<wire x1="41.3884375" y1="28.685896875" x2="41.940478125" y2="36.77488125" width="0" layer="19" extent="1-1"/>
+<wire x1="44.387678125" y1="28.685896875" x2="41.940478125" y2="36.77488125" width="0" layer="19" extent="1-1"/>
+<wire x1="43.771846875" y1="23.355271875" x2="45.911059375" y2="26.12588125" width="0" layer="19" extent="1-1"/>
 <wire x1="41.22205625" y1="12.5101625" x2="47.485296875" y2="17.847815625" width="0" layer="19" extent="1-1"/>
 <wire x1="44.278059375" y1="9.846815625" x2="41.22205625" y2="12.5101625" width="0" layer="19" extent="1-1"/>
 <wire x1="37.7456375" y1="8.86343125" x2="41.22205625" y2="12.5101625" width="0" layer="19" extent="1-1"/>
@@ -1993,19 +1987,13 @@ design rules under a new name.</description>
 <wire x1="44.29243125" y1="27.259284375" x2="44.387059375" y2="27.16465625" width="0.3048" layer="1"/>
 <wire x1="46.6644125" y1="24.655271875" x2="47.5670875" y2="24.655271875" width="0.3048" layer="1"/>
 <wire x1="47.5670875" y1="24.655271875" x2="48.544478125" y2="23.67788125" width="0.3048" layer="1"/>
-<wire x1="44.65610625" y1="27.16465625" x2="44.387059375" y2="27.16465625" width="0.3048" layer="1"/>
-<wire x1="42.4078375" y1="27.259284375" x2="42.42815625" y2="27.259284375" width="0.3048" layer="1"/>
-<wire x1="46.6644125" y1="24.655271875" x2="45.91609375" y2="24.655271875" width="0.3048" layer="1"/>
+<wire x1="44.387059375" y1="27.16465625" x2="44.65610625" y2="27.16465625" width="0.3048" layer="1"/>
+<wire x1="42.4078375" y1="27.259284375" x2="45.01185" y2="24.655271875" width="0.3048" layer="1"/>
+<wire x1="45.01185" y1="24.655271875" x2="46.6644125" y2="24.655271875" width="0.3048" layer="1"/>
 <wire x1="47.5670875" y1="24.655271875" x2="47.5670875" y2="24.8769" width="0.3048" layer="1"/>
 <wire x1="47.5670875" y1="24.8769" x2="47.644209375" y2="24.954021875" width="0.3048" layer="1"/>
 <wire x1="47.644209375" y1="24.954021875" x2="47.644209375" y2="25.792590625" width="0.3048" layer="1"/>
 <wire x1="47.644209375" y1="25.792590625" x2="48.54194375" y2="26.690325" width="0.3048" layer="1"/>
-<wire x1="45.91609375" y1="24.655271875" x2="45.84669375" y2="24.724671875" width="0.4064" layer="1"/>
-<wire x1="45.84669375" y1="24.724671875" x2="45.842121875" y2="24.724671875" width="0.4064" layer="1"/>
-<wire x1="45.842121875" y1="24.724671875" x2="45.633815625" y2="24.932978125" width="0.4064" layer="1"/>
-<wire x1="45.633815625" y1="24.932978125" x2="45.633815625" y2="25.6286" width="0.4064" layer="1"/>
-<wire x1="45.633815625" y1="25.6286" x2="44.387059375" y2="26.87535625" width="0.4064" layer="1"/>
-<wire x1="44.387059375" y1="26.87535625" x2="44.387059375" y2="27.16465625" width="0.4064" layer="1"/>
 </signal>
 <signal name="BAT_CHECK">
 <contactref element="U7" pad="7"/>

diff --git a/airu_wearable/WAirU_v1.1.b#9 b/airu_wearable/WAirU_v1.1.b#9
@@ -1474,12 +1474,11 @@ design rules under a new name.</description>
 <wire x1="47.485296875" y1="18.10534375" x2="47.485296875" y2="17.847815625" width="0.4064" layer="1"/>
 <wire x1="45.44078125" y1="20.149859375" x2="45.44078125" y2="21.6863375" width="0.4064" layer="1"/>
 <wire x1="45.44078125" y1="21.6863375" x2="45.311059375" y2="21.816059375" width="0.4064" layer="1"/>
-<wire x1="42.7144125" y1="23.355271875" x2="43.771846875" y2="23.355271875" width="0.4064" layer="1"/>
-<wire x1="43.771846875" y1="23.355271875" x2="45.311059375" y2="21.816059375" width="0.4064" layer="1"/>
 <wire x1="41.940478125" y1="36.77488125" x2="45.628190625" y2="40.374609375" width="0" layer="19" extent="1-1"/>
 <wire x1="39.5259625" y1="42.31608125" x2="41.940478125" y2="36.77488125" width="0" layer="19" extent="1-1"/>
 <wire x1="44.387678125" y1="28.685896875" x2="41.940478125" y2="36.77488125" width="0" layer="19" extent="1-1"/>
-<wire x1="43.771846875" y1="23.355271875" x2="45.911059375" y2="26.12588125" width="0" layer="19" extent="1-1"/>
+<wire x1="45.311059375" y1="21.816059375" x2="46.6644125" y2="25.305271875" width="0" layer="19" extent="1-1"/>
+<wire x1="42.7144125" y1="23.355271875" x2="45.311059375" y2="21.816059375" width="0" layer="19" extent="1-1"/>
 <wire x1="41.22205625" y1="12.5101625" x2="47.485296875" y2="17.847815625" width="0" layer="19" extent="1-1"/>
 <wire x1="44.278059375" y1="9.846815625" x2="41.22205625" y2="12.5101625" width="0" layer="19" extent="1-1"/>
 <wire x1="37.7456375" y1="8.86343125" x2="41.22205625" y2="12.5101625" width="0" layer="19" extent="1-1"/>
@@ -1707,18 +1706,13 @@ design rules under a new name.</description>
 <contactref element="TP_VBAT" pad="TP"/>
 <contactref element="VBAT" pad="2"/>
 <contactref element="R15" pad="2"/>
-<wire x1="46.72535" y1="8.99121875" x2="46.93365625" y2="9.199525" width="0.4064" layer="1"/>
-<wire x1="46.93365625" y1="9.199525" x2="46.93365625" y2="10.49410625" width="0.4064" layer="1"/>
-<wire x1="45.4224625" y1="8.99121875" x2="46.72535" y2="8.99121875" width="0.4064" layer="1"/>
-<wire x1="45.422059375" y1="12.005703125" x2="45.422059375" y2="16.436340625" width="0.4064" layer="1"/>
-<wire x1="46.93365625" y1="10.49410625" x2="45.422059375" y2="12.005703125" width="0.4064" layer="1"/>
-<wire x1="44.278059375" y1="7.846815625" x2="45.4224625" y2="8.99121875" width="0.4064" layer="1"/>
 <wire x1="37.7456375" y1="6.03643125" x2="44.278059375" y2="7.846815625" width="0" layer="19" extent="1-1"/>
 <wire x1="36.2456375" y1="6.03643125" x2="37.7456375" y2="6.03643125" width="0" layer="19" extent="1-1"/>
 <wire x1="41.7855375" y1="0.45213125" x2="37.7456375" y2="6.03643125" width="0" layer="19" extent="1-1"/>
 <wire x1="34.2646" y1="12.900665625" x2="36.2456375" y2="6.03643125" width="0" layer="19" extent="1-1"/>
-<wire x1="27.170971875" y1="11.894415625" x2="34.2646" y2="12.900665625" width="0" layer="19" extent="1-1"/>
-<wire x1="19.96390625" y1="28.267690625" x2="27.170971875" y2="11.894415625" width="0" layer="19" extent="1-1"/>
+<wire x1="19.96390625" y1="28.267690625" x2="34.2646" y2="12.900665625" width="0" layer="19" extent="1-1"/>
+<wire x1="27.170971875" y1="11.894415625" x2="19.96390625" y2="28.267690625" width="0" layer="19" extent="1-1"/>
+<wire x1="45.422059375" y1="16.436340625" x2="27.170971875" y2="11.894415625" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="PMS_TX">
 <contactref element="R4" pad="2"/>
@@ -1728,15 +1722,7 @@ design rules under a new name.</description>
 <signal name="N$3">
 <contactref element="L1" pad="2"/>
 <contactref element="U6" pad="1"/>
-<wire x1="41.3066125" y1="21.44226875" x2="41.3066125" y2="21.893665625" width="0.4064" layer="1"/>
-<wire x1="41.3066125" y1="21.893665625" x2="40.777159375" y2="22.42311875" width="0.4064" layer="1"/>
-<wire x1="40.777159375" y1="22.42311875" x2="40.777159375" y2="23.90648125" width="0.4064" layer="1"/>
-<wire x1="41.683815625" y1="24.8131375" x2="41.683815625" y2="25.027565625" width="0.4064" layer="1"/>
-<wire x1="41.683815625" y1="25.027565625" x2="41.68901875" y2="25.03276875" width="0.4064" layer="1"/>
-<wire x1="41.68901875" y1="25.03276875" x2="41.68901875" y2="25.24251875" width="0.4064" layer="1"/>
-<wire x1="40.777159375" y1="23.90648125" x2="41.683815625" y2="24.8131375" width="0.4064" layer="1"/>
-<wire x1="41.68901875" y1="25.24251875" x2="41.751771875" y2="25.305271875" width="0.4064" layer="1"/>
-<wire x1="41.751771875" y1="25.305271875" x2="42.7144125" y2="25.305271875" width="0.4064" layer="1"/>
+<wire x1="41.3066125" y1="21.44226875" x2="42.7144125" y2="25.305271875" width="0" layer="19" extent="1-1"/>
 </signal>
 <signal name="N$10">
 <contactref element="R18" pad="2"/>