diff --git a/client/client_central_mast/platformio.ini b/client/client_central_mast/platformio.ini index ff8b091e2261a5a43c777684f8b151b67f11f345..0f778714c620418858a06af712025c04d4221c05 100644 --- a/client/client_central_mast/platformio.ini +++ b/client/client_central_mast/platformio.ini @@ -26,17 +26,14 @@ build_unflags = -std=gnu++11 monitor_port = /dev/ttyUSB0 upload_port = /dev/ttyUSB0 lib_deps = - sparkfun/SparkFun SCD30 Arduino Library@^1.0.18 Wire adafruit/Adafruit ADS1X15@^2.4.0 wollewald/INA219_WE@^1.3.1 adafruit/Adafruit BusIO@^1.13.2 Adafruit_I2CDevice SPI - envirodiy/SDI-12@^2.1.4 fbiego/ESP32Time@^2.0.0 bblanchon/ArduinoJson@^6.19.4 - plerup/EspSoftwareSerial@6.16.1 4-20ma/ModbusMaster@^2.0.1 adafruit/RTClib@^2.1.1 sensirion/arduino-sht@^1.2.2 diff --git a/client/client_central_mast/src/main.cpp b/client/client_central_mast/src/main.cpp index 22392e6335b86634baa4215c3e924413699bf52f..fa355b99b8c85cee9f0b4107428e124fc79a5264 100644 --- a/client/client_central_mast/src/main.cpp +++ b/client/client_central_mast/src/main.cpp @@ -1,42 +1,83 @@ #include "Arduino.h" #include "ESPNow.hpp" -#include "rs485.hpp" #include "NoDataAvailableException.hpp" +#include "rs485.hpp" -#define uS_TO_S_FACTOR 1000000 /* Conversion factor for micro seconds to seconds */ -#define TIME_TO_SLEEP 60 /* Time ESP32 will go to sleep (in seconds) */ +static const char *TAG = "MAIN"; +#define uS_TO_S_FACTOR 1000000 /* Conversion factor for micro seconds to seconds */ +#define TIME_TO_SLEEP 5 * 60 /* Time ESP32 will go to sleep (in seconds) */ Forte_RS485 rs485; -void setup() +float getBatteryVoltage() { - rs485.setup(); - espnow_setup(); + //************ Measuring Battery Voltage *********** + // reference voltage of microcontroller 3.3v for esp32 + const float reference_vcc = 3.3; + // value of R2 resistor [kOhm] + const float bat_res_gnd = 20; + // value of R1 resistor [kOhm] + const float bat_res_vcc = 68; + // max ADC value + const int adc = 4095; + float sample = 0; + // Get 100 analog read to prevent unusefully read + for (int i = 0; i < 100; i++) { + sample = sample + analogRead(35); // read the voltage from the divider circuit + delay(2); + } + sample = sample / 100; + float battery_voltage = (sample / 4095 * reference_vcc * (bat_res_vcc + bat_res_gnd) / bat_res_gnd); + ESP_LOGI(TAG, "Battery Voltage: %4.2f V", battery_voltage); + ESP_LOGD(TAG, "ADC mean Value: %4.2f", sample); + return battery_voltage; } -void loop() { - try { +// FIXME: put this in ESPNow.hpp and let stupid Markus Rampp know how you did it. After years of Python he moved past +// the idea of types and declarations +void send_msgs(const std::__cxx11::list<Message> msgs) +{ + for (const Message &msg : msgs) { - auto messages = rs485.buildMessages(); - - for (const Message &message : messages) { - if(message.send() != ESP_OK){ - RtcMemory::store(message.getMessageAsMinifiedJsonString()); - } - delay(5000); - if(!was_msg_received()){ - RtcMemory::store(message.getMessageAsMinifiedJsonString()); + if (msg.send() != ESP_OK) { + RtcMemory::store(msg.getMessageAsMinifiedJsonString()); + } + unsigned long ts = millis(); + // it takes ~110ms for receiving an acknowledgement by the host in perfect conditions + uint16_t message_timeout = 2000; + while (!was_msg_received()) { + if ((millis() - ts) > message_timeout) { + RtcMemory::store(msg.getMessageAsMinifiedJsonString()); + ESP_LOGE(TAG, "Timeout: Host not available\n"); + break; } } + ESP_LOGD(TAG, "Time until acknowledgement: %ld", millis() - ts); + } +} +void setup() +{ + // whole loop should be around ~3000 ms + Serial.begin(115200); + rs485.setup(); + + getBatteryVoltage(); + + // ~2100ms + try { + auto messages = rs485.buildMessages(); + espnow_setup(); + send_msgs(messages); } catch (const NoDataAvailableException &e) { std::cerr << e.what() << '\n'; } - - Serial.print("Going to sleep for secounds:"); - Serial.println(TIME_TO_SLEEP); - esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR); - esp_deep_sleep_start(); + ESP_LOGD(TAG, "Going to sleep for %d seconds", TIME_TO_SLEEP); + + esp_sleep_enable_timer_wakeup(TIME_TO_SLEEP * uS_TO_S_FACTOR); + esp_deep_sleep_start(); } + +void loop() {} diff --git a/client/client_satellite/src/main.cpp b/client/client_satellite/src/main.cpp index 0122838ed7cea818714d844cfe956227f8d01a9c..35ab65e7e8844c923cde3bb554770cc0e4d39f47 100644 --- a/client/client_satellite/src/main.cpp +++ b/client/client_satellite/src/main.cpp @@ -6,14 +6,20 @@ #include <Arduino.h> // Execution time: -// FIXME: Boot: needs to be measured with oscilloscope and optimised. should be around a few hundres ms, can be <100ms +// FIXME: Boot: needs to be optimised. should be around 300 ms, can be <100ms // https://github.com/makermoekoe/Picoclick-C3#speed-up-boot-process // Part [ms] +// Boot: 300 // First setup: 150 -// Data aquisition: 500 +// Data aquisition: 500 (4 Dendrometers) // ESPNow setup: 220 -// Sending 1200 -// TOTAL: 2200 +// Sending 580 +// TOTAL: 1450 + +// Measurement Summary, 2 Dendrometers connected, measuring 4 Dendrometers: +// Duration: 1.74 [s] +// Current consumption: 141.09 [mA*s] +// Average current: 81.16 [mA] static const char *TAG = "MAIN"; @@ -61,6 +67,11 @@ void setup() DeepSleep::print_wakeup_reason(); DeepSleep::bootCount++; ESP_LOGD(TAG, "Boot number: %d", DeepSleep::bootCount); + // battery protection: go to deep sleep for unlimited time when voltage less than 3.2V + if (battery_monitor.cellVoltage_mV() < 3200) { + battery_monitor.setPowerMode(LC709203F_POWER_SLEEP); + esp_deep_sleep_start(); + } gpio_set_level(GPIO_NUM_32, 1); // delay(100); diff --git a/client/libs/SentecSensors/SentecSensors.cpp b/client/libs/SentecSensors/SentecSensors.cpp index 8a2c47010ac191f56cfd5515bb5ac91ca546ba86..91c60c148c88cdaa612857e426ef9d611e8ebcc0 100644 --- a/client/libs/SentecSensors/SentecSensors.cpp +++ b/client/libs/SentecSensors/SentecSensors.cpp @@ -1,14 +1,15 @@ +#include "NoDataAvailableException.hpp" #include <SentecSensors.h> /*************************************** * RS485 SENSOR READOUT ****************************************/ - -SentecSensorRS485::SentecSensorRS485(SoftwareSerial *ser, byte add) +static const char *TAG = "SENTEC"; +SentecSensorRS485::SentecSensorRS485(HardwareSerial *ser, byte add) { address = add; RS485 = ser; } -SentecSensorRS485::SentecSensorRS485(SoftwareSerial *ser, byte add, uint8_t serialControlPin) +SentecSensorRS485::SentecSensorRS485(HardwareSerial *ser, byte add, uint8_t serialControlPin) { address = add; RS485 = ser; @@ -46,22 +47,23 @@ String SentecSensorRS485::getValueStr(int value) } } -void SentecSensorRS485::queryAddress() +SentecSensorRS485::ReturnCode SentecSensorRS485::queryAddress() { // request the address of the sensor with ONLY ONE SENSOR ON THE BUS byte tmp_addr = address; // store the address in a temporary byte address = 0xFF; // change the address to FF (0) for address check - readRegister(word(0x07, 0xD0), 2); + SentecSensorRS485::ReturnCode tmp = readRegister(word(0x07, 0xD0), 2); address = tmp_addr; // set the original address back + return tmp; } -void SentecSensorRS485::readRegister(int registerStartAddress) +SentecSensorRS485::ReturnCode SentecSensorRS485::readRegister(int registerStartAddress) { - readRegister(registerStartAddress, 1); + return readRegister(registerStartAddress, 1); } -void SentecSensorRS485::readRegister(int registerStartAddress, int registerLength) +SentecSensorRS485::ReturnCode SentecSensorRS485::readRegister(int registerStartAddress, int registerLength) { // function code 0x03: get data measured by the sensor byte query[8]; @@ -81,10 +83,10 @@ void SentecSensorRS485::readRegister(int registerStartAddress, int registerLengt // write the data request to the modbus line write(query, sizeof(query)); // get response from sensor - getResponse(); + return getResponse(); } -void SentecSensorRS485::writeRegister(int registerAddress, int value) +SentecSensorRS485::ReturnCode SentecSensorRS485::writeRegister(int registerAddress, int value) { // function code 0x06: change sensor settings // e.g. a new address, reset rainfal data... @@ -100,18 +102,20 @@ void SentecSensorRS485::writeRegister(int registerAddress, int value) query[4] = value >> 8; query[5] = value & 0xFF; calculateCRC(query, sizeof(query) - 2); - Serial.print("Query (settings): "); + ESP_LOGD(TAG, "Query (settings): "); printBytes(query, 8); write(query, sizeof(query)); - getResponse(); + return getResponse(); } -void SentecSensorRS485::setAddress(byte add) +SentecSensorRS485::ReturnCode SentecSensorRS485::setAddress(byte add) { // change the address of a sensor - writeRegister(word(0x07, 0xD0), add); + SentecSensorRS485::ReturnCode tmp = writeRegister(word(0x07, 0xD0), add); + if (tmp == SentecSensorRS485::ReturnCode::OK) + address = add; // TODO check response: matches the sent message exactly - address = add; + return tmp; } void SentecSensorRS485::resetAnswerFrame() @@ -121,9 +125,10 @@ void SentecSensorRS485::resetAnswerFrame() } } -bool SentecSensorRS485::getResponse() +SentecSensorRS485::ReturnCode SentecSensorRS485::getResponse() { // reads the response of a sensor + SentecSensorRS485::ReturnCode returnCode = SentecSensorRS485::ReturnCode::OK; valid = true; int idx = 0; int byteReceived; @@ -134,7 +139,7 @@ bool SentecSensorRS485::getResponse() const int timeout = 200; const int retries = 1; // #editet to q size_t tries = 1; - + // it doesn't seem to help to request multiple times if first time goes wrong for (tries; tries <= retries; tries++) { // if we lose connection with the sensor, we get an array of zeros back resetAnswerFrame(); @@ -146,50 +151,48 @@ bool SentecSensorRS485::getResponse() // Serial.println(byteReceived, HEX); // check for first byte. It has to be the device address unless for broadcasts with address = 0xFF if (idx == 0 && address != 0xFF && byteReceived != address) { - Serial.print("Invalid byte. First byte needs to be address 0x"); - Serial.print(address, HEX); - Serial.print(" but got 0x"); - Serial.print(byteReceived, HEX); - Serial.println("instead"); + ESP_LOGE(TAG, "Invalid byte. First byte needs to be address 0x%02X but got 0x%02Xinstead"); } else { answerFrame[idx] = byteReceived; // for reading register: third received byte is data length, read number of bytes accordingly if (idx == 2 && answerFrame[1] == 0x03) { - // 5 bytes for address, function, data length, CRC_H, CRC_L + // 5 bytes for address, function code, data length, CRC_H, CRC_L responseLength = 5 + byteReceived; } idx++; } } } - - delay(10); - Serial.print("Response: 0x"); - printBytes(answerFrame, responseLength); - Serial.print("Tries: "); - Serial.println(tries); - Serial.print("Bytes received: "); - Serial.println(idx); + ESP_LOGD(TAG, "-----------------------------------------------------------------------------------------"); + ESP_LOGD(TAG, "Response: 0x%s", formatBytes(answerFrame, responseLength).c_str()); + // ESP_LOGD(TAG, "Tries: %d", tries); + // ESP_LOGD(TAG, "Bytes received: %d", idx); + if (answerFrame[0] == 0) { + ESP_LOGE(TAG, "Check sensor connection. First byte is 0x00."); + valid = false; + returnCode = SentecSensorRS485::ReturnCode::NO_CONNECTION; + } else if (idx < responseLength) { + ESP_LOGE(TAG, "Response too short: %d bytes < %d bytes. Unfinished transmission.", idx, responseLength); + valid = false; + returnCode = SentecSensorRS485::ReturnCode::SHORT_RESPONSE; + } word crc_received = word(answerFrame[responseLength - 2], answerFrame[responseLength - 1]); word crc = calculateCRC(answerFrame, responseLength - 2); - if (crc_received != word(crc)) { - Serial.print("CRC wrong: Expected "); - printBytes(crc); - Serial.print(" got "); - printBytes(crc_received); - Serial.println(); + if (valid && crc_received != word(crc)) { + ESP_LOGE(TAG, "CRC wrong: Expected 0x%s got 0x%s", formatBytes(crc).c_str(), + formatBytes(crc_received).c_str()); valid = false; resetAnswerFrame(); + returnCode = SentecSensorRS485::ReturnCode::WRONG_CRC; } - - if (answerFrame[0] == 0) { - valid = false; - } - if (valid) { + // breaking after first successfull try + if (returnCode == SentecSensorRS485::ReturnCode::OK) { break; } } - return valid; + + // ESP_LOGE(TAG, "Returncode: %d", returnCode); + return returnCode; } unsigned int SentecSensorRS485::calculateCRC(byte query[], int length) @@ -241,13 +244,31 @@ void SentecSensorRS485::printBytes(word data) Serial.print(tmp); } +std::string SentecSensorRS485::formatBytes(byte *data, int length) +{ + // pls don't hate me for building strings like that. + // I also wish that I would be good at programming + std::string tmp; + // prints 8-bit data in hex with leading zeroes + char buff[4]; + for (int i = 0; i < length; i++) { + snprintf(buff, sizeof(buff), "%02X ", data[i]); + tmp += buff; + } + return tmp; +} + +std::string SentecSensorRS485::formatBytes(word data) +{ + byte arr[2] = {data >> 8, data & 0xFF}; + return formatBytes(arr, 2); +} + word SolarRadiationSensor::getSolarRadiation() { readRegister(0, 1); glob = word(answerFrame[3], answerFrame[4]); - Serial.print("Global solar radiation: "); - Serial.print(glob, DEC); - Serial.println(" W/m^2"); + ESP_LOGI(TAG, "Global solar radiation: %d W/m^2", glob); return glob; } @@ -282,9 +303,8 @@ word RainGaugeSensor::getInstantaneousPrecipitation() // manual says this is current precipitation - is it? readRegister(0, 0x01); precipitation = word(answerFrame[3], answerFrame[4]); - Serial.print("Precipitation: "); - Serial.print(precipitation / 10.0, 1); - Serial.println(" mm"); + + ESP_LOGI(TAG, "Precipitation: %.1f mm", precipitation / 10.0); // resetPrecipitation(); return precipitation; } @@ -304,13 +324,8 @@ float SoilMoistureSensor::getMoistureTemp() } else { temperatureRaw = (answerFrame[5] << 8) + answerFrame[6] - 65536; } - Serial.begin(115200); - Serial.print("Soil moisture: "); - Serial.print((moistureRaw - moistureOffset) / 10.0, 1); - Serial.println(" %"); - Serial.print("Temperature: "); - Serial.print((temperatureRaw - temperatureOffset) / 10.0, 1); - Serial.println(" °C"); + ESP_LOGI(TAG, "Soil moisture: %.1f %", (moistureRaw - moistureOffset) / 10.0); + ESP_LOGI(TAG, "Soil temperature: %.1f °C", (temperatureRaw - temperatureOffset) / 10.0); return (temperatureRaw - temperatureOffset) / 10.0; } diff --git a/client/libs/SentecSensors/SentecSensors.h b/client/libs/SentecSensors/SentecSensors.h index 7785ca2c1b90c08e0c0cf62764a18db546929374..336011134eb736a5265f5aa2b0ae86919b41d1c0 100644 --- a/client/libs/SentecSensors/SentecSensors.h +++ b/client/libs/SentecSensors/SentecSensors.h @@ -2,32 +2,41 @@ #define SENTECSENSORS_H #include <Arduino.h> -#include <SoftwareSerial.h> class SentecSensorRS485 { public: byte address; uint8_t serialCommunicationControlPin = 19; - SoftwareSerial *RS485; + HardwareSerial *RS485; byte answerFrame[10]; // TODO use valid flag to log None bool valid = false; - SentecSensorRS485(SoftwareSerial *ser, byte add); - SentecSensorRS485(SoftwareSerial *ser, byte add, uint8_t serialControlPin); + SentecSensorRS485(HardwareSerial *ser, byte add); + SentecSensorRS485(HardwareSerial *ser, byte add, uint8_t serialControlPin); + + enum class ReturnCode { + OK, + NO_CONNECTION, + SHORT_RESPONSE, // connection ended prematurely + WRONG_CRC // corrupted data package + }; void write(byte queryFrame[], int length); String getValueStr(float value); String getValueStr(int value); - void queryAddress(); - void readRegister(int registerStartAddress); - void readRegister(int registerStartAddress, int registerLength); - void writeRegister(int registerAddress, int value); - void setAddress(byte add); + SentecSensorRS485::ReturnCode queryAddress(); + SentecSensorRS485::ReturnCode readRegister(int registerStartAddress); + SentecSensorRS485::ReturnCode readRegister(int registerStartAddress, int registerLength); + SentecSensorRS485::ReturnCode writeRegister(int registerAddress, int value); + SentecSensorRS485::ReturnCode setAddress(byte add); void resetAnswerFrame(); - bool getResponse(); + SentecSensorRS485::ReturnCode getResponse(); unsigned int calculateCRC(byte query[], int length); void printBytes(byte *data, int length); void printBytes(word data); + std::string formatBytes(byte *data, int length); + std::string formatBytes(word data); + }; class SolarRadiationSensor : public SentecSensorRS485 { diff --git a/client/libs/rs485/rs485.cpp b/client/libs/rs485/rs485.cpp index e69a251121ae3a7884d314ed85d77fab2c3b4521..269c7f37a0c6cb685adda7dc599edbea185d5f8e 100644 --- a/client/libs/rs485/rs485.cpp +++ b/client/libs/rs485/rs485.cpp @@ -1,5 +1,6 @@ #include "rs485.hpp" // RS485 control +#define RS485Serial Serial2 #define RXPin 14 // Serial Receive pin #define TXPin 15 // Serial Transmit pin @@ -8,8 +9,9 @@ #define POWER_SWITCH_PIN_12V 12 #define POWER_SWITCH_PIN_5V 13 +static const char *TAG = "RS485"; + // Configure sensors -SoftwareSerial RS485Serial(TXPin, RXPin); SolarRadiationSensor solarSensor(&RS485Serial, 1, RE_DE_PIN); RainGaugeSensor rainGauge = RainGaugeSensor(&RS485Serial, 2, RE_DE_PIN); // Give 2 Sensor Adress 2 SoilMoistureSensor soilSensor3 = SoilMoistureSensor(&RS485Serial, 3, RE_DE_PIN); //..... @@ -22,9 +24,7 @@ void Forte_RS485::setup() pinMode(RE_DE_PIN, OUTPUT); pinMode(POWER_SWITCH_PIN_12V, OUTPUT); pinMode(POWER_SWITCH_PIN_5V, OUTPUT); - // Set data rates: Serial baud rate has to be WAY HIGHER than RS485Serial! - Serial.begin(115200); - RS485Serial.begin(4800); + RS485Serial.begin(4800, SERIAL_8N1, TXPin, RXPin); } out_data_rs485 Forte_RS485::readData() @@ -34,8 +34,9 @@ out_data_rs485 Forte_RS485::readData() digitalWrite(POWER_SWITCH_PIN_5V, HIGH); // Wait for sensors to power up // TODO minimize delay - delay(500); + delay(300); out_data_rs485 output; + unsigned long ts = millis(); output.solarRadiation = solarSensor.getSolarRadiation(); output.soilTemperature3 = soilSensor3.getMoistureTemp(); output.soilTemperature4 = soilSensor4.getMoistureTemp(); diff --git a/client/libs/rs485/rs485.hpp b/client/libs/rs485/rs485.hpp index 0bac7654280994dcbef1d242f2dce10e19952aab..4fc4f5e3d5b9e49f2748bc72406f1091625b7aa4 100644 --- a/client/libs/rs485/rs485.hpp +++ b/client/libs/rs485/rs485.hpp @@ -1,9 +1,6 @@ #ifndef _RS485 #define _RS485 -#include "SPI.h" -// RTC (I2C) -#include "RTClib.h" #include "Message.hpp" #include "ForteSensor.hpp" #include "SentecSensors.h" diff --git a/hardware/PCB/forte/forte.kicad_sch b/hardware/PCB/forte/forte.kicad_sch index 5aec0b26369ea4a9bc19bb95213654be22e81f87..7b067c7743a1d4d7fb2cb31a9a487744eac02fcb 100644 --- a/hardware/PCB/forte/forte.kicad_sch +++ b/hardware/PCB/forte/forte.kicad_sch @@ -76,69 +76,6 @@ ) ) ) - (symbol "Analog_ADC:INA219AxD" (in_bom yes) (on_board yes) - (property "Reference" "U" (id 0) (at -6.35 8.89 0) - (effects (font (size 1.27 1.27))) - ) - (property "Value" "INA219AxD" (id 1) (at 5.08 8.89 0) - (effects (font (size 1.27 1.27))) - ) - (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 20.32 -8.89 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Datasheet" "http://www.ti.com/lit/ds/symlink/ina219.pdf" (id 3) (at 8.89 -2.54 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "ki_keywords" "ADC I2C 16-Bit Oversampling Current Shunt" (id 4) (at 0 0 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "ki_description" "Zero-Drift, Bidirectional Current/Power Monitor (0-26V) With I2C Interface, SOIC-8" (id 5) (at 0 0 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "ki_fp_filters" "SOIC*3.9x4.9mm*P1.27mm*" (id 6) (at 0 0 0) - (effects (font (size 1.27 1.27)) hide) - ) - (symbol "INA219AxD_0_1" - (rectangle (start -7.62 7.62) (end 7.62 -7.62) - (stroke (width 0.254) (type default) (color 0 0 0 0)) - (fill (type background)) - ) - ) - (symbol "INA219AxD_1_1" - (pin input line (at 10.16 -2.54 180) (length 2.54) - (name "A1" (effects (font (size 1.27 1.27)))) - (number "1" (effects (font (size 1.27 1.27)))) - ) - (pin input line (at 10.16 -5.08 180) (length 2.54) - (name "A0" (effects (font (size 1.27 1.27)))) - (number "2" (effects (font (size 1.27 1.27)))) - ) - (pin bidirectional line (at 10.16 5.08 180) (length 2.54) - (name "SDA" (effects (font (size 1.27 1.27)))) - (number "3" (effects (font (size 1.27 1.27)))) - ) - (pin input line (at 10.16 2.54 180) (length 2.54) - (name "SCL" (effects (font (size 1.27 1.27)))) - (number "4" (effects (font (size 1.27 1.27)))) - ) - (pin power_in line (at 0 10.16 270) (length 2.54) - (name "VS" (effects (font (size 1.27 1.27)))) - (number "5" (effects (font (size 1.27 1.27)))) - ) - (pin power_in line (at 0 -10.16 90) (length 2.54) - (name "GND" (effects (font (size 1.27 1.27)))) - (number "6" (effects (font (size 1.27 1.27)))) - ) - (pin input line (at -10.16 -2.54 0) (length 2.54) - (name "IN-" (effects (font (size 1.27 1.27)))) - (number "7" (effects (font (size 1.27 1.27)))) - ) - (pin input line (at -10.16 2.54 0) (length 2.54) - (name "IN+" (effects (font (size 1.27 1.27)))) - (number "8" (effects (font (size 1.27 1.27)))) - ) - ) - ) (symbol "Connector:Conn_01x03_Male" (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes) (property "Reference" "J" (id 0) (at 0 5.08 0) (effects (font (size 1.27 1.27))) @@ -396,6 +333,108 @@ ) ) ) + (symbol "Device:C" (pin_numbers hide) (pin_names (offset 0.254)) (in_bom yes) (on_board yes) + (property "Reference" "C" (id 0) (at 0.635 2.54 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "C" (id 1) (at 0.635 -2.54 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 0.9652 -3.81 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_keywords" "cap capacitor" (id 4) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_description" "Unpolarized capacitor" (id 5) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_fp_filters" "C_*" (id 6) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (symbol "C_0_1" + (polyline + (pts + (xy -2.032 -0.762) + (xy 2.032 -0.762) + ) + (stroke (width 0.508) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy -2.032 0.762) + (xy 2.032 0.762) + ) + (stroke (width 0.508) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + ) + (symbol "C_1_1" + (pin passive line (at 0 3.81 270) (length 2.794) + (name "~" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 0 -3.81 90) (length 2.794) + (name "~" (effects (font (size 1.27 1.27)))) + (number "2" (effects (font (size 1.27 1.27)))) + ) + ) + ) + (symbol "Device:C_Small" (pin_numbers hide) (pin_names (offset 0.254) hide) (in_bom yes) (on_board yes) + (property "Reference" "C" (id 0) (at 0.254 1.778 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "C_Small" (id 1) (at 0.254 -2.032 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_keywords" "capacitor cap" (id 4) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_description" "Unpolarized capacitor, small symbol" (id 5) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_fp_filters" "C_*" (id 6) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (symbol "C_Small_0_1" + (polyline + (pts + (xy -1.524 -0.508) + (xy 1.524 -0.508) + ) + (stroke (width 0.3302) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy -1.524 0.508) + (xy 1.524 0.508) + ) + (stroke (width 0.3048) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + ) + (symbol "C_Small_1_1" + (pin passive line (at 0 2.54 270) (length 2.032) + (name "~" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 0 -2.54 90) (length 2.032) + (name "~" (effects (font (size 1.27 1.27)))) + (number "2" (effects (font (size 1.27 1.27)))) + ) + ) + ) (symbol "Device:LED" (pin_numbers hide) (pin_names (offset 1.016) hide) (in_bom yes) (on_board yes) (property "Reference" "D" (id 0) (at 0 2.54 0) (effects (font (size 1.27 1.27))) @@ -744,6 +783,154 @@ ) ) ) + (symbol "Transistor_FET:IRF9540N" (pin_names hide) (in_bom yes) (on_board yes) + (property "Reference" "Q" (id 0) (at 5.08 1.905 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "IRF9540N" (id 1) (at 5.08 0 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Package_TO_SOT_THT:TO-220-3_Vertical" (id 2) (at 5.08 -1.905 0) + (effects (font (size 1.27 1.27) italic) (justify left) hide) + ) + (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf9540n.pdf" (id 3) (at 0 0 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + (property "ki_keywords" "P-Channel MOSFET HEXFET" (id 4) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_description" "-23A Id, -100V Vds, 117mOhm Rds, P-Channel HEXFET Power MOSFET, TO-220" (id 5) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_fp_filters" "TO?220*" (id 6) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (symbol "IRF9540N_0_1" + (polyline + (pts + (xy 0.254 0) + (xy -2.54 0) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 0.254 1.905) + (xy 0.254 -1.905) + ) + (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 0.762 -1.27) + (xy 0.762 -2.286) + ) + (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 0.762 0.508) + (xy 0.762 -0.508) + ) + (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 0.762 2.286) + (xy 0.762 1.27) + ) + (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 2.54 2.54) + (xy 2.54 1.778) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 2.54 -2.54) + (xy 2.54 0) + (xy 0.762 0) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 0.762 1.778) + (xy 3.302 1.778) + (xy 3.302 -1.778) + (xy 0.762 -1.778) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 2.286 0) + (xy 1.27 0.381) + (xy 1.27 -0.381) + (xy 2.286 0) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) + ) + (polyline + (pts + (xy 2.794 -0.508) + (xy 2.921 -0.381) + (xy 3.683 -0.381) + (xy 3.81 -0.254) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (polyline + (pts + (xy 3.302 -0.381) + (xy 2.921 0.254) + (xy 3.683 0.254) + (xy 3.302 -0.381) + ) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 1.651 0) (radius 2.794) + (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type none)) + ) + (circle (center 2.54 -1.778) (radius 0.254) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) + ) + (circle (center 2.54 1.778) (radius 0.254) + (stroke (width 0) (type default) (color 0 0 0 0)) + (fill (type outline)) + ) + ) + (symbol "IRF9540N_1_1" + (pin input line (at -5.08 0 0) (length 2.54) + (name "G" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 2.54 5.08 270) (length 2.54) + (name "D" (effects (font (size 1.27 1.27)))) + (number "2" (effects (font (size 1.27 1.27)))) + ) + (pin passive line (at 2.54 -5.08 90) (length 2.54) + (name "S" (effects (font (size 1.27 1.27)))) + (number "3" (effects (font (size 1.27 1.27)))) + ) + ) + ) (symbol "Transistor_FET:IRLZ34N" (pin_names hide) (in_bom yes) (on_board yes) (property "Reference" "Q" (id 0) (at 6.35 1.905 0) (effects (font (size 1.27 1.27)) (justify left)) @@ -1742,28 +1929,43 @@ ) ) - (junction (at 228.6 106.68) (diameter 0) (color 0 0 0 0)) - (junction (at 232.41 104.14) (diameter 0) (color 0 0 0 0)) + (junction (at 215.9 116.84) (diameter 0) (color 0 0 0 0)) (junction (at 204.47 60.96) (diameter 0) (color 0 0 0 0)) - (junction (at 228.6 91.44) (diameter 0) (color 0 0 0 0)) - (junction (at 232.41 88.9) (diameter 0) (color 0 0 0 0)) - (junction (at 478.79 58.42) (diameter 0) (color 0 0 0 0)) - (junction (at 228.6 76.2) (diameter 0) (color 0 0 0 0)) - (junction (at 245.11 83.82) (diameter 0) (color 0 0 0 0)) + (junction (at 473.71 58.42) (diameter 0) (color 0 0 0 0)) + (junction (at 473.71 77.47) (diameter 0) (color 0 0 0 0)) + (junction (at 233.68 170.18) (diameter 0) (color 0 0 0 0)) (junction (at 478.79 86.36) (diameter 0) (color 0 0 0 0)) - (junction (at 215.9 83.82) (diameter 0) (color 0 0 0 0)) - (junction (at 454.66 106.68) (diameter 0) (color 0 0 0 0)) - (junction (at 232.41 119.38) (diameter 0) (color 0 0 0 0)) - (junction (at 478.79 44.45) (diameter 0) (color 0 0 0 0)) - (junction (at 66.04 138.43) (diameter 0) (color 0 0 0 0)) - (junction (at 72.39 138.43) (diameter 0) (color 0 0 0 0)) - (junction (at 228.6 121.92) (diameter 0) (color 0 0 0 0)) - (junction (at 72.39 148.59) (diameter 0) (color 0 0 0 0)) + (junction (at 473.71 91.44) (diameter 0) (color 0 0 0 0)) + (junction (at 232.41 88.9) (diameter 0) (color 0 0 0 0)) (junction (at 478.79 72.39) (diameter 0) (color 0 0 0 0)) + (junction (at 228.6 121.92) (diameter 0) (color 0 0 0 0)) + (junction (at 218.44 160.02) (diameter 0) (color 0 0 0 0)) (junction (at 414.02 124.46) (diameter 0) (color 0 0 0 0)) - (junction (at 66.04 148.59) (diameter 0) (color 0 0 0 0)) + (junction (at 72.39 138.43) (diameter 0) (color 0 0 0 0)) (junction (at 245.11 99.06) (diameter 0) (color 0 0 0 0)) + (junction (at 228.6 76.2) (diameter 0) (color 0 0 0 0)) (junction (at 232.41 73.66) (diameter 0) (color 0 0 0 0)) + (junction (at 215.9 83.82) (diameter 0) (color 0 0 0 0)) + (junction (at 72.39 148.59) (diameter 0) (color 0 0 0 0)) + (junction (at 228.6 91.44) (diameter 0) (color 0 0 0 0)) + (junction (at 228.6 106.68) (diameter 0) (color 0 0 0 0)) + (junction (at 478.79 58.42) (diameter 0) (color 0 0 0 0)) + (junction (at 218.44 152.4) (diameter 0) (color 0 0 0 0)) + (junction (at 473.71 86.36) (diameter 0) (color 0 0 0 0)) + (junction (at 238.76 201.93) (diameter 0) (color 0 0 0 0)) + (junction (at 228.6 138.43) (diameter 0) (color 0 0 0 0)) + (junction (at 251.46 201.93) (diameter 0) (color 0 0 0 0)) + (junction (at 473.4073 44.45) (diameter 0) (color 0 0 0 0)) + (junction (at 473.71 72.39) (diameter 0) (color 0 0 0 0)) + (junction (at 473.71 63.5) (diameter 0) (color 0 0 0 0)) + (junction (at 473.4073 49.53) (diameter 0) (color 0 0 0 0)) + (junction (at 232.41 119.38) (diameter 0) (color 0 0 0 0)) + (junction (at 245.11 83.82) (diameter 0) (color 0 0 0 0)) + (junction (at 454.66 106.68) (diameter 0) (color 0 0 0 0)) + (junction (at 232.41 104.14) (diameter 0) (color 0 0 0 0)) + (junction (at 478.79 44.45) (diameter 0) (color 0 0 0 0)) + (junction (at 241.3 135.89) (diameter 0) (color 0 0 0 0)) + (junction (at 233.68 182.88) (diameter 0) (color 0 0 0 0)) (no_connect (at 383.54 76.2) (uuid 13858c65-9bfa-49a3-903c-c9f7cddcd07c)) (no_connect (at 383.54 91.44) (uuid 17707b32-84c4-4bde-815e-ef310265a7af)) @@ -1776,18 +1978,16 @@ (no_connect (at 408.94 76.2) (uuid 37d01c45-f4df-47a8-ad8f-71f6d70ab965)) (no_connect (at 383.54 81.28) (uuid 39212082-56c4-4595-8707-9c11909f6ff4)) (no_connect (at 408.94 63.5) (uuid 4407df15-3095-48c7-91b9-8d75d75cdf30)) + (no_connect (at 179.07 50.8) (uuid 47acf912-17f6-4a1d-81c0-130782585f69)) (no_connect (at 179.07 53.34) (uuid 47acf912-17f6-4a1d-81c0-130782585f69)) (no_connect (at 179.07 55.88) (uuid 47acf912-17f6-4a1d-81c0-130782585f69)) - (no_connect (at 179.07 50.8) (uuid 47acf912-17f6-4a1d-81c0-130782585f69)) (no_connect (at 427.99 73.66) (uuid 4da71098-d5a8-46b0-b519-5587a2dbacf8)) (no_connect (at 383.54 83.82) (uuid 4eb83fe9-cd5d-4d36-9b4b-d813928cbc24)) - (no_connect (at 95.25 173.99) (uuid 5957a4b3-d7f4-4c64-911a-a395e24b96ca)) (no_connect (at 383.54 93.98) (uuid 61f84821-2e47-4df8-8466-e209fb5518f3)) (no_connect (at 408.94 104.14) (uuid 6a801906-5095-4af0-b3da-72863960ef09)) (no_connect (at 383.54 68.58) (uuid 6d93cd0b-dbe0-433f-bf15-d616c8ad6c58)) (no_connect (at 408.94 71.12) (uuid 75c323cc-12da-444b-b2c3-db271aa4d3c6)) (no_connect (at 383.54 63.5) (uuid 7c3d2a97-5d92-4831-a1c9-81e2afd64a6e)) - (no_connect (at 95.25 176.53) (uuid 80ab147d-ba0d-4984-bc6d-dea5d45b06d9)) (no_connect (at 383.54 96.52) (uuid 839e922f-feca-4d4f-aba5-d367705b0321)) (no_connect (at 427.99 63.5) (uuid 8973a1ea-8766-4b5d-9320-58c12c73d8fa)) (no_connect (at 85.09 147.32) (uuid 9809942f-438b-4aaf-b551-15602f11e1f0)) @@ -1803,6 +2003,14 @@ (no_connect (at 408.94 93.98) (uuid dc83cc42-7fb3-4960-8604-f080313be362)) (no_connect (at 383.54 88.9) (uuid dfc5cb7d-1cc7-4c78-a918-fb3e50c8d5ab)) + (wire (pts (xy 229.87 148.59) (xy 228.6 148.59)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 004f76b4-c147-4283-9c81-2b596001ec8c) + ) + (wire (pts (xy 228.6 148.59) (xy 228.6 138.43)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 004f76b4-c147-4283-9c81-2b596001ec8c) + ) (wire (pts (xy 408.94 73.66) (xy 421.64 73.66)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 03b581d0-b9b9-4f8d-af5b-6ca3e1a98fa0) @@ -1811,15 +2019,19 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0435a94e-2aa8-47b8-891a-1241a509fafb) ) - (wire (pts (xy 191.77 66.04) (xy 191.77 104.14)) + (wire (pts (xy 179.07 66.04) (xy 191.77 66.04)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 077276b5-655f-44cb-a972-557d650dacaa) ) - (wire (pts (xy 179.07 66.04) (xy 191.77 66.04)) + (wire (pts (xy 191.77 66.04) (xy 191.77 128.27)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 077276b5-655f-44cb-a972-557d650dacaa) ) - (wire (pts (xy 172.72 186.69) (xy 195.58 186.69)) + (wire (pts (xy 204.47 87.63) (xy 204.47 90.17)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 07be7f27-bb03-4e28-b39b-0ef43a9c20bf) + ) + (wire (pts (xy 88.9 245.11) (xy 111.76 245.11)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 07dc10dc-feed-4b7b-b125-79a4a5607a51) ) @@ -1827,27 +2039,47 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 08bb005d-8e01-4713-a11f-20a77539026a) ) - (polyline (pts (xy 299.72 165.1) (xy 129.54 165.1)) + (wire (pts (xy 238.76 201.93) (xy 251.46 201.93)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 0ae752cf-4ef7-41e5-a358-e2ef13a62628) + ) + (wire (pts (xy 234.95 201.93) (xy 238.76 201.93)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 0ae752cf-4ef7-41e5-a358-e2ef13a62628) + ) + (polyline (pts (xy 299.72 24.13) (xy 299.72 236.22)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0bab81f5-6350-4637-85a2-e61778ab24c5) ) - (polyline (pts (xy 129.54 24.13) (xy 299.72 24.13)) + (polyline (pts (xy 129.54 236.22) (xy 129.54 24.13)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0bab81f5-6350-4637-85a2-e61778ab24c5) ) - (polyline (pts (xy 129.54 165.1) (xy 129.54 24.13)) + (polyline (pts (xy 299.72 236.22) (xy 129.54 236.22)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0bab81f5-6350-4637-85a2-e61778ab24c5) ) - (polyline (pts (xy 299.72 24.13) (xy 299.72 165.1)) + (polyline (pts (xy 129.54 24.13) (xy 299.72 24.13)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0bab81f5-6350-4637-85a2-e61778ab24c5) ) + (wire (pts (xy 251.46 177.8) (xy 251.46 170.18)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 123022f1-4d8e-4881-8e07-f163ceb9e5fa) + ) + (wire (pts (xy 251.46 170.18) (xy 233.68 170.18)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 123022f1-4d8e-4881-8e07-f163ceb9e5fa) + ) (wire (pts (xy 224.79 66.04) (xy 228.6 66.04)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 18ed6525-be83-46ad-b329-5ae257bb14e6) ) + (wire (pts (xy 218.44 152.4) (xy 224.79 152.4)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 1ba9b6d5-f3cb-427e-89d2-9023cebc7218) + ) (wire (pts (xy 411.48 99.06) (xy 411.48 124.46)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1f7ea972-f5b2-414f-bdc6-e759c4c71838) @@ -1860,15 +2092,19 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 200f60c8-033e-46dc-886d-8e0ccf162701) ) - (wire (pts (xy 191.77 58.42) (xy 191.77 60.96)) + (wire (pts (xy 191.77 60.96) (xy 179.07 60.96)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 23400f7c-ddfe-486b-824e-1ace00ad22fc) ) - (wire (pts (xy 191.77 60.96) (xy 179.07 60.96)) + (wire (pts (xy 191.77 58.42) (xy 191.77 60.96)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 23400f7c-ddfe-486b-824e-1ace00ad22fc) ) - (wire (pts (xy 472.44 58.42) (xy 478.79 58.42)) + (wire (pts (xy 473.71 58.42) (xy 478.79 58.42)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 23c93194-3a79-4b03-b413-4487aad9f618) + ) + (wire (pts (xy 468.63 58.42) (xy 473.71 58.42)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 23c93194-3a79-4b03-b413-4487aad9f618) ) @@ -1905,13 +2141,13 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 28eae92a-1f60-4df7-8169-9aa887e6e32f) ) - (wire (pts (xy 472.44 44.45) (xy 478.79 44.45)) + (wire (pts (xy 468.63 44.45) (xy 473.4073 44.45)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 2c541300-06e1-4b6d-b7ba-04e2c3eeb112) ) - (wire (pts (xy 218.44 130.81) (xy 248.92 130.81)) + (wire (pts (xy 473.4073 44.45) (xy 478.79 44.45)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 2d7131da-cf79-4f49-b9f5-c1f4a3235df7) + (uuid 2c541300-06e1-4b6d-b7ba-04e2c3eeb112) ) (wire (pts (xy 204.47 60.96) (xy 204.47 63.5)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -1929,19 +2165,39 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 32a5ff7f-aecf-4604-acbc-2fb664f3403c) ) + (wire (pts (xy 237.49 148.59) (xy 241.3 148.59)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 3b6a5a90-f0f3-40f8-a5e2-a0c321f0b56e) + ) + (wire (pts (xy 241.3 148.59) (xy 241.3 135.89)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 3b6a5a90-f0f3-40f8-a5e2-a0c321f0b56e) + ) (wire (pts (xy 228.6 121.92) (xy 228.6 106.68)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 3baecf56-960d-43f9-96a5-86901c379354) ) + (wire (pts (xy 204.47 116.84) (xy 215.9 116.84)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 3eeed765-6a65-416c-9b3a-597b9b9c8dd9) + ) (wire (pts (xy 245.11 83.82) (xy 245.11 99.06)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 3fc554cb-e3c0-4a8c-b51b-748584396354) ) - (wire (pts (xy 472.44 86.36) (xy 478.79 86.36)) + (wire (pts (xy 468.63 86.36) (xy 473.71 86.36)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 400a382c-91b3-4aea-ba86-33babeb6a16a) + ) + (wire (pts (xy 473.71 86.36) (xy 478.79 86.36)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 400a382c-91b3-4aea-ba86-33babeb6a16a) ) - (wire (pts (xy 448.31 49.53) (xy 478.79 49.53)) + (wire (pts (xy 448.31 49.53) (xy 473.4073 49.53)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 404b7a9c-9c21-4223-8a87-f1ccc67b9326) + ) + (wire (pts (xy 473.4073 49.53) (xy 478.79 49.53)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 404b7a9c-9c21-4223-8a87-f1ccc67b9326) ) @@ -1957,15 +2213,15 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 46029551-ead5-417b-856a-8ccfdec05981) ) - (wire (pts (xy 74.93 168.91) (xy 59.69 168.91)) + (wire (pts (xy 232.41 135.89) (xy 241.3 135.89)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 492d6dfd-6afe-4282-b01e-b5a9f652d362) + (uuid 4a3b1b56-7fde-4029-86b1-8613595b352e) ) - (wire (pts (xy 232.41 135.89) (xy 248.92 135.89)) + (wire (pts (xy 241.3 135.89) (xy 248.92 135.89)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4a3b1b56-7fde-4029-86b1-8613595b352e) ) - (wire (pts (xy 215.9 109.22) (xy 215.9 116.84)) + (wire (pts (xy 215.9 133.35) (xy 215.9 140.97)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4b9b3667-ae4b-4330-bd5c-20e211593056) ) @@ -1977,7 +2233,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 55c10d91-5b8f-4045-83a1-4f45ee98e39a) ) - (polyline (pts (xy 125.73 123.19) (xy 54.61 123.19)) + (polyline (pts (xy 125.73 24.13) (xy 125.73 123.19)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 59e933e9-4228-4d49-91cb-38ae5fb8e064) ) @@ -1989,28 +2245,32 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 59e933e9-4228-4d49-91cb-38ae5fb8e064) ) - (polyline (pts (xy 125.73 24.13) (xy 125.73 123.19)) + (polyline (pts (xy 125.73 123.19) (xy 54.61 123.19)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 59e933e9-4228-4d49-91cb-38ae5fb8e064) ) - (polyline (pts (xy 40.64 13.97) (xy 303.53 13.97)) + (polyline (pts (xy 303.53 13.97) (xy 303.53 279.4)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 5d6c7120-e092-4949-ae5f-513ec48d854b) ) - (polyline (pts (xy 303.53 213.36) (xy 40.64 213.36)) + (polyline (pts (xy 40.64 279.4) (xy 40.64 13.97)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 5d6c7120-e092-4949-ae5f-513ec48d854b) ) - (polyline (pts (xy 303.53 13.97) (xy 303.53 213.36)) + (polyline (pts (xy 303.53 279.4) (xy 40.64 279.4)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 5d6c7120-e092-4949-ae5f-513ec48d854b) ) - (polyline (pts (xy 40.64 213.36) (xy 40.64 13.97)) + (polyline (pts (xy 40.64 13.97) (xy 303.53 13.97)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 5d6c7120-e092-4949-ae5f-513ec48d854b) ) - (wire (pts (xy 478.79 91.44) (xy 461.01 91.44)) + (wire (pts (xy 478.79 91.44) (xy 473.71 91.44)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 5e5f12ed-c398-468b-b125-0ff185fcc6f3) + ) + (wire (pts (xy 473.71 91.44) (xy 461.01 91.44)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 5e5f12ed-c398-468b-b125-0ff185fcc6f3) ) @@ -2046,23 +2306,23 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 70551bb6-0da1-4039-b5e1-7cad4f138207) ) - (wire (pts (xy 478.79 58.42) (xy 478.79 60.96)) + (wire (pts (xy 224.79 182.88) (xy 224.79 160.02)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 765cb8db-4bd7-4881-95ed-ac41c206b041) + (uuid 75e3e812-8ff9-47e1-b1f4-c2edaecdf136) ) - (wire (pts (xy 66.04 173.99) (xy 74.93 173.99)) + (wire (pts (xy 224.79 160.02) (xy 218.44 160.02)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 82012bc6-4a18-478f-ae7f-c155e0a757be) + (uuid 75e3e812-8ff9-47e1-b1f4-c2edaecdf136) ) - (polyline (pts (xy 125.73 128.27) (xy 125.73 194.31)) + (wire (pts (xy 478.79 58.42) (xy 478.79 60.96)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 83063d19-7e2b-4c05-9f79-132e50368898) + (uuid 765cb8db-4bd7-4881-95ed-ac41c206b041) ) - (polyline (pts (xy 52.07 128.27) (xy 52.07 194.31)) + (polyline (pts (xy 125.73 153.67) (xy 52.07 153.67)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 83063d19-7e2b-4c05-9f79-132e50368898) ) - (polyline (pts (xy 125.73 194.31) (xy 52.07 194.31)) + (polyline (pts (xy 52.07 128.27) (xy 52.07 153.67)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 83063d19-7e2b-4c05-9f79-132e50368898) ) @@ -2070,6 +2330,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 83063d19-7e2b-4c05-9f79-132e50368898) ) + (polyline (pts (xy 125.73 128.27) (xy 125.73 153.67)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 83063d19-7e2b-4c05-9f79-132e50368898) + ) (wire (pts (xy 232.41 119.38) (xy 248.92 119.38)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -2099,35 +2363,55 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 930dcdf0-651c-41d1-aeeb-81eaab2f51c2) ) - (wire (pts (xy 459.74 63.5) (xy 478.79 63.5)) + (wire (pts (xy 204.47 97.79) (xy 204.47 101.6)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 96f93d12-b6ba-40d4-bbfb-af579127f11c) + ) + (wire (pts (xy 248.92 152.4) (xy 246.38 152.4)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 98582cf2-242d-4c95-87b8-ceabe35965ce) + ) + (wire (pts (xy 473.71 63.5) (xy 478.79 63.5)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 9be03286-b27b-465c-a641-5af49792b377) ) - (wire (pts (xy 59.69 168.91) (xy 59.69 138.43)) + (wire (pts (xy 459.74 63.5) (xy 473.71 63.5)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid 9c3cd9da-bff4-4166-83ba-94d416a54625) + (uuid 9be03286-b27b-465c-a641-5af49792b377) ) (wire (pts (xy 248.92 114.3) (xy 245.11 114.3)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 9c46a495-a7fc-4959-87f9-d6a69831a0be) ) - (polyline (pts (xy 129.54 167.64) (xy 184.15 167.64)) + (wire (pts (xy 215.9 83.82) (xy 215.9 116.84)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 9c94b207-feeb-4511-9bff-af6e34afc24f) + ) + (wire (pts (xy 215.9 116.84) (xy 215.9 123.19)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 9c94b207-feeb-4511-9bff-af6e34afc24f) + ) + (polyline (pts (xy 100.33 266.7) (xy 45.72 266.7)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a1f6c1c0-6b88-4c32-9947-e454d453eea2) ) - (polyline (pts (xy 184.15 208.28) (xy 129.54 208.28)) + (polyline (pts (xy 45.72 266.7) (xy 45.72 226.06)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a1f6c1c0-6b88-4c32-9947-e454d453eea2) ) - (polyline (pts (xy 129.54 208.28) (xy 129.54 167.64)) + (polyline (pts (xy 45.72 226.06) (xy 100.33 226.06)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a1f6c1c0-6b88-4c32-9947-e454d453eea2) ) - (polyline (pts (xy 184.15 167.64) (xy 184.15 208.28)) + (polyline (pts (xy 100.33 226.06) (xy 100.33 266.7)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a1f6c1c0-6b88-4c32-9947-e454d453eea2) ) + (wire (pts (xy 204.47 111.76) (xy 204.47 116.84)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid a25d8d73-7556-4ed2-bece-5247ece504fb) + ) (wire (pts (xy 245.11 99.06) (xy 245.11 114.3)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a5e78f85-dc02-4717-822b-40a435decc25) @@ -2136,27 +2420,23 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a63eb53f-569b-4194-9966-5c86ce280a2c) ) - (polyline (pts (xy 240.03 167.64) (xy 240.03 208.28)) + (polyline (pts (xy 101.6 226.06) (xy 156.21 226.06)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a6b87e3b-318f-4468-804c-a52b4618970f) ) - (polyline (pts (xy 185.42 167.64) (xy 240.03 167.64)) + (polyline (pts (xy 156.21 266.7) (xy 101.6 266.7)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a6b87e3b-318f-4468-804c-a52b4618970f) ) - (polyline (pts (xy 240.03 208.28) (xy 185.42 208.28)) + (polyline (pts (xy 156.21 226.06) (xy 156.21 266.7)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a6b87e3b-318f-4468-804c-a52b4618970f) ) - (polyline (pts (xy 185.42 167.64) (xy 185.42 208.28)) + (polyline (pts (xy 101.6 226.06) (xy 101.6 266.7)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a6b87e3b-318f-4468-804c-a52b4618970f) ) - (wire (pts (xy 59.69 138.43) (xy 66.04 138.43)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid a7385c26-e9db-4ea0-adca-bdda8e1782b2) - ) (wire (pts (xy 228.6 121.92) (xy 248.92 121.92)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a7d271c3-7c9d-47e9-b03f-4018d4730e09) @@ -2169,7 +2449,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ace08891-b241-4784-8de2-fe72c6ededcb) ) - (wire (pts (xy 172.72 189.23) (xy 195.58 189.23)) + (wire (pts (xy 88.9 247.65) (xy 111.76 247.65)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ae8cc7c2-ee9f-4649-9fd6-21d7ef6c39dc) ) @@ -2177,7 +2457,11 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b04d74c7-40dc-4bff-bac6-a76e4ec5181e) ) - (wire (pts (xy 191.77 104.14) (xy 200.66 104.14)) + (wire (pts (xy 233.68 180.34) (xy 233.68 182.88)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid b0e0032a-217f-4af7-84c1-e21e10de9027) + ) + (wire (pts (xy 191.77 128.27) (xy 200.66 128.27)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b138ebca-4002-4b81-899d-8b94140e686a) ) @@ -2189,23 +2473,23 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b34224d0-aaef-4788-8a9f-ff67fea661be) ) - (wire (pts (xy 66.04 158.75) (xy 66.04 173.99)) - (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid b429e736-2eea-4336-bd53-a4f08b9880ac) - ) (wire (pts (xy 72.39 138.43) (xy 85.09 138.43)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b80bcd4b-cdd8-4ba3-a96e-6f169f4740cb) ) + (wire (pts (xy 448.31 68.58) (xy 462.28 68.58)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid b86e3ee7-9346-49ea-967a-ff6c537bf7df) + ) (wire (pts (xy 462.28 68.58) (xy 462.28 77.47)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b86e3ee7-9346-49ea-967a-ff6c537bf7df) ) - (wire (pts (xy 462.28 77.47) (xy 478.79 77.47)) + (wire (pts (xy 473.71 77.47) (xy 478.79 77.47)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b86e3ee7-9346-49ea-967a-ff6c537bf7df) ) - (wire (pts (xy 448.31 68.58) (xy 462.28 68.58)) + (wire (pts (xy 462.28 77.47) (xy 473.71 77.47)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b86e3ee7-9346-49ea-967a-ff6c537bf7df) ) @@ -2217,11 +2501,11 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid c031ff76-1dc9-4643-9431-c76487fa7036) ) - (wire (pts (xy 449.58 109.22) (xy 454.66 109.22)) + (wire (pts (xy 454.66 109.22) (xy 454.66 111.76)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid c6bdbf09-5b2b-4a34-a4ba-8e307e67def0) ) - (wire (pts (xy 454.66 109.22) (xy 454.66 111.76)) + (wire (pts (xy 449.58 109.22) (xy 454.66 109.22)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid c6bdbf09-5b2b-4a34-a4ba-8e307e67def0) ) @@ -2241,11 +2525,11 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d07406de-9642-413a-9798-ceccd9a3cff9) ) - (wire (pts (xy 408.94 96.52) (xy 414.02 96.52)) + (wire (pts (xy 414.02 96.52) (xy 414.02 121.92)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d0f6bbb0-0204-48ec-be0d-6a7e193141a4) ) - (wire (pts (xy 414.02 96.52) (xy 414.02 121.92)) + (wire (pts (xy 408.94 96.52) (xy 414.02 96.52)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d0f6bbb0-0204-48ec-be0d-6a7e193141a4) ) @@ -2273,15 +2557,23 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d541a383-f345-4978-ac4f-35fce2e10e7a) ) - (wire (pts (xy 215.9 99.06) (xy 215.9 83.82)) + (wire (pts (xy 233.68 168.91) (xy 233.68 170.18)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid d7438c68-adb5-4d31-844b-9f3f2ad193f6) + (uuid d63f2573-cfe5-4ce4-b893-6a26b9a194f5) + ) + (wire (pts (xy 233.68 170.18) (xy 233.68 172.72)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid d63f2573-cfe5-4ce4-b893-6a26b9a194f5) ) (wire (pts (xy 215.9 83.82) (xy 245.11 83.82)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d7438c68-adb5-4d31-844b-9f3f2ad193f6) ) - (wire (pts (xy 472.44 72.39) (xy 478.79 72.39)) + (wire (pts (xy 473.71 72.39) (xy 478.79 72.39)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid d905b234-687e-423d-ae40-cdb61304d18c) + ) + (wire (pts (xy 468.63 72.39) (xy 473.71 72.39)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d905b234-687e-423d-ae40-cdb61304d18c) ) @@ -2289,10 +2581,14 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d9141894-e712-4a28-8933-8d3eebf1ada8) ) - (wire (pts (xy 218.44 132.08) (xy 218.44 130.81)) + (wire (pts (xy 218.44 161.29) (xy 218.44 160.02)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d9976a95-0999-4333-8b0e-f67f920ceed5) ) + (wire (pts (xy 199.39 60.96) (xy 204.47 60.96)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid dcf8e1f4-69a8-47ec-aa6d-02fc9856bd5d) + ) (wire (pts (xy 199.39 48.26) (xy 199.39 60.96)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid dcf8e1f4-69a8-47ec-aa6d-02fc9856bd5d) @@ -2301,9 +2597,9 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid dcf8e1f4-69a8-47ec-aa6d-02fc9856bd5d) ) - (wire (pts (xy 199.39 60.96) (xy 204.47 60.96)) + (wire (pts (xy 224.79 182.88) (xy 233.68 182.88)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid dcf8e1f4-69a8-47ec-aa6d-02fc9856bd5d) + (uuid de514f6e-0051-45f5-82b7-182b566f7b03) ) (wire (pts (xy 232.41 73.66) (xy 232.41 88.9)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -2313,9 +2609,17 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e08966f5-7ba5-40c0-a6c7-3697f73f143d) ) - (wire (pts (xy 66.04 148.59) (xy 66.04 151.13)) + (wire (pts (xy 251.46 187.96) (xy 251.46 191.77)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid e1426760-dd59-4d8a-a3b1-1fc20a0a6b5f) + ) + (wire (pts (xy 251.46 199.39) (xy 251.46 201.93)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid e36f87b7-5e39-4b52-82ad-cd382e7cc520) + ) + (wire (pts (xy 251.46 201.93) (xy 251.46 205.74)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid e2d04fbd-ceb4-47b0-b05e-0681678d81e8) + (uuid e36f87b7-5e39-4b52-82ad-cd382e7cc520) ) (wire (pts (xy 461.01 71.12) (xy 461.01 91.44)) (stroke (width 0) (type default) (color 0 0 0 0)) @@ -2329,6 +2633,22 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e9e6c23c-c874-4815-94be-e46b335c4073) ) + (wire (pts (xy 233.68 182.88) (xy 243.84 182.88)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid eafdeb03-02b9-436b-906a-6628034cda29) + ) + (wire (pts (xy 218.44 130.81) (xy 218.44 152.4)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid ec5c45b6-0e6c-4164-beb0-9daa736990e2) + ) + (wire (pts (xy 218.44 130.81) (xy 248.92 130.81)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid ec5c45b6-0e6c-4164-beb0-9daa736990e2) + ) + (wire (pts (xy 218.44 152.4) (xy 218.44 160.02)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid ec5c45b6-0e6c-4164-beb0-9daa736990e2) + ) (wire (pts (xy 416.56 111.76) (xy 429.26 111.76)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f2d33206-c79b-49b4-904f-04b3df7dc6f5) @@ -2341,19 +2661,23 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f2d33206-c79b-49b4-904f-04b3df7dc6f5) ) - (wire (pts (xy 224.79 58.42) (xy 232.41 58.42)) + (wire (pts (xy 238.76 152.4) (xy 234.95 152.4)) (stroke (width 0) (type default) (color 0 0 0 0)) - (uuid f334aed8-b214-46d1-a2cf-6cc4550ab06f) + (uuid f2e18812-a675-416f-b38a-41328206fe17) ) (wire (pts (xy 232.41 58.42) (xy 232.41 73.66)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f334aed8-b214-46d1-a2cf-6cc4550ab06f) ) - (wire (pts (xy 187.96 137.16) (xy 203.2 137.16)) + (wire (pts (xy 224.79 58.42) (xy 232.41 58.42)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid f334aed8-b214-46d1-a2cf-6cc4550ab06f) + ) + (wire (pts (xy 187.96 166.37) (xy 203.2 166.37)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f4f0fdf1-ee62-4031-96be-860d84d78051) ) - (wire (pts (xy 187.96 68.58) (xy 187.96 137.16)) + (wire (pts (xy 187.96 68.58) (xy 187.96 166.37)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f4f0fdf1-ee62-4031-96be-860d84d78051) ) @@ -2374,7 +2698,7 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 11e7efd5-96eb-47ea-9688-a51d2c365a7f) ) - (text "red" (at 160.02 190.5 0) + (text "red" (at 76.2 248.92 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 1661226d-0d84-4d99-930e-ac70822f7e84) ) @@ -2386,10 +2710,6 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 29a68833-25c3-4f5c-9245-56e514092388) ) - (text "I2C Address\n0x40" (at 69.85 191.77 0) - (effects (font (size 1.27 1.27)) (justify left bottom)) - (uuid 36e69a83-1243-4489-93b4-64070ec1b01d) - ) (text "Sensor client main station" (at 132.08 27.94 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 3a69b5c3-1942-4a57-8cce-609c96b3272c) @@ -2398,27 +2718,28 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 55176be2-d502-4448-82e2-d81b411fb978) ) + (text "Battery voltage reading with simple voltage divider by bridging pin 2 and 3 of FET.\nConstant current drain: 0.14mA\nhttps://electronics.stackexchange.com/questions/313325/upper-limit-for-resistance-values-in-voltage-divider" + (at 184.15 227.33 0) + (effects (font (size 1.27 1.27)) (justify left bottom)) + (uuid 57f560d7-b223-4237-9f97-60e9b11bb7f7) + ) (text "LTE Host, always on\n" (at 55.88 27.94 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 5dd9a5c1-a78a-413f-a6ba-b8e5e54bc7f6) ) - (text "ESPCAM, Serial\n" (at 203.2 205.74 0) + (text "ESPCAM, Serial\n" (at 119.38 264.16 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 6ee9a0b3-327c-411b-a20a-56f9f0d9e84e) ) - (text "I2C Address\n0x68" (at 96.52 114.3 0) - (effects (font (size 1.27 1.27)) (justify left bottom)) - (uuid 770531d4-0123-4063-bb49-6956bdd69cf2) - ) - (text "black" (at 210.82 190.5 0) + (text "black" (at 127 248.92 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 7c05f46c-82da-4a9a-bf98-027dd191aacf) ) - (text "Cam in transparent case" (at 186.69 171.45 0) + (text "Cam in transparent case" (at 102.87 229.87 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 836cc233-7a85-482d-aab9-f4871aaea21c) ) - (text "black" (at 160.02 195.58 0) + (text "black" (at 76.2 254 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 88cc6cba-637f-410e-a444-c186b8e7211f) ) @@ -2430,7 +2751,7 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 9da261d9-3419-4977-b123-260f3fa9ffcf) ) - (text "I2C Address\n0x44" (at 140.97 198.12 0) + (text "I2C Address\n0x44" (at 57.15 256.54 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid ac1548a2-f42e-4a5c-b71f-b7262028672b) ) @@ -2439,23 +2760,23 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid b6d30373-bf3b-4581-8014-f89d81f2612c) ) - (text "grey" (at 205.74 190.5 0) + (text "grey" (at 121.92 248.92 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid b943da05-ce8a-44bb-8e3f-f5fc18134c38) ) - (text "green" (at 160.02 187.96 0) + (text "green" (at 76.2 246.38 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid b9db93de-3956-4355-bf85-4209801685b3) ) - (text "brown" (at 210.82 193.04 0) + (text "brown" (at 127 251.46 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid be0e86ee-bed5-4c4b-a5d6-60fff4ed0ffd) ) - (text "y/g" (at 205.74 187.96 0) + (text "y/g" (at 121.92 246.38 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid dd1f1ac6-5a2b-42e5-af00-bba717925c1b) ) - (text "yellow" (at 160.02 193.04 0) + (text "yellow" (at 76.2 251.46 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid e7596001-6855-40ae-972c-6dddcb4cdff6) ) @@ -2464,7 +2785,7 @@ (uuid f29c6260-fbf8-4d04-85a5-5152447cd224) ) (text "Temperature and humidity in special case\n\nNeeds to be close to cam due to I2C \ncable length limitation" - (at 132.08 177.8 0) + (at 48.26 236.22 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid f313d502-13ab-424b-b871-c21201a79267) ) @@ -2473,19 +2794,11 @@ (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 0493b412-ae80-4ffa-9fd9-d91ad0388587) ) - (label "SCL_Host" (at 81.28 107.95 180) - (effects (font (size 1.27 1.27)) (justify right bottom)) - (uuid 0e168d08-9b73-42ab-9bff-db25d5b98c67) - ) - (label "SDA_Host" (at 81.28 110.49 180) - (effects (font (size 1.27 1.27)) (justify right bottom)) - (uuid 229420b2-8133-4c47-8bbb-279d2d53d5e7) - ) - (label "TX_Host" (at 226.06 194.31 0) + (label "TX_Host" (at 142.24 252.73 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 343b0cdb-02b4-4b77-8247-a22401a8a9a2) ) - (label "RX_Host" (at 226.06 196.85 0) + (label "RX_Host" (at 142.24 255.27 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 469b9a3b-651b-48e7-b9ef-cde8e23dd509) ) @@ -2493,44 +2806,36 @@ (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid 57894fa9-0808-47d7-8df4-01c61fe1061e) ) + (label "ADC_PIN" (at 153.67 48.26 180) + (effects (font (size 1.27 1.27)) (justify right bottom)) + (uuid 7a4a6735-c106-41b9-9833-9c5ad9d8776b) + ) (label "RX_Host" (at 107.95 73.66 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid 8fba2855-af7f-4a1d-9167-3a704234be15) ) - (label "SCL_Client" (at 95.25 168.91 0) - (effects (font (size 1.27 1.27)) (justify left bottom)) - (uuid a738e1db-0d5b-446b-8ac2-23d7e5b118b2) - ) - (label "SDA_Host" (at 97.79 60.96 0) - (effects (font (size 1.27 1.27)) (justify left bottom)) - (uuid aaec749b-7c86-40c4-b3f2-851d596df170) - ) - (label "SCL_Host" (at 97.79 58.42 0) - (effects (font (size 1.27 1.27)) (justify left bottom)) - (uuid cfcee9ec-667d-47e8-8416-db27b549a0b5) - ) (label "SDA_Client" (at 153.67 76.2 180) (effects (font (size 1.27 1.27)) (justify right bottom)) (uuid d40debd5-dfaf-4455-9726-5e405a051c56) ) - (label "SDA_Client" (at 95.25 166.37 0) - (effects (font (size 1.27 1.27)) (justify left bottom)) - (uuid dbf4e7b2-562e-4d03-aaef-14a23fbc4348) + (label "ADC_PIN" (at 234.95 201.93 180) + (effects (font (size 1.27 1.27)) (justify right bottom)) + (uuid f41b0e5b-5450-4d28-9cb9-b9343debaee6) ) - (symbol (lib_id "power:+5V") (at 101.6 86.36 270) (unit 1) + (symbol (lib_id "power:+5V") (at 97.79 86.36 270) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid 00190d1d-53b9-40f9-aa34-1801a57dda48) - (property "Reference" "#PWR08" (id 0) (at 97.79 86.36 0) + (property "Reference" "#PWR08" (id 0) (at 93.98 86.36 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+5V" (id 1) (at 106.68 86.3599 90) + (property "Value" "+5V" (id 1) (at 102.87 86.3599 90) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "" (id 2) (at 101.6 86.36 0) + (property "Footprint" "" (id 2) (at 97.79 86.36 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 101.6 86.36 0) + (property "Datasheet" "" (id 3) (at 97.79 86.36 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 8163787d-6bdc-470e-a655-0a16bf3c3062)) @@ -2569,24 +2874,6 @@ (pin "1" (uuid 7b234a14-50f1-4a73-8381-f098923dd643)) ) - (symbol (lib_id "power:GNDREF") (at 81.28 102.87 270) (unit 1) - (in_bom yes) (on_board yes) - (uuid 0e21d108-6018-45c5-96c0-db01df4cbffa) - (property "Reference" "#PWR03" (id 0) (at 74.93 102.87 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "GNDREF" (id 1) (at 69.85 102.87 90) - (effects (font (size 1.27 1.27)) (justify left)) - ) - (property "Footprint" "" (id 2) (at 81.28 102.87 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Datasheet" "" (id 3) (at 81.28 102.87 0) - (effects (font (size 1.27 1.27)) hide) - ) - (pin "1" (uuid bd2a50b4-7b4f-403e-96cf-76afd2ffcc53)) - ) - (symbol (lib_id "uibk:RS-485-Connector") (at 251.46 93.98 0) (unit 1) (in_bom yes) (on_board yes) (uuid 13824f77-72fd-45ed-bcb4-bbe829cbc3cc) @@ -2624,6 +2911,21 @@ (pin "3" (uuid 01a8d8e5-f512-4fb0-b9c5-dd4198ff63bc)) ) + (symbol (lib_id "Device:LED") (at 252.73 152.4 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 1520cd40-bc4f-47d5-a60d-f3dfa96cd800) + (property "Reference" "D?" (id 0) (at 252.73 158.75 0)) + (property "Value" "LED" (id 1) (at 252.73 156.21 0)) + (property "Footprint" "LED_THT:LED_D1.8mm_W3.3mm_H2.4mm" (id 2) (at 252.73 152.4 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 252.73 152.4 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid f50d0560-00c9-4cf9-b855-d276ffdad699)) + (pin "2" (uuid 79a727e6-3d4a-4879-aa54-8af120452417)) + ) + (symbol (lib_id "Device:Battery_Cell") (at 424.18 162.56 0) (unit 1) (in_bom yes) (on_board yes) (uuid 16b3df30-0cf6-4075-98fa-998848f8569f) @@ -2693,6 +2995,39 @@ (pin "1" (uuid 0d45a45e-ac78-45c8-b2d9-8d14617d3faf)) ) + (symbol (lib_id "power:+5V") (at 204.47 80.01 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 1e453853-9795-4c6f-b2ef-e7967e08e494) + (property "Reference" "#PWR?" (id 0) (at 204.47 83.82 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "+5V" (id 1) (at 205.74 76.2 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (property "Footprint" "" (id 2) (at 204.47 80.01 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 204.47 80.01 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid b5fbebac-b727-4a55-bc33-fddc73994c1d)) + ) + + (symbol (lib_id "Jumper:Jumper_2_Open") (at 229.87 152.4 180) (unit 1) + (in_bom yes) (on_board yes) + (uuid 1ff1d010-e182-42e0-9a26-9059348c17e2) + (property "Reference" "JP?" (id 0) (at 229.87 158.75 0)) + (property "Value" "Jumper_2_Open" (id 1) (at 229.87 156.21 0)) + (property "Footprint" "" (id 2) (at 229.87 152.4 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 229.87 152.4 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 498d28b7-9a26-4599-8816-9bcbd186852c)) + (pin "2" (uuid 21ef3511-7a00-4fb7-801a-e5438cadecf3)) + ) + (symbol (lib_id "uibk:dc_dc_converter") (at 95.25 137.16 0) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid 23bfa2ab-da17-4ac0-951f-bdd17bf0b3bf) @@ -2711,22 +3046,55 @@ (pin "5" (uuid 0e1177e6-bc2c-4232-84ba-e0c5d78043e9)) ) - (symbol (lib_id "power:GNDREF") (at 172.72 194.31 0) (unit 1) + (symbol (lib_id "power:GNDREF") (at 88.9 252.73 0) (unit 1) (in_bom yes) (on_board yes) (uuid 23fd8b05-231f-4776-bc61-790fd53ae890) - (property "Reference" "#PWR013" (id 0) (at 172.72 200.66 0) + (property "Reference" "#PWR013" (id 0) (at 88.9 259.08 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GNDREF" (id 1) (at 172.72 201.93 90)) - (property "Footprint" "" (id 2) (at 172.72 194.31 0) + (property "Value" "GNDREF" (id 1) (at 88.9 260.35 90)) + (property "Footprint" "" (id 2) (at 88.9 252.73 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 172.72 194.31 0) + (property "Datasheet" "" (id 3) (at 88.9 252.73 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 1bdf50ed-1741-4a5c-82f7-12f6eee9323f)) ) + (symbol (lib_id "Device:R") (at 233.68 148.59 270) (unit 1) + (in_bom yes) (on_board yes) + (uuid 24d31037-c823-44d4-a52b-22fd26b59a75) + (property "Reference" "R?" (id 0) (at 233.68 146.05 90)) + (property "Value" "120 Ohm" (id 1) (at 233.68 143.51 90)) + (property "Footprint" "" (id 2) (at 233.68 146.812 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 233.68 148.59 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 41a10a0e-c4f6-4afe-8917-fe766cfb8422)) + (pin "2" (uuid def80f1e-970a-4114-a2d7-ff0963b547bb)) + ) + + (symbol (lib_id "power:+12V") (at 256.54 152.4 270) (unit 1) + (in_bom yes) (on_board yes) (fields_autoplaced) + (uuid 2a4d15d7-e683-40cd-9ee4-6b9209be2791) + (property "Reference" "#PWR?" (id 0) (at 252.73 152.4 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "+12V" (id 1) (at 261.62 152.3999 90) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 256.54 152.4 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 256.54 152.4 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid d054e400-a5fd-4599-a034-5738cc468527)) + ) + (symbol (lib_id "power:GNDREF") (at 429.26 109.22 270) (unit 1) (in_bom yes) (on_board yes) (uuid 2cadc8f5-387c-4e00-ab00-0869eab3428e) @@ -2784,33 +3152,33 @@ (pin "4" (uuid d4be7a3c-91b9-4a27-96ed-284cf74eb514)) ) - (symbol (lib_id "power:GNDREF") (at 226.06 199.39 90) (unit 1) + (symbol (lib_id "power:GNDREF") (at 142.24 257.81 90) (unit 1) (in_bom yes) (on_board yes) (uuid 32f0c209-6f00-4a46-9af3-2af48e423807) - (property "Reference" "#PWR019" (id 0) (at 232.41 199.39 0) + (property "Reference" "#PWR019" (id 0) (at 148.59 257.81 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GNDREF" (id 1) (at 233.68 199.39 90)) - (property "Footprint" "" (id 2) (at 226.06 199.39 0) + (property "Value" "GNDREF" (id 1) (at 149.86 257.81 90)) + (property "Footprint" "" (id 2) (at 142.24 257.81 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 226.06 199.39 0) + (property "Datasheet" "" (id 3) (at 142.24 257.81 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 739270eb-1386-4034-8a84-d495a6f373af)) ) - (symbol (lib_id "power:GND") (at 472.44 72.39 0) (unit 1) + (symbol (lib_id "power:GND") (at 468.63 72.39 0) (unit 1) (in_bom yes) (on_board yes) (uuid 3310e8ca-e953-47fb-9c0c-7d418b852445) - (property "Reference" "#PWR038" (id 0) (at 472.44 78.74 0) + (property "Reference" "#PWR038" (id 0) (at 468.63 78.74 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 467.36 73.66 0)) - (property "Footprint" "" (id 2) (at 472.44 72.39 0) + (property "Value" "GND" (id 1) (at 464.82 73.66 0)) + (property "Footprint" "" (id 2) (at 468.63 72.39 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 472.44 72.39 0) + (property "Datasheet" "" (id 3) (at 468.63 72.39 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid ccdee5f3-7d57-4840-b1df-d197ad9a140f)) @@ -2889,19 +3257,19 @@ (pin "1" (uuid 40fc29c9-dd8c-4b66-8db5-8a069b7153ce)) ) - (symbol (lib_id "Transistor_FET:IRLZ34N") (at 215.9 137.16 0) (unit 1) + (symbol (lib_id "Transistor_FET:IRLZ34N") (at 215.9 166.37 0) (unit 1) (in_bom yes) (on_board yes) (uuid 47d050c3-85da-45ce-8c1f-1b1d33b5f8f1) - (property "Reference" "Q2" (id 0) (at 214.63 125.73 0) + (property "Reference" "Q2" (id 0) (at 207.01 157.48 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "IRLZ34N" (id 1) (at 214.63 128.27 0) + (property "Value" "IRLZ34N" (id 1) (at 207.01 160.02 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Package_TO_SOT_THT:TO-220-3_Vertical" (id 2) (at 222.25 139.065 0) + (property "Footprint" "Package_TO_SOT_THT:TO-220-3_Vertical" (id 2) (at 222.25 168.275 0) (effects (font (size 1.27 1.27) italic) (justify left) hide) ) - (property "Datasheet" "http://www.infineon.com/dgdl/irlz34npbf.pdf?fileId=5546d462533600a40153567206892720" (id 3) (at 215.9 137.16 0) + (property "Datasheet" "http://www.infineon.com/dgdl/irlz34npbf.pdf?fileId=5546d462533600a40153567206892720" (id 3) (at 215.9 166.37 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) (pin "1" (uuid 5033ca18-a8bf-43c1-96f0-43fdcf726c78)) @@ -2909,6 +3277,40 @@ (pin "3" (uuid 9ce1d5d2-66b0-4377-b38d-bef4e6ece82d)) ) + (symbol (lib_id "Device:C_Small") (at 473.71 60.96 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 4aedec17-c42f-45a2-8d55-fd3d1d7a10ab) + (property "Reference" "C?" (id 0) (at 472.44 65.405 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "0.1 uF" (id 1) (at 470.535 67.31 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 473.71 60.96 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 473.71 60.96 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid ad1b5854-e28a-458c-9f96-4ca48fb6a67c)) + (pin "2" (uuid 4cc3c778-abd3-4611-a149-8c95291d086b)) + ) + + (symbol (lib_id "Device:R") (at 251.46 195.58 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 4b3762d7-5dc5-46dc-adb1-aae5ec7b91a1) + (property "Reference" "R?" (id 0) (at 248.92 195.58 90)) + (property "Value" "68 kOhm" (id 1) (at 246.38 195.58 90)) + (property "Footprint" "" (id 2) (at 249.682 195.58 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 251.46 195.58 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 9283bae4-0bd1-48ff-9f66-36b846389fc8)) + (pin "2" (uuid 67835112-fbaa-4487-954e-540d2d891be6)) + ) + (symbol (lib_id "power:GNDREF") (at 179.07 86.36 90) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid 4c0f9516-124a-44ee-9db4-21f965fd9f2f) @@ -2960,6 +3362,21 @@ (pin "1" (uuid ab19f6b2-db33-4c6c-99d6-489ac034ee87)) ) + (symbol (lib_id "Device:R") (at 251.46 209.55 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 517886a2-b90a-49c8-ac19-ff2608fe41cd) + (property "Reference" "R?" (id 0) (at 248.92 209.55 90)) + (property "Value" "20 kOhm" (id 1) (at 246.38 209.55 90)) + (property "Footprint" "" (id 2) (at 249.682 209.55 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 251.46 209.55 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 783ea30b-a8e8-4cf1-acb8-101fd47e9221)) + (pin "2" (uuid 4befd28b-b093-4666-aad7-f13e38cf9f49)) + ) + (symbol (lib_id "power:+12V") (at 72.39 138.43 0) (unit 1) (in_bom yes) (on_board yes) (uuid 51813aeb-1a64-4ba7-8caf-61d78665d9ad) @@ -2978,17 +3395,36 @@ (pin "1" (uuid aaa3cae4-f2cd-48ed-96d2-f8b2209af81f)) ) - (symbol (lib_id "forte:ESP32-CAM") (at 210.82 196.85 0) (unit 1) + (symbol (lib_id "Device:C") (at 238.76 205.74 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 5348e2aa-46e5-4eb8-88ee-f205a984bcc2) + (property "Reference" "C?" (id 0) (at 229.87 205.74 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "C 100nF Ceramic" (id 1) (at 218.44 208.28 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 239.7252 209.55 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 238.76 205.74 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 92119d87-4df4-4835-9c4a-92648c3861d7)) + (pin "2" (uuid ef51e4ab-d573-4067-b8fb-0d927f7d9690)) + ) + + (symbol (lib_id "forte:ESP32-CAM") (at 127 255.27 0) (unit 1) (in_bom yes) (on_board yes) (uuid 56bf9716-f112-4746-8dc9-7d19ee154c4c) - (property "Reference" "U7" (id 0) (at 210.82 177.8 0)) - (property "Value" "ESP32-CAM" (id 1) (at 210.82 196.85 0) + (property "Reference" "U7" (id 0) (at 127 236.22 0)) + (property "Value" "ESP32-CAM" (id 1) (at 127 255.27 0) (effects (font (size 1.27 1.27)) (justify left bottom) hide) ) - (property "Footprint" "forte:ESP32-CAM" (id 2) (at 210.82 196.85 0) + (property "Footprint" "forte:ESP32-CAM" (id 2) (at 127 255.27 0) (effects (font (size 1.27 1.27)) (justify left bottom) hide) ) - (property "Datasheet" "" (id 3) (at 210.82 196.85 0) + (property "Datasheet" "" (id 3) (at 127 255.27 0) (effects (font (size 1.27 1.27)) (justify left bottom) hide) ) (pin "P$1" (uuid d1845bd1-280b-4199-bb38-ef2a25fdd704)) @@ -3009,46 +3445,46 @@ (pin "P$9" (uuid 6229e740-3c8a-4ef3-99fa-baa27ffaccb0)) ) - (symbol (lib_id "Device:R") (at 207.01 137.16 90) (unit 1) + (symbol (lib_id "Device:R") (at 207.01 166.37 90) (unit 1) (in_bom yes) (on_board yes) (uuid 5944c386-6b3f-40ba-b611-b1acc3be5861) - (property "Reference" "R3" (id 0) (at 207.01 139.7 90)) - (property "Value" "330 Ohm" (id 1) (at 207.01 142.24 90)) - (property "Footprint" "" (id 2) (at 207.01 138.938 90) + (property "Reference" "R3" (id 0) (at 207.01 168.91 90)) + (property "Value" "330 Ohm" (id 1) (at 207.01 171.45 90)) + (property "Footprint" "" (id 2) (at 207.01 168.148 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 207.01 137.16 0) + (property "Datasheet" "~" (id 3) (at 207.01 166.37 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid a3e99e45-894f-48e3-9ae9-2abae344b442)) (pin "2" (uuid 2822687a-6f2f-4e25-a203-e042accf05dc)) ) - (symbol (lib_id "power:GND") (at 472.44 86.36 0) (unit 1) + (symbol (lib_id "power:GND") (at 468.63 86.36 0) (unit 1) (in_bom yes) (on_board yes) (uuid 59f067db-4136-4174-9a80-eb93da2c2052) - (property "Reference" "#PWR039" (id 0) (at 472.44 92.71 0) + (property "Reference" "#PWR039" (id 0) (at 468.63 92.71 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 467.36 87.63 0)) - (property "Footprint" "" (id 2) (at 472.44 86.36 0) + (property "Value" "GND" (id 1) (at 464.82 87.63 0)) + (property "Footprint" "" (id 2) (at 468.63 86.36 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 472.44 86.36 0) + (property "Datasheet" "" (id 3) (at 468.63 86.36 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid e7cf65b5-0ce4-4190-b2da-73383d765c3f)) ) - (symbol (lib_id "Device:R") (at 204.47 104.14 90) (unit 1) + (symbol (lib_id "Device:R") (at 204.47 128.27 90) (unit 1) (in_bom yes) (on_board yes) (uuid 5b017eb2-e2c4-46c7-b421-9fd07701b866) - (property "Reference" "R2" (id 0) (at 204.47 106.68 90)) - (property "Value" "330 Ohm" (id 1) (at 204.47 109.22 90)) - (property "Footprint" "" (id 2) (at 204.47 105.918 90) + (property "Reference" "R2" (id 0) (at 204.47 130.81 90)) + (property "Value" "330 Ohm" (id 1) (at 204.47 133.35 90)) + (property "Footprint" "" (id 2) (at 204.47 130.048 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 204.47 104.14 0) + (property "Datasheet" "~" (id 3) (at 204.47 128.27 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 72deee35-74c1-485a-91cd-4d2bd777feb1)) @@ -3100,25 +3536,6 @@ (pin "9" (uuid 08215602-e089-4b96-8f41-7c0c29d3f689)) ) - (symbol (lib_id "Device:R") (at 66.04 154.94 0) (unit 1) - (in_bom yes) (on_board yes) (fields_autoplaced) - (uuid 5e9b4dad-0a0c-45fc-aebf-bbddb6aad4ad) - (property "Reference" "R1" (id 0) (at 69.85 153.6699 0) - (effects (font (size 1.27 1.27)) (justify left)) - ) - (property "Value" "1 MΩ" (id 1) (at 69.85 156.2099 0) - (effects (font (size 1.27 1.27)) (justify left)) - ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal" (id 2) (at 64.262 154.94 90) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Datasheet" "~" (id 3) (at 66.04 154.94 0) - (effects (font (size 1.27 1.27)) hide) - ) - (pin "1" (uuid 5e611c54-7ce2-4ce1-81c8-5ef77353ea19)) - (pin "2" (uuid 3d468747-f5bc-4287-bf46-04349dc409e0)) - ) - (symbol (lib_name "dendrometer_1") (lib_id "uibk:dendrometer") (at 478.79 78.74 0) (unit 1) (in_bom yes) (on_board yes) (uuid 5ef9e275-183c-4f81-8247-01e7b56b4e0f) @@ -3158,19 +3575,19 @@ (pin "1" (uuid d9297b7f-672b-4cad-ad89-64773910511b)) ) - (symbol (lib_id "power:+5V") (at 172.72 191.77 270) (unit 1) + (symbol (lib_id "power:+5V") (at 88.9 250.19 270) (unit 1) (in_bom yes) (on_board yes) (uuid 6c2586a8-7088-4a46-a8a9-240840d402b8) - (property "Reference" "#PWR012" (id 0) (at 168.91 191.77 0) + (property "Reference" "#PWR012" (id 0) (at 85.09 250.19 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+5V" (id 1) (at 177.8 194.31 90) + (property "Value" "+5V" (id 1) (at 93.98 252.73 90) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "" (id 2) (at 172.72 191.77 0) + (property "Footprint" "" (id 2) (at 88.9 250.19 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 172.72 191.77 0) + (property "Datasheet" "" (id 3) (at 88.9 250.19 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid fa15bd61-d47b-4478-9510-7605251d34b2)) @@ -3213,27 +3630,6 @@ (pin "1" (uuid 53b6c656-9a0d-4153-9329-a3f0986ce3f6)) ) - (symbol (lib_id "Analog_ADC:INA219AxD") (at 85.09 171.45 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid 7519f30a-3bea-4a77-90fb-36749b0a2197) - (property "Reference" "U3" (id 0) (at 74.93 182.88 0)) - (property "Value" "INA219AxD" (id 1) (at 74.93 185.42 0)) - (property "Footprint" "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm" (id 2) (at 105.41 180.34 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Datasheet" "http://www.ti.com/lit/ds/symlink/ina219.pdf" (id 3) (at 93.98 173.99 0) - (effects (font (size 1.27 1.27)) hide) - ) - (pin "1" (uuid f456c965-c3bc-4c29-945b-03182c7312cf)) - (pin "2" (uuid ec5c5fdf-38b7-4e83-99a0-8f9bff467093)) - (pin "3" (uuid c2a7e0e6-3823-4184-9464-9b7063dc4e3f)) - (pin "4" (uuid 010cebf6-fa45-45a4-a1eb-bd5a1ebdde6a)) - (pin "5" (uuid df0f0e0d-4427-4ec9-bc22-6ae66a2051e1)) - (pin "6" (uuid 414dd98f-63cd-4721-8a7a-f183e24683d9)) - (pin "7" (uuid 6bd6c987-a8c7-4d70-8217-d6d8febff68e)) - (pin "8" (uuid 3d77d610-578a-4153-bc3e-3dd809b3fd7f)) - ) - (symbol (lib_id "uibk:RS-485-Connector") (at 251.46 125.73 0) (unit 1) (in_bom yes) (on_board yes) (uuid 79caa721-af3c-4c55-9bc8-06b1f893b5e6) @@ -3255,19 +3651,19 @@ (pin "4" (uuid 5cf3a4bc-da49-4a84-9e1e-b8198f87d91a)) ) - (symbol (lib_id "power:+5V") (at 195.58 181.61 90) (unit 1) + (symbol (lib_id "power:+5V") (at 111.76 240.03 90) (unit 1) (in_bom yes) (on_board yes) (uuid 82041eba-df4e-45ad-9dce-847a81fc2f6e) - (property "Reference" "#PWR015" (id 0) (at 199.39 181.61 0) + (property "Reference" "#PWR015" (id 0) (at 115.57 240.03 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+5V" (id 1) (at 191.77 179.07 90) + (property "Value" "+5V" (id 1) (at 107.95 237.49 90) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "" (id 2) (at 195.58 181.61 0) + (property "Footprint" "" (id 2) (at 111.76 240.03 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 195.58 181.61 0) + (property "Datasheet" "" (id 3) (at 111.76 240.03 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 0486b730-6580-4b7e-8277-2b5aca801d8a)) @@ -3317,6 +3713,26 @@ (pin "9" (uuid 7309c336-b4a2-4ece-b0c3-7f1859c41b62)) ) + (symbol (lib_id "Transistor_FET:IRF9540N") (at 248.92 182.88 0) (unit 1) + (in_bom yes) (on_board yes) (fields_autoplaced) + (uuid 8688ba25-c54e-4329-981c-e15dc91734f1) + (property "Reference" "Q?" (id 0) (at 259.08 181.6099 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "IRF9540N" (id 1) (at 259.08 184.1499 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Package_TO_SOT_THT:TO-220-3_Vertical" (id 2) (at 254 184.785 0) + (effects (font (size 1.27 1.27) italic) (justify left) hide) + ) + (property "Datasheet" "http://www.irf.com/product-info/datasheets/data/irf9540n.pdf" (id 3) (at 248.92 182.88 0) + (effects (font (size 1.27 1.27)) (justify left) hide) + ) + (pin "1" (uuid 3f5c27dc-fc9a-4086-82c7-2bd6401a9472)) + (pin "2" (uuid 4fb4532b-df21-4d94-852f-3d2ba42d3ae6)) + (pin "3" (uuid 108a0a59-7c70-49d1-a6f5-4020095391d2)) + ) + (symbol (lib_id "Device:LED") (at 462.28 106.68 180) (unit 1) (in_bom yes) (on_board yes) (uuid 89a164f8-0153-4af9-9b77-dc04013e4798) @@ -3366,6 +3782,24 @@ (pin "1" (uuid bfd8207a-8d59-4d5d-a7be-9fd21d0de119)) ) + (symbol (lib_id "power:GNDREF") (at 251.46 213.36 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid 8dd1ff2f-a394-445b-932b-50d69727bf2a) + (property "Reference" "#PWR?" (id 0) (at 251.46 219.71 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "GNDREF" (id 1) (at 254 218.44 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (property "Footprint" "" (id 2) (at 251.46 213.36 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 251.46 213.36 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid bac335ba-169c-4f6c-a3ae-7a94861efbe3)) + ) + (symbol (lib_id "power:+5V") (at 248.92 101.6 90) (unit 1) (in_bom yes) (on_board yes) (uuid 916883d7-2521-4bd5-986b-03629d5fad2d) @@ -3420,40 +3854,22 @@ (pin "5" (uuid e3a28bac-a2d4-4e2f-aca7-beb80e5995a8)) ) - (symbol (lib_id "power:GND") (at 472.44 44.45 0) (unit 1) + (symbol (lib_id "power:GND") (at 468.63 44.45 0) (unit 1) (in_bom yes) (on_board yes) (uuid 99d9ff17-57a8-4f06-af2b-e082626feae3) - (property "Reference" "#PWR036" (id 0) (at 472.44 50.8 0) + (property "Reference" "#PWR036" (id 0) (at 468.63 50.8 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 467.36 45.72 0)) - (property "Footprint" "" (id 2) (at 472.44 44.45 0) + (property "Value" "GND" (id 1) (at 464.82 45.72 0)) + (property "Footprint" "" (id 2) (at 468.63 44.45 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 472.44 44.45 0) + (property "Datasheet" "" (id 3) (at 468.63 44.45 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid eee5717b-608e-4fa2-8af4-0fc3225034f8)) ) - (symbol (lib_id "power:+5V") (at 81.28 105.41 90) (unit 1) - (in_bom yes) (on_board yes) - (uuid 9ccacef9-e6b1-44d0-a3d9-beef40245297) - (property "Reference" "#PWR04" (id 0) (at 85.09 105.41 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "+5V" (id 1) (at 73.66 105.41 90) - (effects (font (size 1.27 1.27)) (justify right)) - ) - (property "Footprint" "" (id 2) (at 81.28 105.41 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Datasheet" "" (id 3) (at 81.28 105.41 0) - (effects (font (size 1.27 1.27)) hide) - ) - (pin "1" (uuid 82263057-eed5-4f20-a1e5-aa48556452fc)) - ) - (symbol (lib_id "Jumper:Jumper_2_Open") (at 485.14 106.68 0) (unit 1) (in_bom yes) (on_board yes) (uuid 9fda036f-6d43-433b-8a87-33b3bad03bd3) @@ -3487,17 +3903,17 @@ (pin "1" (uuid 12f73686-4ce5-4a43-affa-aa2ecc7b3b47)) ) - (symbol (lib_id "power:GNDREF") (at 215.9 116.84 0) (unit 1) + (symbol (lib_id "power:GNDREF") (at 215.9 140.97 0) (unit 1) (in_bom yes) (on_board yes) (uuid ab44241f-5824-4aaf-909b-0b63e03f0101) - (property "Reference" "#PWR017" (id 0) (at 215.9 123.19 0) + (property "Reference" "#PWR017" (id 0) (at 215.9 147.32 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GNDREF" (id 1) (at 215.9 121.92 0)) - (property "Footprint" "" (id 2) (at 215.9 116.84 0) + (property "Value" "GNDREF" (id 1) (at 215.9 146.05 0)) + (property "Footprint" "" (id 2) (at 215.9 140.97 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 215.9 116.84 0) + (property "Datasheet" "" (id 3) (at 215.9 140.97 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 7a261401-ad00-43e6-a85a-a606a9935d33)) @@ -3596,35 +4012,19 @@ (pin "9" (uuid f174de49-b53e-41c4-9ba6-6fa32422bec2)) ) - (symbol (lib_id "power:GNDREF") (at 85.09 181.61 0) (unit 1) - (in_bom yes) (on_board yes) - (uuid b8037a8d-bac4-44a6-9a3b-e193829d51c0) - (property "Reference" "#PWR06" (id 0) (at 85.09 187.96 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Value" "GNDREF" (id 1) (at 85.09 186.69 0)) - (property "Footprint" "" (id 2) (at 85.09 181.61 0) - (effects (font (size 1.27 1.27)) hide) - ) - (property "Datasheet" "" (id 3) (at 85.09 181.61 0) - (effects (font (size 1.27 1.27)) hide) - ) - (pin "1" (uuid ca95f951-7818-4079-8290-55fc52443a88)) - ) - - (symbol (lib_id "uibk:I2C-Connector") (at 170.18 199.39 180) (unit 1) + (symbol (lib_id "uibk:I2C-Connector") (at 86.36 257.81 180) (unit 1) (in_bom yes) (on_board yes) (uuid b88a3a7d-57cf-4bf5-85af-32759e882807) - (property "Reference" "U6" (id 0) (at 158.75 191.77 0) + (property "Reference" "U6" (id 0) (at 74.93 250.19 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "I2C-Connector SHT85 " (id 1) (at 158.75 189.23 0) + (property "Value" "I2C-Connector SHT85 " (id 1) (at 74.93 247.65 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Connector_JST:JST_XH_B4B-XH-AM_1x04_P2.50mm_Vertical" (id 2) (at 170.18 199.39 0) + (property "Footprint" "Connector_JST:JST_XH_B4B-XH-AM_1x04_P2.50mm_Vertical" (id 2) (at 86.36 257.81 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 170.18 199.39 0) + (property "Datasheet" "" (id 3) (at 86.36 257.81 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid bd7259e0-5a84-4a40-8f5b-41a959932cac)) @@ -3651,6 +4051,21 @@ (pin "1" (uuid 503541a1-252f-4965-8646-c14672b95a5b)) ) + (symbol (lib_id "Jumper:Jumper_2_Open") (at 204.47 106.68 270) (unit 1) + (in_bom yes) (on_board yes) + (uuid b9c3ccd9-4379-40ef-abe2-111ee6cae53b) + (property "Reference" "JP?" (id 0) (at 200.66 106.68 0)) + (property "Value" "Jumper_2_Open" (id 1) (at 198.12 106.68 0)) + (property "Footprint" "" (id 2) (at 204.47 106.68 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 204.47 106.68 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 7a57f2e8-e263-4b4e-85a8-e9baefbeeee5)) + (pin "2" (uuid 6a8e22ff-9e1d-4bb4-a2c5-c90b2a45029d)) + ) + (symbol (lib_id "power:GNDREF") (at 97.79 83.82 90) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid ba70e72e-ead1-456a-99a3-7565dcaba70f) @@ -3690,22 +4105,23 @@ (pin "4" (uuid c0bc4713-4798-4b45-80d1-73ce8458cdf3)) ) - (symbol (lib_id "power:+5V") (at 85.09 161.29 0) (unit 1) - (in_bom yes) (on_board yes) (fields_autoplaced) - (uuid c2dcb0b6-a9a1-47ea-9882-8a83c6e32b2a) - (property "Reference" "#PWR05" (id 0) (at 85.09 165.1 0) - (effects (font (size 1.27 1.27)) hide) + (symbol (lib_id "Device:C_Small") (at 473.71 88.9 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid c0338325-afe6-49dc-9aae-d4320f56f254) + (property "Reference" "C?" (id 0) (at 472.44 93.345 0) + (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "+5V" (id 1) (at 87.63 160.0199 0) + (property "Value" "0.1 uF" (id 1) (at 470.535 95.25 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "" (id 2) (at 85.09 161.29 0) + (property "Footprint" "" (id 2) (at 473.71 88.9 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 85.09 161.29 0) + (property "Datasheet" "~" (id 3) (at 473.71 88.9 0) (effects (font (size 1.27 1.27)) hide) ) - (pin "1" (uuid 58c86b5e-005c-41dd-b793-463e90eb4d01)) + (pin "1" (uuid 7574bb8b-0cfd-4b4c-a653-0deaea86a640)) + (pin "2" (uuid 3c49fe24-d46f-4687-babe-1a838c9d9381)) ) (symbol (lib_name "dendrometer_1") (lib_id "uibk:dendrometer") (at 478.79 64.77 0) (unit 1) @@ -3729,19 +4145,19 @@ (pin "4" (uuid 2d8a3308-2c8b-4d1a-bf76-a88fd57fa932)) ) - (symbol (lib_id "Transistor_FET:IRLZ34N") (at 213.36 104.14 0) (unit 1) + (symbol (lib_id "Transistor_FET:IRLZ34N") (at 213.36 128.27 0) (unit 1) (in_bom yes) (on_board yes) (uuid c6fef39e-1b05-49fe-9955-0979381cccaa) - (property "Reference" "Q1" (id 0) (at 205.74 95.25 0) + (property "Reference" "Q1" (id 0) (at 205.74 119.38 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Value" "IRLZ34N" (id 1) (at 205.74 97.79 0) + (property "Value" "IRLZ34N" (id 1) (at 205.74 121.92 0) (effects (font (size 1.27 1.27)) (justify left)) ) - (property "Footprint" "Package_TO_SOT_THT:TO-220-3_Vertical" (id 2) (at 219.71 106.045 0) + (property "Footprint" "Package_TO_SOT_THT:TO-220-3_Vertical" (id 2) (at 219.71 130.175 0) (effects (font (size 1.27 1.27) italic) (justify left) hide) ) - (property "Datasheet" "http://www.infineon.com/dgdl/irlz34npbf.pdf?fileId=5546d462533600a40153567206892720" (id 3) (at 213.36 104.14 0) + (property "Datasheet" "http://www.infineon.com/dgdl/irlz34npbf.pdf?fileId=5546d462533600a40153567206892720" (id 3) (at 213.36 128.27 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) (pin "1" (uuid 28e91b6f-1213-4226-9846-a95154e0a399)) @@ -3749,6 +4165,76 @@ (pin "3" (uuid 3f3ffda4-0ebb-4c52-bfe9-e548eaf2467e)) ) + (symbol (lib_id "power:+12V") (at 233.68 168.91 0) (unit 1) + (in_bom yes) (on_board yes) (fields_autoplaced) + (uuid c8752867-8046-40ea-a1f4-28bcf53229bd) + (property "Reference" "#PWR?" (id 0) (at 233.68 172.72 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "+12V" (id 1) (at 236.22 167.6399 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 233.68 168.91 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 233.68 168.91 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 9b77351b-43bb-4181-a0f0-d357f3c99ca1)) + ) + + (symbol (lib_id "Device:R") (at 204.47 93.98 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid ca61d706-7616-405a-a7f1-080147d62f1b) + (property "Reference" "R?" (id 0) (at 210.82 93.98 90)) + (property "Value" "640 Ohm" (id 1) (at 208.28 93.98 90)) + (property "Footprint" "" (id 2) (at 202.692 93.98 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 204.47 93.98 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid f09f3057-249b-4786-a528-680aaf1de4a4)) + (pin "2" (uuid b4e7ff5d-1d56-4586-8650-5c0a3663a280)) + ) + + (symbol (lib_id "power:GNDREF") (at 238.76 209.55 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid cd9327ab-2edb-4205-9d71-06ba24c11518) + (property "Reference" "#PWR?" (id 0) (at 238.76 215.9 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "GNDREF" (id 1) (at 241.3 214.63 0) + (effects (font (size 1.27 1.27)) (justify right)) + ) + (property "Footprint" "" (id 2) (at 238.76 209.55 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 238.76 209.55 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 22729e89-a6b6-468e-b3e7-3dada99ddca4)) + ) + + (symbol (lib_id "Device:C_Small") (at 473.71 74.93 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid ce0634af-e0c8-49a5-bb2c-1c87bd16369a) + (property "Reference" "C?" (id 0) (at 472.44 79.375 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "0.1 uF" (id 1) (at 470.535 81.28 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 473.71 74.93 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 473.71 74.93 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 1c78e9a6-1ade-414d-85c2-d0b03b6e6312)) + (pin "2" (uuid c7d9421f-f77b-44a4-aadd-76569e0d0f4f)) + ) + (symbol (lib_id "power:GNDREF") (at 105.41 144.78 90) (unit 1) (in_bom yes) (on_board yes) (uuid cfc9bdc1-2672-4e24-a0c7-bbfab43286b0) @@ -3767,38 +4253,32 @@ (pin "1" (uuid 7641bacd-8725-45c0-a2ba-f520e4f1d215)) ) - (symbol (lib_id "uibk:I2C-Connector") (at 83.82 97.79 0) (unit 1) + (symbol (lib_id "Device:R") (at 233.68 176.53 180) (unit 1) (in_bom yes) (on_board yes) - (uuid d6b191bd-961f-405f-8824-02ac3b8e1878) - (property "Reference" "U1" (id 0) (at 95.25 105.41 0) - (effects (font (size 1.27 1.27)) (justify left)) - ) - (property "Value" "I2C-Connector DS3231" (id 1) (at 95.25 107.95 0) - (effects (font (size 1.27 1.27)) (justify left)) - ) - (property "Footprint" "Connector_JST:JST_XH_B4B-XH-AM_1x04_P2.50mm_Vertical" (id 2) (at 83.82 97.79 0) + (uuid d8ca22ad-77ce-4573-93a7-b7e97b0a028d) + (property "Reference" "R?" (id 0) (at 236.22 176.53 90)) + (property "Value" "10 kOhm" (id 1) (at 238.76 176.53 90)) + (property "Footprint" "" (id 2) (at 235.458 176.53 90) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 83.82 97.79 0) + (property "Datasheet" "~" (id 3) (at 233.68 176.53 0) (effects (font (size 1.27 1.27)) hide) ) - (pin "1" (uuid a84bc96f-50fb-4cd1-830a-20192549c8eb)) - (pin "2" (uuid 1d73dfae-7fae-4de0-83db-0a86b574640f)) - (pin "3" (uuid 63c2407d-6a77-4615-9dd1-724d84d4391f)) - (pin "4" (uuid 8a299b84-2bc7-4288-8873-3856f52f442b)) + (pin "1" (uuid a177b6e3-9a06-4541-9529-897d89710448)) + (pin "2" (uuid 6599ec71-79f0-452c-a273-2d99fb0f2e64)) ) - (symbol (lib_id "power:GND") (at 472.44 58.42 0) (unit 1) + (symbol (lib_id "power:GND") (at 468.63 58.42 0) (unit 1) (in_bom yes) (on_board yes) (uuid da123322-e080-4c39-b785-101c21ab5d6d) - (property "Reference" "#PWR037" (id 0) (at 472.44 64.77 0) + (property "Reference" "#PWR037" (id 0) (at 468.63 64.77 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 467.36 59.69 0)) - (property "Footprint" "" (id 2) (at 472.44 58.42 0) + (property "Value" "GND" (id 1) (at 464.82 59.69 0)) + (property "Footprint" "" (id 2) (at 468.63 58.42 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 472.44 58.42 0) + (property "Datasheet" "" (id 3) (at 468.63 58.42 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 32648f79-5891-4ff3-a12c-671c7fb07136)) @@ -3820,6 +4300,40 @@ (pin "1" (uuid aae3832a-728d-49ae-90fe-f5c52cd90d6c)) ) + (symbol (lib_id "Device:LED") (at 204.47 83.82 90) (unit 1) + (in_bom yes) (on_board yes) + (uuid e1b1d03d-51d5-4c18-89b5-11ec09794f26) + (property "Reference" "D?" (id 0) (at 210.82 83.82 0)) + (property "Value" "LED" (id 1) (at 208.28 83.82 0)) + (property "Footprint" "LED_THT:LED_D1.8mm_W3.3mm_H2.4mm" (id 2) (at 204.47 83.82 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 204.47 83.82 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 2e88f852-d0a7-4d59-b35a-fe84f6b0e13a)) + (pin "2" (uuid 555a6e51-09a5-49fc-aa83-d230a3fd269b)) + ) + + (symbol (lib_id "Device:C_Small") (at 473.4073 46.99 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid e3ff78d3-bfe5-48d1-b798-a94febbfeca7) + (property "Reference" "C?" (id 0) (at 472.1373 51.435 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "0.1 uF" (id 1) (at 470.2323 53.34 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "" (id 2) (at 473.4073 46.99 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 473.4073 46.99 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid eacd146c-9efe-42da-9d65-1db51d04dca3)) + (pin "2" (uuid b44fb03e-5fa6-44a6-a01c-de9c3df7db19)) + ) + (symbol (lib_id "power:GND") (at 461.01 127 0) (unit 1) (in_bom yes) (on_board yes) (uuid e7db5864-b303-4e42-886b-829282675dc1) @@ -3870,17 +4384,17 @@ (pin "1" (uuid 05b0c28f-1fd5-402f-b148-31434458d51e)) ) - (symbol (lib_id "power:GNDREF") (at 218.44 142.24 0) (unit 1) + (symbol (lib_id "power:GNDREF") (at 218.44 171.45 0) (unit 1) (in_bom yes) (on_board yes) (uuid ee827eec-119b-46d5-a141-b829001bdcd5) - (property "Reference" "#PWR018" (id 0) (at 218.44 148.59 0) + (property "Reference" "#PWR018" (id 0) (at 218.44 177.8 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GNDREF" (id 1) (at 218.44 147.32 0)) - (property "Footprint" "" (id 2) (at 218.44 142.24 0) + (property "Value" "GNDREF" (id 1) (at 218.44 176.53 0)) + (property "Footprint" "" (id 2) (at 218.44 171.45 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 218.44 142.24 0) + (property "Datasheet" "" (id 3) (at 218.44 171.45 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid de764299-4ed0-4035-b2ec-615803dd6a29)) @@ -3955,6 +4469,21 @@ (pin "9" (uuid 948d3685-d9f1-4322-a112-6b58d30c06ac)) ) + (symbol (lib_id "Device:R") (at 242.57 152.4 270) (unit 1) + (in_bom yes) (on_board yes) + (uuid f98c5905-7dd3-4fb9-a975-efdeb19e7e32) + (property "Reference" "R?" (id 0) (at 242.57 158.75 90)) + (property "Value" "2k Ohm" (id 1) (at 242.57 156.21 90)) + (property "Footprint" "" (id 2) (at 242.57 150.622 90) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "~" (id 3) (at 242.57 152.4 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 5ccb1efc-1d2f-42e5-b244-766d6857e1c3)) + (pin "2" (uuid 142cb382-1849-4a47-b09b-c2a50a28f50e)) + ) + (symbol (lib_id "power:GNDREF") (at 414.02 125.73 0) (unit 1) (in_bom yes) (on_board yes) (uuid fb7a9901-48af-4b0a-ac38-c76ef928aec9) @@ -4013,18 +4542,6 @@ (path "/34bff15f-7e52-40d2-9db6-768eff1b760c" (reference "#PWR02") (unit 1) (value "GND") (footprint "") ) - (path "/0e21d108-6018-45c5-96c0-db01df4cbffa" - (reference "#PWR03") (unit 1) (value "GNDREF") (footprint "") - ) - (path "/9ccacef9-e6b1-44d0-a3d9-beef40245297" - (reference "#PWR04") (unit 1) (value "+5V") (footprint "") - ) - (path "/c2dcb0b6-a9a1-47ea-9882-8a83c6e32b2a" - (reference "#PWR05") (unit 1) (value "+5V") (footprint "") - ) - (path "/b8037a8d-bac4-44a6-9a3b-e193829d51c0" - (reference "#PWR06") (unit 1) (value "GNDREF") (footprint "") - ) (path "/ba70e72e-ead1-456a-99a3-7565dcaba70f" (reference "#PWR07") (unit 1) (value "GNDREF") (footprint "") ) @@ -4139,15 +4656,51 @@ (path "/17571c60-6ac9-47db-be3d-d74dd7c6f66d" (reference "#PWR044") (unit 1) (value "GND") (footprint "") ) + (path "/1e453853-9795-4c6f-b2ef-e7967e08e494" + (reference "#PWR?") (unit 1) (value "+5V") (footprint "") + ) + (path "/2a4d15d7-e683-40cd-9ee4-6b9209be2791" + (reference "#PWR?") (unit 1) (value "+12V") (footprint "") + ) + (path "/8dd1ff2f-a394-445b-932b-50d69727bf2a" + (reference "#PWR?") (unit 1) (value "GNDREF") (footprint "") + ) + (path "/c8752867-8046-40ea-a1f4-28bcf53229bd" + (reference "#PWR?") (unit 1) (value "+12V") (footprint "") + ) + (path "/cd9327ab-2edb-4205-9d71-06ba24c11518" + (reference "#PWR?") (unit 1) (value "GNDREF") (footprint "") + ) (path "/b63c4589-d016-4f1c-a8b0-19ba9859e143" (reference "BT1") (unit 1) (value "Battery") (footprint "") ) (path "/16b3df30-0cf6-4075-98fa-998848f8569f" (reference "BT2") (unit 1) (value "Battery_Cell") (footprint "") ) + (path "/4aedec17-c42f-45a2-8d55-fd3d1d7a10ab" + (reference "C?") (unit 1) (value "0.1 uF") (footprint "") + ) + (path "/5348e2aa-46e5-4eb8-88ee-f205a984bcc2" + (reference "C?") (unit 1) (value "C 100nF Ceramic") (footprint "") + ) + (path "/c0338325-afe6-49dc-9aae-d4320f56f254" + (reference "C?") (unit 1) (value "0.1 uF") (footprint "") + ) + (path "/ce0634af-e0c8-49a5-bb2c-1c87bd16369a" + (reference "C?") (unit 1) (value "0.1 uF") (footprint "") + ) + (path "/e3ff78d3-bfe5-48d1-b798-a94febbfeca7" + (reference "C?") (unit 1) (value "0.1 uF") (footprint "") + ) (path "/89a164f8-0153-4af9-9b77-dc04013e4798" (reference "D1") (unit 1) (value "LED") (footprint "LED_THT:LED_D1.8mm_W3.3mm_H2.4mm") ) + (path "/1520cd40-bc4f-47d5-a60d-f3dfa96cd800" + (reference "D?") (unit 1) (value "LED") (footprint "LED_THT:LED_D1.8mm_W3.3mm_H2.4mm") + ) + (path "/e1b1d03d-51d5-4c18-89b5-11ec09794f26" + (reference "D?") (unit 1) (value "LED") (footprint "LED_THT:LED_D1.8mm_W3.3mm_H2.4mm") + ) (path "/14542937-daac-4f82-9c4b-a21fdc027506" (reference "J1") (unit 1) (value "Conn_01x03_Male") (footprint "Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical") ) @@ -4160,14 +4713,20 @@ (path "/9fda036f-6d43-433b-8a87-33b3bad03bd3" (reference "JP3") (unit 1) (value "Jumper_2_Open") (footprint "") ) + (path "/1ff1d010-e182-42e0-9a26-9059348c17e2" + (reference "JP?") (unit 1) (value "Jumper_2_Open") (footprint "") + ) + (path "/b9c3ccd9-4379-40ef-abe2-111ee6cae53b" + (reference "JP?") (unit 1) (value "Jumper_2_Open") (footprint "") + ) (path "/c6fef39e-1b05-49fe-9955-0979381cccaa" (reference "Q1") (unit 1) (value "IRLZ34N") (footprint "Package_TO_SOT_THT:TO-220-3_Vertical") ) (path "/47d050c3-85da-45ce-8c1f-1b1d33b5f8f1" (reference "Q2") (unit 1) (value "IRLZ34N") (footprint "Package_TO_SOT_THT:TO-220-3_Vertical") ) - (path "/5e9b4dad-0a0c-45fc-aebf-bbddb6aad4ad" - (reference "R1") (unit 1) (value "1 MΩ") (footprint "Resistor_THT:R_Axial_DIN0204_L3.6mm_D1.6mm_P7.62mm_Horizontal") + (path "/8688ba25-c54e-4329-981c-e15dc91734f1" + (reference "Q?") (unit 1) (value "IRF9540N") (footprint "Package_TO_SOT_THT:TO-220-3_Vertical") ) (path "/5b017eb2-e2c4-46c7-b421-9fd07701b866" (reference "R2") (unit 1) (value "330 Ohm") (footprint "") @@ -4178,15 +4737,27 @@ (path "/ff510457-9bdb-4f88-9162-9245dfc857a7" (reference "R4") (unit 1) (value "640 Ohm") (footprint "") ) - (path "/d6b191bd-961f-405f-8824-02ac3b8e1878" - (reference "U1") (unit 1) (value "I2C-Connector DS3231") (footprint "Connector_JST:JST_XH_B4B-XH-AM_1x04_P2.50mm_Vertical") + (path "/24d31037-c823-44d4-a52b-22fd26b59a75" + (reference "R?") (unit 1) (value "120 Ohm") (footprint "") + ) + (path "/4b3762d7-5dc5-46dc-adb1-aae5ec7b91a1" + (reference "R?") (unit 1) (value "68 kOhm") (footprint "") + ) + (path "/517886a2-b90a-49c8-ac19-ff2608fe41cd" + (reference "R?") (unit 1) (value "20 kOhm") (footprint "") + ) + (path "/ca61d706-7616-405a-a7f1-080147d62f1b" + (reference "R?") (unit 1) (value "640 Ohm") (footprint "") + ) + (path "/d8ca22ad-77ce-4573-93a7-b7e97b0a028d" + (reference "R?") (unit 1) (value "10 kOhm") (footprint "") + ) + (path "/f98c5905-7dd3-4fb9-a975-efdeb19e7e32" + (reference "R?") (unit 1) (value "2k Ohm") (footprint "") ) (path "/5bd09cbd-da98-43c3-a226-fa08aca96c43" (reference "U2") (unit 1) (value "LilyGo_SIM7000G") (footprint "") ) - (path "/7519f30a-3bea-4a77-90fb-36749b0a2197" - (reference "U3") (unit 1) (value "INA219AxD") (footprint "Package_SO:SOIC-8_3.9x4.9mm_P1.27mm") - ) (path "/23bfa2ab-da17-4ac0-951f-bdd17bf0b3bf" (reference "U4") (unit 1) (value "dc_dc_converter") (footprint "") ) diff --git a/host/host_central_mast/src/main.cpp b/host/host_central_mast/src/main.cpp index ff11b84e479bb8291c853164dce93869b2edf1e7..9a56051e60b31e79362556c83a8ccaf0cbc62e78 100644 --- a/host/host_central_mast/src/main.cpp +++ b/host/host_central_mast/src/main.cpp @@ -131,6 +131,14 @@ void setupSDCard(); void syncUTCTimeToRTC(); void on_data_recv(const uint8_t *mac, const uint8_t *incomingData, int len) { + response response = {}; + response.type = dataAck; + esp_read_mac(response.mac, ESP_MAC_WIFI_STA); + response.time = rtc.getEpoch(); + esp_err_t success = esp_now_send(mac, (uint8_t*) &response, sizeof(response)); + esp_log_write(ESP_LOG_DEBUG, TAG_ESPNOW.c_str(), + (success == ESP_OK) ? "Response sent\n" : "Failed to respond\n"); + esp_log_write(ESP_LOG_INFO, TAG_ESPNOW.c_str(), "Message recieved\n"); // copy received data to a char array char data[len];