code/code.ino

@@ -11,8 +11,6 @@
 //Components
 LiquidCrystal_I2C lcd(0x27, 16, 2);
 RF24 radio(9,10); // CE, CSN
-const byte micPin = A0;
-
 
 //Settings
 //byte unsigned address = 1;
@@ -29,29 +27,24 @@ byte value = 0;
 bool isScreenChanged = true; // we must display first time
 
 //Switch screen button
-const byte switchScreenButton = A1;
+const byte switchScreenButton = 2;
 byte switchScreenLast;
 
 //IncreaseButton
-const byte increaseButton = A2;
+const byte increaseButton = 3;
 byte increaseButtonLast;
 
 //DecreaseButton
-const byte decreaseButton = A3;
+const byte decreaseButton = 4;
 byte decreaseButtonLast;
 
 void switchMode();
 void printOutput();
 void updatePassword();
 
-//short micValue = 337; 
-//const short micBaseline = 337;// 3.3v / 2 = 1.56v, 1.56/5*1024 = 337.
-
-short micValues[32];
-
 void setup() {
   Serial.begin(9600);
-  pinMode(micPin, INPUT);
+
   //Setting up buttons
   pinMode(switchScreenButton, INPUT_PULLUP);
   pinMode(increaseButton, INPUT_PULLUP);
@@ -72,19 +65,18 @@ void setup() {
 }
 
 void loop() {
-  switchMode();
+//  switchMode();
+
   if (!mode) {// transmit
-    for (int i = 0; i < 32; i ++) {
-      micValues[i] = analogRead(micPin) << 2;
-    }
-    radio.write(micValues, 32);
+    const char text[] = "Hello world!";
+    if (radio.write(&text, sizeof(text))) Serial.println("данные успешно отправлены");
+    else Serial.println("хуй там");
   } else { // receive
     if (radio.available()) {
-      radio.read(micValues, 32);
-      for (int i = 0; i < 32; i++) {
-        PORTD = micValues[i];
-      }
-    }
+      char text[32] = "";
+      radio.read(&text, sizeof(text));
+      Serial.println(text);   
+    } 
   }
  
   byte switchButtonValue = digitalRead(switchScreenButton);
@@ -102,14 +94,15 @@ void loop() {
     switch (screen) {
       case 0:
         mode = !mode;
+        Serial.println("xui");
       break;
       case 1:
         if (decreaseValue == 0 && decreaseButtonLast == 1)
 //          address = address > 0? address - 1 : 127;
-            1+1;
+         Serial.println("");
         else
 //          address = address < 127? address + 1 : 0;
-            1+1;
+        Serial.println("");
       break;
       case 2:
         if (decreaseValue == 0 && decreaseButtonLast == 1){
@@ -129,6 +122,10 @@ void loop() {
   decreaseButtonLast = decreaseValue;
   if (isScreenChanged)
     printOutput();
+//  Serial.println(analogRead(A1));
+  analogWrite(6, value);
+  value +=5;
+  delay(50);
 }
 
 void switchMode () {
@@ -149,10 +146,10 @@ void printOutput () {
    switch (screen) {
     case 0:
       lcd.print("Mode: ");
-      lcd.print(mode? "receive" : "transmit");
+      lcd.print(mode? "rec." : "tra.");
     break;
     case 1:
-      lcd.print("Address: ");
+      lcd.print("Addr.: ");
 //      lcd.print(address);
     break;
     case 2:
@@ -160,7 +157,7 @@ void printOutput () {
       lcd.print(key);
     break;
     case 3:
-      lcd.print("Encryption: ");
+      lcd.print("Enc.: ");
       lcd.print(encryption? "yes" : "no");
    }
    

schematic.kicad_sch

@@ -723,42 +723,28 @@
     )
   )
 
-  (junction (at 120.65 116.84) (diameter 0) (color 0 0 0 0)
-    (uuid 00c67092-a19c-46a1-ab6d-647250fddcb1)
-  )
-  (junction (at 90.17 116.84) (diameter 0) (color 0 0 0 0)
+  (junction (at 96.52 116.84) (diameter 0) (color 0 0 0 0)
     (uuid 09094f4b-b8a3-49e6-bc90-654c6dbe4c03)
   )
-  (junction (at 82.55 116.84) (diameter 0) (color 0 0 0 0)
+  (junction (at 88.9 116.84) (diameter 0) (color 0 0 0 0)
     (uuid 22c69cd8-4d0e-4efe-b499-7b26372d169a)
   )
   (junction (at 22.86 115.57) (diameter 0) (color 0 0 0 0)
     (uuid 4f71bf5c-d117-4658-a5e5-4fb11eceb7e4)
   )
-  (junction (at 97.79 116.84) (diameter 0) (color 0 0 0 0)
+  (junction (at 104.14 116.84) (diameter 0) (color 0 0 0 0)
     (uuid 51950487-2c50-4e0c-8c60-0f95d6bd7231)
   )
-  (junction (at 113.03 116.84) (diameter 0) (color 0 0 0 0)
-    (uuid 75a323c1-ebe8-4891-bde0-7e610a530151)
-  )
   (junction (at 130.81 93.98) (diameter 0) (color 0 0 0 0)
     (uuid b63851b9-f800-40fa-aa1e-548ca128f76f)
   )
   (junction (at 22.86 100.33) (diameter 0) (color 0 0 0 0)
     (uuid c09a2011-6883-4896-8605-7aba94e348a1)
   )
-  (junction (at 105.41 116.84) (diameter 0) (color 0 0 0 0)
-    (uuid f517345f-7af4-45d3-b9c7-b8350ddca9de)
+  (junction (at 111.76 116.84) (diameter 0) (color 0 0 0 0)
+    (uuid ce1cc787-e2d0-4965-bd26-115ddd3ac506)
   )
 
-  (wire (pts (xy 113.03 124.46) (xy 113.03 152.4))
-    (stroke (width 0) (type default))
-    (uuid 0c0b4adf-cf4f-416d-ab6b-61875cf8f6b2)
-  )
-  (wire (pts (xy 114.3 151.13) (xy 115.57 152.4))
-    (stroke (width 0) (type default))
-    (uuid 0f0ad114-07b4-4217-b7d2-7f3281fb141b)
-  )
   (wire (pts (xy 72.39 35.56) (xy 72.39 137.16))
     (stroke (width 0) (type default))
     (uuid 11fbf330-d12b-4565-8ba0-036af95ba561)
@@ -787,15 +773,7 @@
     (stroke (width 0) (type default))
     (uuid 1d171d58-fd0b-4549-b9bd-36b39d40820c)
   )
-  (wire (pts (xy 180.34 128.27) (xy 140.97 167.64))
-    (stroke (width 0) (type default))
-    (uuid 227a0d7d-6d9d-4166-8f5d-7da88b34c378)
-  )
-  (wire (pts (xy 105.41 147.32) (xy 115.57 157.48))
-    (stroke (width 0) (type default))
-    (uuid 274b9d86-f8a5-4114-af39-24c479c6d210)
-  )
-  (wire (pts (xy 82.55 110.49) (xy 134.62 110.49))
+  (wire (pts (xy 88.9 110.49) (xy 134.62 110.49))
     (stroke (width 0) (type default))
     (uuid 29dc5f7c-6d54-4cc0-b529-c5d514ad3c54)
   )
@@ -803,26 +781,14 @@
     (stroke (width 0) (type default))
     (uuid 2a3c3bda-2383-4753-b698-7821af4103d0)
   )
-  (wire (pts (xy 120.65 124.46) (xy 120.65 137.16))
-    (stroke (width 0) (type default))
-    (uuid 2dbab647-e5d1-42b0-a9e7-ca6b1bd55faf)
-  )
-  (wire (pts (xy 90.17 137.16) (xy 115.57 162.56))
-    (stroke (width 0) (type default))
-    (uuid 2de49bf7-add7-4a4e-b6dd-164b73e5508f)
-  )
-  (wire (pts (xy 120.65 137.16) (xy 114.3 143.51))
-    (stroke (width 0) (type default))
-    (uuid 2f167a1e-8b4f-4524-94a5-73df47f93e82)
-  )
-  (wire (pts (xy 113.03 152.4) (xy 115.57 154.94))
-    (stroke (width 0) (type default))
-    (uuid 312080d1-ec92-4a57-804f-05b18d4dc864)
-  )
   (wire (pts (xy 166.37 137.16) (xy 140.97 162.56))
     (stroke (width 0) (type default))
     (uuid 374c3221-20c5-43ff-8a5f-b22efea5286b)
   )
+  (wire (pts (xy 36.83 110.49) (xy 68.58 110.49))
+    (stroke (width 0) (type default))
+    (uuid 374e9249-6120-477b-9d70-cf022293d66b)
+  )
   (wire (pts (xy 22.86 115.57) (xy 26.67 115.57))
     (stroke (width 0) (type default))
     (uuid 3a3d60c9-bfbd-4a16-b286-0235593420fb)
@@ -843,38 +809,62 @@
     (stroke (width 0) (type default))
     (uuid 4b6f2d86-cad4-4bb7-af36-8b977f5f3d57)
   )
-  (wire (pts (xy 97.79 124.46) (xy 97.79 142.24))
+  (wire (pts (xy 111.76 124.46) (xy 111.76 163.83))
     (stroke (width 0) (type default))
-    (uuid 548d3daa-26f8-47d8-9769-ecd7566d176c)
+    (uuid 528ede4a-3dae-4e2e-b393-7dbfdf0ce715)
+  )
+  (wire (pts (xy 55.88 95.25) (xy 115.57 154.94))
+    (stroke (width 0) (type default))
+    (uuid 54d7081a-e421-4cd4-8dbb-93c90f8dd317)
+  )
+  (wire (pts (xy 44.45 81.28) (xy 115.57 152.4))
+    (stroke (width 0) (type default))
+    (uuid 58863078-dba2-46c6-b825-c32b0206a3a1)
   )
   (wire (pts (xy 72.39 35.56) (xy 78.74 35.56))
     (stroke (width 0) (type default))
     (uuid 5901b297-dabb-4863-8d7e-a881c815bc06)
   )
+  (wire (pts (xy 96.52 124.46) (xy 96.52 143.51))
+    (stroke (width 0) (type default))
+    (uuid 5b13736c-a96b-45d5-b6dd-2c44fb533a8f)
+  )
+  (wire (pts (xy 104.14 124.46) (xy 104.14 153.67))
+    (stroke (width 0) (type default))
+    (uuid 5ec77762-96cc-40c6-b928-eebd1d0bebee)
+  )
   (wire (pts (xy 22.86 115.57) (xy 22.86 127))
     (stroke (width 0) (type default))
     (uuid 61ad43c1-bc92-45bb-a97d-06d64adca87f)
   )
+  (wire (pts (xy 115.57 160.02) (xy 88.9 133.35))
+    (stroke (width 0) (type default))
+    (uuid 623f6dad-f3f5-4a0e-a0f3-abf02e56baaf)
+  )
   (wire (pts (xy 76.2 45.72) (xy 78.74 45.72))
     (stroke (width 0) (type default))
     (uuid 638ffac9-8a19-428a-a010-9c8917d41834)
   )
-  (wire (pts (xy 36.83 81.28) (xy 176.53 81.28))
-    (stroke (width 0) (type default))
-    (uuid 63e69cd3-242d-4c88-8f0d-23a8183bfc41)
-  )
   (wire (pts (xy 91.44 25.4) (xy 120.65 25.4))
     (stroke (width 0) (type default))
     (uuid 69d9df0c-c579-4d0d-84c4-da663b0e9958)
   )
-  (wire (pts (xy 82.55 110.49) (xy 82.55 116.84))
+  (wire (pts (xy 88.9 110.49) (xy 88.9 116.84))
     (stroke (width 0) (type default))
     (uuid 6e4560c7-1067-4bfa-be98-37a72db7129d)
   )
+  (wire (pts (xy 36.83 81.28) (xy 44.45 81.28))
+    (stroke (width 0) (type default))
+    (uuid 71fe9a8a-e200-4235-acba-ae7166d6cbe5)
+  )
   (wire (pts (xy 73.66 33.02) (xy 78.74 33.02))
     (stroke (width 0) (type default))
     (uuid 7304858d-1548-4f72-8d9c-d09638f2cd35)
   )
+  (wire (pts (xy 111.76 163.83) (xy 115.57 167.64))
+    (stroke (width 0) (type default))
+    (uuid 7759d08c-f911-4b33-9904-9e80bb53b59c)
+  )
   (wire (pts (xy 76.2 130.81) (xy 115.57 170.18))
     (stroke (width 0) (type default))
     (uuid 79adc52a-9e51-4cd0-92bd-a0c7394d7545)
@@ -883,13 +873,9 @@
     (stroke (width 0) (type default))
     (uuid 7a0bc6e1-7758-4a81-93c4-12c62afdeb04)
   )
-  (wire (pts (xy 105.41 124.46) (xy 105.41 147.32))
+  (wire (pts (xy 115.57 165.1) (xy 104.14 153.67))
     (stroke (width 0) (type default))
-    (uuid 7ea0055e-dd37-45c3-b42d-6a47da17e786)
-  )
-  (wire (pts (xy 180.34 97.79) (xy 180.34 128.27))
-    (stroke (width 0) (type default))
-    (uuid 841b5c16-ca2d-48ba-89ed-4d42162f98fe)
+    (uuid 7f28f76e-0240-4532-b926-7f10ccab3615)
   )
   (wire (pts (xy 45.72 137.16) (xy 45.72 154.94))
     (stroke (width 0) (type default))
@@ -903,10 +889,6 @@
     (stroke (width 0) (type default))
     (uuid 8d3d0333-2cb0-4806-83ed-aca260f99aba)
   )
-  (wire (pts (xy 90.17 124.46) (xy 90.17 137.16))
-    (stroke (width 0) (type default))
-    (uuid 90166920-16b6-428e-a177-6947d7d340f7)
-  )
   (wire (pts (xy 22.86 100.33) (xy 22.86 115.57))
     (stroke (width 0) (type default))
     (uuid 91241caf-271e-4954-846b-c9be4f198171)
@@ -915,14 +897,6 @@
     (stroke (width 0) (type default))
     (uuid 91faf3f9-c4eb-4f06-9865-b75c07710096)
   )
-  (wire (pts (xy 114.3 143.51) (xy 114.3 151.13))
-    (stroke (width 0) (type default))
-    (uuid 97c590af-3368-4369-b102-86a66d8bc41a)
-  )
-  (wire (pts (xy 177.8 95.25) (xy 180.34 97.79))
-    (stroke (width 0) (type default))
-    (uuid 999fb3be-b6c7-467e-8849-58dd37f815ac)
-  )
   (wire (pts (xy 71.12 38.1) (xy 78.74 38.1))
     (stroke (width 0) (type default))
     (uuid a2688f84-f300-40e3-91f1-7a1f23b2f35c)
@@ -931,33 +905,17 @@
     (stroke (width 0) (type default))
     (uuid a28f9942-6126-4d87-9df1-0810d13b9ea6)
   )
-  (wire (pts (xy 176.53 129.54) (xy 140.97 165.1))
-    (stroke (width 0) (type default))
-    (uuid a4496c04-5ebc-4aab-ab55-582d059d0ac1)
-  )
-  (wire (pts (xy 82.55 124.46) (xy 82.55 132.08))
-    (stroke (width 0) (type default))
-    (uuid a6bdabea-a199-4f27-953f-5134b8b990bc)
-  )
-  (wire (pts (xy 85.09 104.14) (xy 158.75 104.14))
-    (stroke (width 0) (type default))
-    (uuid ab37f37b-ce97-4c54-a00f-bcaf6a43a4db)
-  )
   (wire (pts (xy 72.39 137.16) (xy 115.57 177.8))
     (stroke (width 0) (type default))
     (uuid ab51b7b6-42d9-4507-a385-0ba5290cc246)
   )
-  (wire (pts (xy 182.88 128.27) (xy 140.97 170.18))
-    (stroke (width 0) (type default))
-    (uuid ac6f6a39-4804-47ca-9043-abb2ff6168f8)
-  )
   (wire (pts (xy 22.86 100.33) (xy 26.67 100.33))
     (stroke (width 0) (type default))
     (uuid b29f1314-48ee-4434-94d1-e9440d68c995)
   )
-  (wire (pts (xy 97.79 142.24) (xy 115.57 160.02))
+  (wire (pts (xy 36.83 95.25) (xy 55.88 95.25))
     (stroke (width 0) (type default))
-    (uuid b63f65ce-d988-46e4-8c63-502d9689b0d3)
+    (uuid b3340520-ef5c-4982-8be8-de09be35902c)
   )
   (wire (pts (xy 71.12 38.1) (xy 71.12 138.43))
     (stroke (width 0) (type default))
@@ -971,21 +929,13 @@
     (stroke (width 0) (type default))
     (uuid c0582b41-dab3-4018-9374-c5de19a4778c)
   )
-  (wire (pts (xy 176.53 81.28) (xy 176.53 129.54))
-    (stroke (width 0) (type default))
-    (uuid c1c6ae11-fbf5-4668-ada5-90240e02dfe6)
-  )
   (wire (pts (xy 156.21 88.9) (xy 166.37 99.06))
     (stroke (width 0) (type default))
     (uuid c5a1ce86-2784-445c-8c42-633ad1f91e8e)
   )
-  (wire (pts (xy 82.55 132.08) (xy 115.57 165.1))
+  (wire (pts (xy 68.58 110.49) (xy 115.57 157.48))
     (stroke (width 0) (type default))
-    (uuid c5ff8bc3-7216-47d4-bb49-aad206cc6265)
-  )
-  (wire (pts (xy 158.75 104.14) (xy 182.88 128.27))
-    (stroke (width 0) (type default))
-    (uuid de5ff0ec-daff-4a3f-a250-156eff87ef58)
+    (uuid cca88b31-43cd-43f0-99eb-01fc91988bb8)
   )
   (wire (pts (xy 26.67 86.36) (xy 24.13 86.36))
     (stroke (width 0) (type default))
@@ -995,6 +945,10 @@
     (stroke (width 0) (type default))
     (uuid e54063c0-5664-4431-8e65-587727640752)
   )
+  (wire (pts (xy 115.57 162.56) (xy 96.52 143.51))
+    (stroke (width 0) (type default))
+    (uuid e79afa97-98b6-49e3-8f16-63954086e544)
+  )
   (wire (pts (xy 157.48 156.21) (xy 140.97 172.72))
     (stroke (width 0) (type default))
     (uuid e892b457-87ce-4a97-815b-eb7542531c0b)
@@ -1003,22 +957,14 @@
     (stroke (width 0) (type default))
     (uuid eb5e5d72-a54b-4986-9854-8a53bf95015f)
   )
-  (wire (pts (xy 78.74 110.49) (xy 85.09 104.14))
+  (wire (pts (xy 88.9 124.46) (xy 88.9 133.35))
     (stroke (width 0) (type default))
-    (uuid f41911a2-7b40-4bd9-aa10-4b01485eda1b)
+    (uuid f30b3422-566a-45b3-baea-ecd9f841153d)
   )
   (wire (pts (xy 190.5 26.67) (xy 190.5 80.01))
     (stroke (width 0) (type default))
     (uuid f4ce7748-8de9-4c65-b160-bd1987344fb7)
   )
-  (wire (pts (xy 36.83 110.49) (xy 78.74 110.49))
-    (stroke (width 0) (type default))
-    (uuid f99fb837-0b23-4705-a267-30083374722c)
-  )
-  (wire (pts (xy 36.83 95.25) (xy 177.8 95.25))
-    (stroke (width 0) (type default))
-    (uuid fa5b7902-dd8a-4df6-b4be-694b571ea78b)
-  )
   (wire (pts (xy 74.93 40.64) (xy 78.74 40.64))
     (stroke (width 0) (type default))
     (uuid fb66a00e-342e-44a0-866b-599f15ebb57a)
@@ -1065,19 +1011,19 @@
     (uuid fff39266-846b-493c-840a-dd60a8ed84d9)
   )
 
-  (symbol (lib_id "Device:R") (at 97.79 120.65 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 104.14 120.65 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 04004a27-d457-48cb-95c5-a65a579a4598)
-    (property "Reference" "R3" (at 96.566 119.616 0)
+    (property "Reference" "R3" (at 102.916 119.616 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "2R" (at 96.52 121.92 0)
+    (property "Value" "2R" (at 102.87 121.92 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (at 96.012 120.65 90)
+    (property "Footprint" "" (at 102.362 120.65 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 97.79 120.65 0)
+    (property "Datasheet" "~" (at 104.14 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9000998e-ce0c-41bd-905a-9ffad282f456))
@@ -1135,32 +1081,6 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 116.84 116.84 90) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 17b5a76f-5a59-433a-ae07-89d961ad4334)
-    (property "Reference" "R11" (at 116.84 111.76 90)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "R" (at 116.84 114.3 90)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 116.84 118.618 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 116.84 116.84 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 15db86e4-4129-4acc-9f8f-ec26ff2e6a93))
-    (pin "2" (uuid 3db3d7e8-a61b-4826-890d-d4e5ac5e78f0))
-    (instances
-      (project "schematic"
-        (path "/e61cadf2-d4a8-4a80-a850-59bde3b9a069"
-          (reference "R11") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "RF:NRF24L01_Breakout") (at 91.44 40.64 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 31aac55f-79ba-429a-a508-c0f0a0172f15)
@@ -1221,19 +1141,19 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 93.98 116.84 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 100.33 116.84 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 3bef8fb9-547d-411a-a313-5844a9560084)
-    (property "Reference" "R6" (at 93.98 111.76 90)
+    (property "Reference" "R6" (at 100.33 111.76 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "R" (at 93.98 114.3 90)
+    (property "Value" "R" (at 100.33 114.3 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 93.98 118.618 90)
+    (property "Footprint" "" (at 100.33 118.618 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 93.98 116.84 0)
+    (property "Datasheet" "~" (at 100.33 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 83db4849-05a8-4d72-82e4-620c7113ae6c))
@@ -1298,19 +1218,19 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 86.36 116.84 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 92.71 116.84 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 5137cfda-996c-42b0-80ef-5edaefe551ca)
-    (property "Reference" "R5" (at 86.36 111.76 90)
+    (property "Reference" "R5" (at 92.71 111.76 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "R" (at 86.36 114.3 90)
+    (property "Value" "R" (at 92.71 114.3 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 86.36 118.618 90)
+    (property "Footprint" "" (at 92.71 118.618 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 86.36 116.84 0)
+    (property "Datasheet" "~" (at 92.71 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 9d1f81d3-2dcc-4954-b22f-8f7697ce5e8b))
@@ -1378,19 +1298,19 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 82.55 120.65 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 88.9 120.65 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid 7468fe08-ba56-4654-8a87-8624580069f2)
-    (property "Reference" "R1" (at 81.2682 119.639 0)
+    (property "Reference" "R1" (at 87.6182 119.639 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "2R" (at 81.28 121.92 0)
+    (property "Value" "2R" (at 87.63 121.92 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (at 80.772 120.65 90)
+    (property "Footprint" "" (at 87.122 120.65 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 82.55 120.65 0)
+    (property "Datasheet" "~" (at 88.9 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 8eda17d8-782b-403e-96b6-211d5babd98c))
@@ -1404,32 +1324,6 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 109.22 116.84 90) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
-    (uuid 770fe6e4-322f-4972-9c8c-2a4eacac87b1)
-    (property "Reference" "R9" (at 109.22 111.76 90)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Value" "R" (at 109.22 114.3 90)
-      (effects (font (size 1.27 1.27)))
-    )
-    (property "Footprint" "" (at 109.22 118.618 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 109.22 116.84 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid 148fccb2-07dc-4f15-a6be-e62299444aeb))
-    (pin "2" (uuid 8829425b-2729-483b-9691-de5c53ebabf1))
-    (instances
-      (project "schematic"
-        (path "/e61cadf2-d4a8-4a80-a850-59bde3b9a069"
-          (reference "R9") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "power:Earth") (at 128.27 187.96 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 8aed041c-e397-4ed0-beb8-bdd2b5155456)
@@ -1455,32 +1349,6 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 120.65 120.65 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid 8fe49651-e987-43b5-a4da-d08f8220df1c)
-    (property "Reference" "R12" (at 119.4434 119.639 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "2R" (at 119.38 121.92 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (at 118.872 120.65 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 120.65 120.65 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid e3285143-6bc4-4995-b632-9644c852e20f))
-    (pin "2" (uuid ab3931ae-2376-414e-a4af-d6f7c46bde4e))
-    (instances
-      (project "schematic"
-        (path "/e61cadf2-d4a8-4a80-a850-59bde3b9a069"
-          (reference "R12") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "power:Earth") (at 130.81 187.96 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid 9dadf429-ca41-4d45-8f2f-6bb67f81788b)
@@ -1531,19 +1399,19 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 124.46 116.84 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 115.57 116.84 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid a8a89343-bbfa-4031-b997-dca77d86e7df)
-    (property "Reference" "R8" (at 123.449 118.0466 0)
+    (property "Reference" "R8" (at 114.559 118.0466 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "2R" (at 125.73 118.11 0)
+    (property "Value" "2R" (at 116.84 118.11 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (at 124.46 118.618 90)
+    (property "Footprint" "" (at 115.57 118.618 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 124.46 116.84 0)
+    (property "Datasheet" "~" (at 115.57 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e4885ddc-cf36-4a9b-9cdf-9749038c6209))
@@ -1689,19 +1557,19 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 101.6 116.84 90) (unit 1)
+  (symbol (lib_id "Device:R") (at 107.95 116.84 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid c671ee42-3de5-42c8-abce-cc168b5a910f)
-    (property "Reference" "R7" (at 101.6 111.76 90)
+    (property "Reference" "R7" (at 107.95 111.76 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Value" "R" (at 101.6 114.3 90)
+    (property "Value" "R" (at 107.95 114.3 90)
       (effects (font (size 1.27 1.27)))
     )
-    (property "Footprint" "" (at 101.6 118.618 90)
+    (property "Footprint" "" (at 107.95 118.618 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 101.6 116.84 0)
+    (property "Datasheet" "~" (at 107.95 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 7bda5489-bc29-4781-81c3-8bdc9fc5def6))
@@ -1715,32 +1583,6 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 113.03 120.65 0) (unit 1)
-    (in_bom yes) (on_board yes) (dnp no)
-    (uuid d2cf8269-1674-498d-a75c-46c49d711707)
-    (property "Reference" "R10" (at 111.8234 119.639 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Value" "2R" (at 111.76 121.92 0)
-      (effects (font (size 1.27 1.27)) (justify left))
-    )
-    (property "Footprint" "" (at 111.252 120.65 90)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (property "Datasheet" "~" (at 113.03 120.65 0)
-      (effects (font (size 1.27 1.27)) hide)
-    )
-    (pin "1" (uuid f6bd7575-b887-4cd5-9b6f-851b682937cd))
-    (pin "2" (uuid e4262cc6-5ddf-4216-83c2-d5c34034dac3))
-    (instances
-      (project "schematic"
-        (path "/e61cadf2-d4a8-4a80-a850-59bde3b9a069"
-          (reference "R10") (unit 1)
-        )
-      )
-    )
-  )
-
   (symbol (lib_id "power:Earth") (at 134.62 113.03 270) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid dfdab103-9ab3-435d-a988-83c326ec3c4e)
@@ -1766,19 +1608,19 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 105.41 120.65 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 111.76 120.65 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid e859c788-9f81-4dea-a6f8-333b1aff5531)
-    (property "Reference" "R4" (at 104.2034 119.639 0)
+    (property "Reference" "R4" (at 110.5534 119.639 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "2R" (at 104.14 121.92 0)
+    (property "Value" "2R" (at 110.49 121.92 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (at 103.632 120.65 90)
+    (property "Footprint" "" (at 109.982 120.65 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 105.41 120.65 0)
+    (property "Datasheet" "~" (at 111.76 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid 582ad77f-9ea1-4394-926f-0d7d12fe3519))
@@ -1817,19 +1659,19 @@
     )
   )
 
-  (symbol (lib_id "Device:R") (at 90.17 120.65 0) (unit 1)
+  (symbol (lib_id "Device:R") (at 96.52 120.65 0) (unit 1)
     (in_bom yes) (on_board yes) (dnp no)
     (uuid eb0aaabc-3500-4b44-a8f5-72559568a094)
-    (property "Reference" "R2" (at 88.9517 119.6621 0)
+    (property "Reference" "R2" (at 95.3017 119.6621 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Value" "2R" (at 88.9 121.92 0)
+    (property "Value" "2R" (at 95.25 121.92 0)
       (effects (font (size 1.27 1.27)) (justify left))
     )
-    (property "Footprint" "" (at 88.392 120.65 90)
+    (property "Footprint" "" (at 94.742 120.65 90)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 90.17 120.65 0)
+    (property "Datasheet" "~" (at 96.52 120.65 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid e12d1f12-0abb-4179-9950-12a038ff2781))
@@ -1858,12 +1700,12 @@
     (property "Datasheet" "" (at 34.29 158.75 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc426))
-    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc426))
-    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc426))
-    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc426))
-    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc426))
-    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc426))
+    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc421))
+    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc421))
+    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc421))
+    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc421))
+    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc421))
+    (pin "" (uuid 45e3da0a-62d0-4b71-8067-9d6294ccc421))
     (instances
       (project "schematic"
         (path "/e61cadf2-d4a8-4a80-a850-59bde3b9a069"
@@ -1873,19 +1715,19 @@
     )
   )
 
-  (symbol (lib_id "power:Earth") (at 128.27 116.84 90) (unit 1)
+  (symbol (lib_id "power:Earth") (at 119.38 116.84 90) (unit 1)
     (in_bom yes) (on_board yes) (dnp no) (fields_autoplaced)
     (uuid ec19f6be-8c6b-468c-9b17-1bf56e100a6e)
-    (property "Reference" "#PWR07" (at 134.62 116.84 0)
+    (property "Reference" "#PWR07" (at 125.73 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Value" "Earth" (at 132.08 116.84 0)
+    (property "Value" "Earth" (at 123.19 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Footprint" "" (at 128.27 116.84 0)
+    (property "Footprint" "" (at 119.38 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
-    (property "Datasheet" "~" (at 128.27 116.84 0)
+    (property "Datasheet" "~" (at 119.38 116.84 0)
       (effects (font (size 1.27 1.27)) hide)
     )
     (pin "1" (uuid ddd0526a-638f-4200-95d4-c8b38731c134))