diff --git a/CHANGELOG.md b/CHANGELOG.md index a968f38..5824673 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,3 +13,16 @@ All notable changes to this project will be documented in this file. - First working version. But without pressure sensor. Physical RS485 bus untested, but did test ModBus over TTL serial. +## [0.2.0] - 2024-01-04 + +### Added + +- BMP280 pressure sensor via I2C + +### Fixed + +- Calibrated wind vane (analog input) + +### Changed + +- Heater of humidiy sensor only on when humidity is above 96% (was 80%). When heater is on temperature sensor also heats up, so use temperature sensor of BMP280 when heater is on. diff --git a/README.md b/README.md index 3f20b1c..2382ccc 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Garni RS1 Passive Radiation Shield - SparkFun SEN-15901 Weather Station (wind speed, wind direction and rain fall) - Silicon Labs Si7021 (humidity and temperature) -- Bosch BMP280 (pressure and temperature) +- Bosch BMP280 (pressure) ## Measurements @@ -46,7 +46,7 @@ The measurments and order of the measurements are the same as for APRS weather r | 30006 | Rain last 24 hours | l/m2 * 100 | | 30007 | Rain since midnight | NOT IMPLEMENTED | | 30008 | Humidity | percent * 100 | -| 30009 | Barometric pressure | hPa * 100 | +| 30009 | Barometric pressure | hPa * 10 | The ModBus registers are 16 bit wide. For better precision, some units are scaled by a factor of 100. This way, values with up to two decimal points can be stored as 16 bit integer values. Just divide by 100 to get the floating point values. @@ -65,7 +65,7 @@ Libraries are included with the source code of this project ## License -Copyright (C) 2023 M.T. Konstapel +Copyright (C) 2023, 2024 M.T. Konstapel ### Software diff --git a/hardware/ds-15901_interface/ds-15901_interface-backups/ds-15901_interface-2024-01-04_184412.zip b/hardware/ds-15901_interface/ds-15901_interface-backups/ds-15901_interface-2024-01-04_184412.zip new file mode 100644 index 0000000..7059918 Binary files /dev/null and b/hardware/ds-15901_interface/ds-15901_interface-backups/ds-15901_interface-2024-01-04_184412.zip differ diff --git a/hardware/ds-15901_interface/ds-15901_interface.kicad_sch b/hardware/ds-15901_interface/ds-15901_interface.kicad_sch index 0138b18..e9076dd 100644 --- a/hardware/ds-15901_interface/ds-15901_interface.kicad_sch +++ b/hardware/ds-15901_interface/ds-15901_interface.kicad_sch @@ -829,6 +829,69 @@ ) ) ) + (symbol "Sensor_Pressure:BMP280" (in_bom yes) (on_board yes) + (property "Reference" "U" (id 0) (at -7.62 10.16 0) + (effects (font (size 1.27 1.27)) (justify left top)) + ) + (property "Value" "BMP280" (id 1) (at 5.08 10.16 0) + (effects (font (size 1.27 1.27)) (justify left top)) + ) + (property "Footprint" "Package_LGA:Bosch_LGA-8_2x2.5mm_P0.65mm_ClockwisePinNumbering" (id 2) (at 0 -17.78 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "https://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BMP280-DS001.pdf" (id 3) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_keywords" "I2C, SPI, pressure, temperature, sensor" (id 4) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_description" "Absolute Barometric Pressure Sensor, LGA-8" (id 5) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "ki_fp_filters" "Bosch*LGA*2x2.5mm*P0.65mm*" (id 6) (at 0 0 0) + (effects (font (size 1.27 1.27)) hide) + ) + (symbol "BMP280_0_1" + (rectangle (start -7.62 -5.08) (end 5.08 7.62) + (stroke (width 0.254) (type default) (color 0 0 0 0)) + (fill (type background)) + ) + ) + (symbol "BMP280_1_1" + (pin power_in line (at 0 -7.62 90) (length 2.54) + (name "GND" (effects (font (size 1.27 1.27)))) + (number "1" (effects (font (size 1.27 1.27)))) + ) + (pin input line (at -10.16 -2.54 0) (length 2.54) + (name "CSB" (effects (font (size 1.27 1.27)))) + (number "2" (effects (font (size 1.27 1.27)))) + ) + (pin bidirectional line (at -10.16 2.54 0) (length 2.54) + (name "SDI" (effects (font (size 1.27 1.27)))) + (number "3" (effects (font (size 1.27 1.27)))) + ) + (pin input line (at -10.16 5.08 0) (length 2.54) + (name "SCK" (effects (font (size 1.27 1.27)))) + (number "4" (effects (font (size 1.27 1.27)))) + ) + (pin bidirectional line (at -10.16 0 0) (length 2.54) + (name "SDO" (effects (font (size 1.27 1.27)))) + (number "5" (effects (font (size 1.27 1.27)))) + ) + (pin power_in line (at 0 10.16 270) (length 2.54) + (name "VDDIO" (effects (font (size 1.27 1.27)))) + (number "6" (effects (font (size 1.27 1.27)))) + ) + (pin power_in line (at 2.54 -7.62 90) (length 2.54) + (name "GND" (effects (font (size 1.27 1.27)))) + (number "7" (effects (font (size 1.27 1.27)))) + ) + (pin power_in line (at 2.54 10.16 270) (length 2.54) + (name "VDD" (effects (font (size 1.27 1.27)))) + (number "8" (effects (font (size 1.27 1.27)))) + ) + ) + ) (symbol "Switch:SW_DIP_x03" (pin_names (offset 0) hide) (in_bom yes) (on_board yes) (property "Reference" "SW" (id 0) (at 0 8.89 0) (effects (font (size 1.27 1.27))) @@ -1871,7 +1934,7 @@ ) ) - (junction (at 213.995 116.84) (diameter 0) (color 0 0 0 0) + (junction (at 203.835 116.84) (diameter 0) (color 0 0 0 0) (uuid 06d5bfea-3754-49d9-9d87-67608000b82c) ) (junction (at 116.205 146.05) (diameter 0) (color 0 0 0 0) @@ -1892,13 +1955,19 @@ (junction (at 168.91 146.05) (diameter 0) (color 0 0 0 0) (uuid 3b76f4db-e0d3-4520-b33e-22562c98ce0b) ) + (junction (at 213.995 102.87) (diameter 0) (color 0 0 0 0) + (uuid 3f8bf7ea-84ec-4cb9-ad46-544ffbc436f2) + ) (junction (at 102.235 154.305) (diameter 0) (color 0 0 0 0) (uuid 4a643fe9-ea92-4c4f-bd5a-ec0f15281f72) ) - (junction (at 213.995 107.95) (diameter 0) (color 0 0 0 0) + (junction (at 213.995 100.33) (diameter 0) (color 0 0 0 0) + (uuid 4ef0f4a7-39ea-4d66-95d4-5df320f24717) + ) + (junction (at 203.835 107.95) (diameter 0) (color 0 0 0 0) (uuid 4ff936ed-ad5b-493f-9fd6-54ad9171d1f1) ) - (junction (at 189.23 116.84) (diameter 0) (color 0 0 0 0) + (junction (at 179.07 116.84) (diameter 0) (color 0 0 0 0) (uuid 536cf963-2b9c-4946-ba93-be8897ab4f22) ) (junction (at 144.145 154.305) (diameter 0) (color 0 0 0 0) @@ -1913,7 +1982,7 @@ (junction (at 93.345 139.065) (diameter 0) (color 0 0 0 0) (uuid 6a300cce-dd4c-4770-a760-2c577ae94868) ) - (junction (at 213.995 100.33) (diameter 0) (color 0 0 0 0) + (junction (at 203.835 100.33) (diameter 0) (color 0 0 0 0) (uuid 6ccaf71c-a967-41dc-a4c0-179c4b14f63b) ) (junction (at 93.345 154.305) (diameter 0) (color 0 0 0 0) @@ -1925,30 +1994,39 @@ (junction (at 146.05 67.945) (diameter 0) (color 0 0 0 0) (uuid 8009a0ce-6806-498f-8034-800ab8fa4f23) ) + (junction (at 242.57 88.9) (diameter 0) (color 0 0 0 0) + (uuid 807cc76e-b51c-4f40-bf39-4f32abb845d5) + ) (junction (at 131.445 154.305) (diameter 0) (color 0 0 0 0) (uuid 93a4569e-7e15-4d3a-8208-a0b80fe8c3a1) ) + (junction (at 245.11 88.9) (diameter 0) (color 0 0 0 0) + (uuid 94d263a2-4b3d-4654-a6af-b7ecab89ad84) + ) (junction (at 102.235 146.05) (diameter 0) (color 0 0 0 0) (uuid 992e508e-2f02-45dc-97dd-d42930a6bcc6) ) (junction (at 195.58 68.58) (diameter 0) (color 0 0 0 0) (uuid 99ee9f33-c6d1-499b-be7b-4f8b55fec3cd) ) - (junction (at 194.945 116.84) (diameter 0) (color 0 0 0 0) + (junction (at 184.785 116.84) (diameter 0) (color 0 0 0 0) (uuid 9fffed6f-af41-4d5b-8d64-03c17d5c0369) ) (junction (at 66.04 139.065) (diameter 0) (color 0 0 0 0) (uuid a8010492-3c5d-49df-bef9-e3923cdb2d22) ) - (junction (at 213.995 91.44) (diameter 0) (color 0 0 0 0) + (junction (at 203.835 91.44) (diameter 0) (color 0 0 0 0) (uuid a9899378-b164-46d3-b4db-b909805f8883) ) (junction (at 93.345 147.32) (diameter 0) (color 0 0 0 0) (uuid ad9d08ce-87af-400a-b27b-a8664f032939) ) - (junction (at 191.135 100.33) (diameter 0) (color 0 0 0 0) + (junction (at 180.975 100.33) (diameter 0) (color 0 0 0 0) (uuid aec64839-fcf9-413f-ac49-3bcb0c86ae31) ) + (junction (at 242.57 113.03) (diameter 0) (color 0 0 0 0) + (uuid b556627b-2556-414a-93df-627a74ba7d4d) + ) (junction (at 217.805 46.355) (diameter 0) (color 0 0 0 0) (uuid b64b9e8d-4ef0-4bba-af2b-c7d30ece1861) ) @@ -1958,9 +2036,12 @@ (junction (at 219.71 53.975) (diameter 0) (color 0 0 0 0) (uuid b90b2a99-f494-4c6b-bf48-c6518c82bfa5) ) - (junction (at 194.945 100.33) (diameter 0) (color 0 0 0 0) + (junction (at 184.785 100.33) (diameter 0) (color 0 0 0 0) (uuid be8fe778-74b2-4e04-9278-0cd02a8c70f0) ) + (junction (at 245.11 113.03) (diameter 0) (color 0 0 0 0) + (uuid c20a722e-3484-4780-a843-95374cdf6b91) + ) (junction (at 63.5 154.305) (diameter 0) (color 0 0 0 0) (uuid c74b562e-1ed6-4f29-b402-f968c5dafdc9) ) @@ -2008,7 +2089,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 019858c8-3664-4cb0-a322-3997a617a1ec) ) - (wire (pts (xy 199.39 100.33) (xy 194.945 100.33)) + (wire (pts (xy 189.23 100.33) (xy 184.785 100.33)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 03083673-ac03-4fae-920f-1d0cde512c8a) ) @@ -2032,10 +2113,14 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 097b0cd2-42f8-49e9-9df1-cf3c1b0a16ee) ) - (wire (pts (xy 213.995 91.44) (xy 226.695 91.44)) + (wire (pts (xy 203.835 91.44) (xy 216.535 91.44)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 09d2e6a1-96f8-4c4f-b716-83ae4b9ca72c) ) + (wire (pts (xy 213.995 100.33) (xy 213.995 88.9)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 0b20d1f3-4bd0-4949-b66f-e33913755d4c) + ) (wire (pts (xy 63.5 154.305) (xy 66.04 154.305)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0bd151a4-d297-4f4c-9f0d-d695c5b334e8) @@ -2044,7 +2129,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0c70247b-2200-4872-a143-435eceb6e7d4) ) - (wire (pts (xy 226.695 97.79) (xy 226.695 91.44)) + (wire (pts (xy 216.535 97.79) (xy 216.535 91.44)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0d210239-e130-4843-9ce4-5f988d3d4312) ) @@ -2056,7 +2141,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 0f58cc89-eceb-4543-ae57-feed1238b40b) ) - (wire (pts (xy 213.995 116.84) (xy 213.995 115.57)) + (wire (pts (xy 203.835 116.84) (xy 203.835 115.57)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1019d139-bf61-4828-88bd-8e741cc5e6e0) ) @@ -2073,12 +2158,16 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1412d283-52ae-47c8-9469-4976cfa0d030) ) + (wire (pts (xy 227.33 108.585) (xy 213.995 108.585)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 1510fb74-280c-47da-9756-e458d0ff8be9) + ) (polyline (pts (xy 152.4 80.645) (xy 254 80.645)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1549310f-6dab-4971-8413-3136e65b064a) ) - (wire (pts (xy 187.325 100.33) (xy 191.135 100.33)) + (wire (pts (xy 177.165 100.33) (xy 180.975 100.33)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 17eb932b-1e96-4650-8880-70af6b3a7715) ) @@ -2090,11 +2179,15 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1a8bdbe2-90f4-46ab-bc12-8693f76cc68d) ) - (wire (pts (xy 204.47 107.95) (xy 213.995 107.95)) + (wire (pts (xy 194.31 107.95) (xy 203.835 107.95)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 1db88593-5259-4bf7-a463-45aa3d0f0b9b) ) - (wire (pts (xy 179.705 113.03) (xy 179.705 119.38)) + (wire (pts (xy 242.57 88.9) (xy 245.11 88.9)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 1e7eca44-dd54-48e0-9f5f-e3e321158039) + ) + (wire (pts (xy 169.545 113.03) (xy 169.545 119.38)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 258be670-5f90-48e0-845a-7b5551a92feb) ) @@ -2106,6 +2199,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 272f2bfd-4a30-4db9-af13-f406217bcce3) ) + (wire (pts (xy 245.11 110.49) (xy 245.11 113.03)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 27e0faa9-67d4-4a7f-9e79-08644ecee456) + ) (wire (pts (xy 112.395 109.22) (xy 114.3 109.22)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 283b1460-3310-4a88-aac5-02b22cee3d99) @@ -2118,7 +2215,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 2e2691bf-f950-4f99-b8d6-dd0dba7b88d0) ) - (wire (pts (xy 194.945 107.95) (xy 194.945 110.49)) + (wire (pts (xy 184.785 107.95) (xy 184.785 110.49)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 2ef35a6f-1f6a-4ffd-8ece-206603bfdbcd) ) @@ -2126,7 +2223,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 2f484b1b-0b7d-4ba4-a4a0-3c7218501f82) ) - (wire (pts (xy 209.55 116.84) (xy 213.995 116.84)) + (wire (pts (xy 199.39 116.84) (xy 203.835 116.84)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 2fe745e4-f02d-4bc6-9797-cd37066e45ed) ) @@ -2134,10 +2231,18 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 321c56f1-b090-4e29-8346-4505196bdd32) ) - (wire (pts (xy 194.945 116.84) (xy 194.945 115.57)) + (wire (pts (xy 184.785 116.84) (xy 184.785 115.57)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 32302ffd-f3a2-4862-aacc-8da1b6fcb98d) ) + (wire (pts (xy 229.87 105.41) (xy 229.87 88.9)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 34320756-e59b-4c90-a816-542c26dd0bdd) + ) + (wire (pts (xy 213.995 88.9) (xy 227.33 88.9)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 383c110c-1fdf-4df1-8fc0-6f09ac23950b) + ) (polyline (pts (xy 254 80.645) (xy 254 129.54)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 39fdb7cc-c1f6-4474-b065-0d965e908085) @@ -2147,6 +2252,14 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 3d1a7330-1e24-4570-9b07-a09fbea54eee) ) + (wire (pts (xy 227.33 100.33) (xy 227.33 108.585)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 3daebb0b-278e-4aac-af89-fda5dda32b54) + ) + (wire (pts (xy 227.33 88.9) (xy 227.33 97.79)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 3e57a12a-34c3-4f36-b281-e4c23d8c9363) + ) (wire (pts (xy 56.515 84.455) (xy 58.42 84.455)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4035264f-fd24-4dc8-98fb-dd20203d28d1) @@ -2156,7 +2269,7 @@ (uuid 40f335e6-0c2d-4a76-be51-4e2f2485c7ad) ) - (wire (pts (xy 194.945 100.33) (xy 194.945 99.06)) + (wire (pts (xy 184.785 100.33) (xy 184.785 99.06)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 426e3e9d-e331-43f8-b3e2-a9d041de9d7f) ) @@ -2176,7 +2289,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4950a2b7-2f9d-4999-8c33-fef4d13f6aca) ) - (wire (pts (xy 226.695 102.87) (xy 220.345 102.87)) + (wire (pts (xy 216.535 102.87) (xy 213.995 102.87)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4ac494a0-e43e-4545-8746-d45ee87fc914) ) @@ -2192,6 +2305,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4cabb4d7-0a64-4e30-a787-42f85b9c446d) ) + (wire (pts (xy 213.995 100.33) (xy 216.535 100.33)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 4d7c27d9-53de-4c48-842e-a7bf81f3ad8a) + ) (wire (pts (xy 60.325 151.765) (xy 61.595 151.765)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4dca79c1-a5ac-4471-90df-451fca99df0e) @@ -2204,15 +2321,19 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 4eabc249-94c9-41a7-84cc-1f90862f35cc) ) + (wire (pts (xy 242.57 88.9) (xy 242.57 92.71)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 525d352f-3d44-46fd-a27d-6a33491fe74a) + ) (wire (pts (xy 219.71 53.975) (xy 228.6 53.975)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 5336194d-8436-4192-88b0-2345bc63fc64) ) - (wire (pts (xy 191.135 110.49) (xy 191.135 100.33)) + (wire (pts (xy 180.975 110.49) (xy 180.975 100.33)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 56f3830a-66df-4766-9c7b-d4c0b3cd25ba) ) - (wire (pts (xy 204.47 92.71) (xy 204.47 91.44)) + (wire (pts (xy 194.31 92.71) (xy 194.31 91.44)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 5b82fbbe-91e9-4092-897d-981d019bac10) ) @@ -2233,7 +2354,7 @@ (uuid 67151429-91d5-480c-b81e-5a2787075a95) ) - (wire (pts (xy 177.8 107.95) (xy 189.23 107.95)) + (wire (pts (xy 167.64 107.95) (xy 179.07 107.95)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 67188bb9-5007-463e-942e-8e6c0f4011e1) ) @@ -2253,10 +2374,14 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 6ad702a9-1ce7-464a-a7dd-99f1a4d2e4bb) ) - (wire (pts (xy 179.705 105.41) (xy 179.705 92.075)) + (wire (pts (xy 169.545 105.41) (xy 169.545 92.075)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 6e0dfd71-90c8-4f6a-8b21-db31508c5e7c) ) + (wire (pts (xy 231.14 113.03) (xy 242.57 113.03)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 708f4082-cd6f-4857-b510-abfff630fc84) + ) (wire (pts (xy 185.42 46.355) (xy 183.515 46.355)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 70ce9627-ed9b-448e-a9ce-676e0c54d015) @@ -2282,7 +2407,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 7687669a-f52e-417f-bdb8-7f0ab9be9d4a) ) - (wire (pts (xy 213.995 107.95) (xy 213.995 110.49)) + (wire (pts (xy 203.835 107.95) (xy 203.835 110.49)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 768cfbae-31d2-4f6f-9ad8-24a620e89824) ) @@ -2306,6 +2431,14 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 7d970239-8091-4396-b2b9-097cb9337c48) ) + (wire (pts (xy 229.87 105.41) (xy 232.41 105.41)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 7f985c6f-db05-4173-9a9f-d88e53a8310f) + ) + (wire (pts (xy 227.33 100.33) (xy 232.41 100.33)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 8059dfb1-1e33-44b2-a7b9-08f3825a76f9) + ) (wire (pts (xy 91.44 139.065) (xy 93.345 139.065)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 80c544cd-3928-421c-95f1-66546915a8fa) @@ -2327,7 +2460,7 @@ (uuid 894dc7f7-27d4-4fce-a96c-66f9cd77f024) ) - (wire (pts (xy 194.945 91.44) (xy 194.945 93.98)) + (wire (pts (xy 184.785 91.44) (xy 184.785 93.98)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 8a8bade3-885c-4e51-b04f-d8e02034d7fa) ) @@ -2343,7 +2476,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 9093db88-2f18-48ac-90d1-f0a7e8e39258) ) - (wire (pts (xy 213.995 91.44) (xy 213.995 93.98)) + (wire (pts (xy 203.835 91.44) (xy 203.835 93.98)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 90d31cbf-419c-4b21-9131-6d43eda369e5) ) @@ -2359,6 +2492,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 92c9cf65-36e2-4d77-af31-8eed8b6c275f) ) + (wire (pts (xy 231.14 102.87) (xy 231.14 113.03)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid 93725de7-4fe5-450a-b8a2-4330acfba1b7) + ) (wire (pts (xy 195.58 36.195) (xy 195.58 31.115)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid 986f691f-405b-4c77-8636-31c44b03fdc5) @@ -2399,7 +2536,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a2437ccc-6489-4819-930f-51b08c9bf043) ) - (wire (pts (xy 213.995 100.33) (xy 213.995 99.06)) + (wire (pts (xy 203.835 100.33) (xy 203.835 99.06)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a24450b2-4c09-4ab9-8e17-e40847d1b59e) ) @@ -2415,7 +2552,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a3da9ca1-dee6-4771-a571-51ba9477729c) ) - (wire (pts (xy 177.8 110.49) (xy 191.135 110.49)) + (wire (pts (xy 167.64 110.49) (xy 180.975 110.49)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid a41e061d-fbc4-4bd6-8910-1db12b8c75dc) ) @@ -2449,7 +2586,7 @@ (uuid af1d651e-87a3-446f-90e7-12d759d204e2) ) - (wire (pts (xy 189.23 116.84) (xy 194.945 116.84)) + (wire (pts (xy 179.07 116.84) (xy 184.785 116.84)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid af3aac25-706c-47f3-ba26-62eda17971d7) ) @@ -2457,6 +2594,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b10bb50e-c14b-44af-b138-d1443a15537f) ) + (wire (pts (xy 242.57 113.03) (xy 245.11 113.03)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid b17a3f84-f3b8-42a5-b19a-45e3315d55f6) + ) (wire (pts (xy 61.595 151.765) (xy 61.595 154.305)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b2d09e0b-0c33-4f18-bdea-b5793aa89f2b) @@ -2469,7 +2610,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b459a381-112a-4e8b-829e-28e0125e5657) ) - (wire (pts (xy 213.995 100.33) (xy 226.695 100.33)) + (wire (pts (xy 203.835 100.33) (xy 213.995 100.33)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid b6e9e237-8b37-4017-b174-c414093f0212) ) @@ -2514,7 +2655,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid c61e3c37-061f-41d2-bf95-3da1f2e3fed9) ) - (wire (pts (xy 199.39 116.84) (xy 194.945 116.84)) + (wire (pts (xy 189.23 116.84) (xy 184.785 116.84)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid c6994778-8994-4bbe-bdb1-f3e342696907) ) @@ -2522,11 +2663,15 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ca632722-b81e-4597-bb72-70086db708df) ) + (wire (pts (xy 232.41 102.87) (xy 231.14 102.87)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid cc3905f2-55e3-40ac-b63d-ef71b678a405) + ) (wire (pts (xy 66.04 140.97) (xy 66.04 139.065)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid cd145fdc-f2d2-42f4-8d59-712ddf702220) ) - (wire (pts (xy 204.47 109.22) (xy 204.47 107.95)) + (wire (pts (xy 194.31 109.22) (xy 194.31 107.95)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid cd7a4160-118e-4502-aa10-9cfd6e6e7ddb) ) @@ -2534,7 +2679,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ce5ed59f-0a30-49ea-9cee-03c8e9bcc13e) ) - (wire (pts (xy 220.345 102.87) (xy 220.345 116.84)) + (wire (pts (xy 210.185 102.87) (xy 210.185 116.84)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ce70f476-f13a-4d3c-bcb1-ab091de0c5f9) ) @@ -2546,6 +2691,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d0cacc3d-f9b1-4634-a737-e30691760c42) ) + (wire (pts (xy 213.995 108.585) (xy 213.995 102.87)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid d4bc90bd-4199-4a08-9649-f1edd56df102) + ) (polyline (pts (xy 35.56 20.32) (xy 35.56 124.46)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid d681a789-1ab4-4c7e-a4d1-56a5f5eecb14) @@ -2559,7 +2708,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid da3be45f-56c6-4ac9-adc8-d5f44c979fb4) ) - (wire (pts (xy 177.8 113.03) (xy 179.705 113.03)) + (wire (pts (xy 167.64 113.03) (xy 169.545 113.03)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid dc0ea758-9107-4a60-9181-346fe8bcbfc3) ) @@ -2580,7 +2729,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e06350c3-8e51-42be-a7af-157a1e7a1be1) ) - (wire (pts (xy 209.55 100.33) (xy 213.995 100.33)) + (wire (pts (xy 199.39 100.33) (xy 203.835 100.33)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e0e91663-c3c3-4bad-bffd-6f9f538ebf2f) ) @@ -2597,7 +2746,7 @@ (uuid e170ce08-1c3e-48f1-9f48-feeb89e69a64) ) - (wire (pts (xy 177.8 105.41) (xy 179.705 105.41)) + (wire (pts (xy 167.64 105.41) (xy 169.545 105.41)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e1cfe478-c119-44f4-9aac-2b0770bbae63) ) @@ -2605,11 +2754,15 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e1d8e878-c3f9-47a5-a5a9-5327a11b5598) ) + (wire (pts (xy 227.33 97.79) (xy 232.41 97.79)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid e2550b82-601f-43da-9856-9f0152144e45) + ) (wire (pts (xy 82.55 73.66) (xy 82.55 79.375)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e3ba7089-2425-40e9-a7a8-2724c9881f8f) ) - (wire (pts (xy 189.23 107.95) (xy 189.23 116.84)) + (wire (pts (xy 179.07 107.95) (xy 179.07 116.84)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e3bc5653-32b5-4b60-b48e-d79f6852056c) ) @@ -2638,6 +2791,10 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid e6e7a804-7dbb-46af-8c59-bab1e8ba7593) ) + (wire (pts (xy 213.995 102.87) (xy 210.185 102.87)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid e7f6a3d3-7e4f-4e5a-9478-b8d4c2b44046) + ) (wire (pts (xy 131.445 154.305) (xy 144.145 154.305)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ead12c41-de5e-437b-88b5-5f759cd09f65) @@ -2662,7 +2819,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid ee4991b9-67ff-468f-91b7-1c2cfe08c54b) ) - (wire (pts (xy 187.325 116.84) (xy 189.23 116.84)) + (wire (pts (xy 177.165 116.84) (xy 179.07 116.84)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f1a5702d-caf2-4cbf-9bea-d591c3123ba7) ) @@ -2675,7 +2832,7 @@ (uuid f3193a6e-d3ba-4b1f-a870-b58294591107) ) - (wire (pts (xy 226.695 105.41) (xy 226.695 119.38)) + (wire (pts (xy 216.535 105.41) (xy 216.535 119.38)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f3cadc36-e113-4c94-89cb-94947b828122) ) @@ -2688,10 +2845,22 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f4d05b5c-0547-437c-97ac-a8c315fca0ca) ) + (wire (pts (xy 245.11 88.9) (xy 245.11 92.71)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid f53659b6-028f-44bd-ab6b-cb08bfa41d84) + ) (wire (pts (xy 181.61 48.895) (xy 181.61 51.435)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f5a06366-48f5-46d2-8119-a757d11d5219) ) + (wire (pts (xy 242.57 110.49) (xy 242.57 113.03)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid f641527d-67c8-429f-9c4e-b03eb290a5ed) + ) + (wire (pts (xy 229.87 88.9) (xy 242.57 88.9)) + (stroke (width 0) (type default) (color 0 0 0 0)) + (uuid f7f685ab-0413-4952-8e41-e846e4de6709) + ) (wire (pts (xy 219.71 47.625) (xy 219.71 44.45)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid f91a442b-e3c2-47cd-881b-420c71e0ebc8) @@ -2700,7 +2869,7 @@ (stroke (width 0) (type default) (color 0 0 0 0)) (uuid fa599ac8-175c-4cbc-ab41-b2dd59fe3405) ) - (wire (pts (xy 204.47 91.44) (xy 213.995 91.44)) + (wire (pts (xy 194.31 91.44) (xy 203.835 91.44)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid fa8e3b37-2f0e-4371-9a10-dc3013c52396) ) @@ -2709,11 +2878,11 @@ (uuid fb1c2371-46d3-4a89-b2b3-8e2b46bd1e14) ) - (wire (pts (xy 213.995 116.84) (xy 220.345 116.84)) + (wire (pts (xy 203.835 116.84) (xy 210.185 116.84)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid fd02ee76-e6e4-423d-b162-35b2cacbc6cc) ) - (wire (pts (xy 191.135 100.33) (xy 194.945 100.33)) + (wire (pts (xy 180.975 100.33) (xy 184.785 100.33)) (stroke (width 0) (type default) (color 0 0 0 0)) (uuid fd4fad85-8656-42b4-b88d-94f033561cd9) ) @@ -3161,7 +3330,7 @@ (uuid c1c8db3b-62bb-4235-b7be-1b6f7d021f03) ) (text "I2C is used for communication\nwith temperature, humidity and\npressure sensors." - (at 188.595 127.635 0) + (at 178.435 127.635 0) (effects (font (size 1.27 1.27)) (justify left bottom)) (uuid ecf5be55-2c22-4a46-aa9b-9a06e9ea3382) ) @@ -3177,10 +3346,10 @@ (effects (font (size 1.27 1.27)) hide) ) ) - (global_label "SDA" (shape input) (at 187.325 116.84 180) (fields_autoplaced) + (global_label "SDA" (shape input) (at 177.165 116.84 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid 356f068b-566d-4d4f-af2b-ddda9f6dc475) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at -31.75 -27.94 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at -41.91 -27.94 0) (effects (font (size 1.27 1.27)) hide) ) ) @@ -3233,10 +3402,10 @@ (effects (font (size 1.27 1.27)) hide) ) ) - (global_label "SCL" (shape input) (at 187.325 100.33 180) (fields_autoplaced) + (global_label "SCL" (shape input) (at 177.165 100.33 180) (fields_autoplaced) (effects (font (size 1.27 1.27)) (justify right)) (uuid fa1f0203-84fc-460a-9047-239eb215594b) - (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at -31.75 -27.94 0) + (property "Intersheet References" "${INTERSHEET_REFS}" (id 0) (at -41.91 -27.94 0) (effects (font (size 1.27 1.27)) hide) ) ) @@ -3384,15 +3553,15 @@ ) ) - (symbol (lib_id "Transistor_FET:2N7000") (at 204.47 114.3 90) (mirror x) (unit 1) + (symbol (lib_id "Transistor_FET:2N7000") (at 194.31 114.3 90) (mirror x) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e85aa8b) - (property "Reference" "Q2" (id 0) (at 208.28 113.03 90)) - (property "Value" "2N7000" (id 1) (at 204.47 106.045 90)) - (property "Footprint" "Package_TO_SOT_THT:TO-92L_Wide" (id 2) (at 206.375 119.38 0) + (property "Reference" "Q2" (id 0) (at 198.12 113.03 90)) + (property "Value" "2N7000" (id 1) (at 194.31 106.045 90)) + (property "Footprint" "Package_TO_SOT_THT:TO-92L_Wide" (id 2) (at 196.215 119.38 0) (effects (font (size 1.27 1.27) italic) (justify left) hide) ) - (property "Datasheet" "https://www.fairchildsemi.com/datasheets/2N/2N7000.pdf" (id 3) (at 204.47 114.3 0) + (property "Datasheet" "https://www.fairchildsemi.com/datasheets/2N/2N7000.pdf" (id 3) (at 194.31 114.3 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) (pin "1" (uuid 16f9d9e2-d9f3-4ef7-aded-a494971d193f)) @@ -3400,85 +3569,85 @@ (pin "3" (uuid 216f255d-9c67-472c-9ea4-b1c88ad79b48)) ) - (symbol (lib_id "Device:R_Small") (at 213.995 113.03 180) (unit 1) + (symbol (lib_id "Device:R_Small") (at 203.835 113.03 180) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e85dadb) - (property "Reference" "R23" (id 0) (at 215.4936 111.8616 0) + (property "Reference" "R23" (id 0) (at 205.3336 111.8616 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Value" "2k2" (id 1) (at 215.4936 114.173 0) + (property "Value" "2k2" (id 1) (at 205.3336 114.173 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 213.995 113.03 0) + (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 203.835 113.03 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 213.995 113.03 0) + (property "Datasheet" "~" (id 3) (at 203.835 113.03 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 9dff7cd2-82c1-4855-984f-7417936f9fc3)) (pin "2" (uuid f5256dca-0885-442e-a391-baa79049250a)) ) - (symbol (lib_id "Device:R_Small") (at 194.945 113.03 180) (unit 1) + (symbol (lib_id "Device:R_Small") (at 184.785 113.03 180) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e85e1bb) - (property "Reference" "R19" (id 0) (at 196.4436 111.8616 0) + (property "Reference" "R19" (id 0) (at 186.2836 111.8616 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Value" "2k2" (id 1) (at 196.4436 114.173 0) + (property "Value" "2k2" (id 1) (at 186.2836 114.173 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 194.945 113.03 0) + (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 184.785 113.03 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 194.945 113.03 0) + (property "Datasheet" "~" (id 3) (at 184.785 113.03 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 1920617d-bd56-4706-abc9-f64ac92b54ce)) (pin "2" (uuid 94a207b1-b5ce-49d9-9d43-1831b6b45065)) ) - (symbol (lib_id "power:+3V3") (at 213.995 107.95 0) (unit 1) + (symbol (lib_id "power:+3V3") (at 203.835 107.95 0) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e862ce3) - (property "Reference" "#PWR0110" (id 0) (at 213.995 111.76 0) + (property "Reference" "#PWR0110" (id 0) (at 203.835 111.76 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+3V3" (id 1) (at 214.376 103.5558 0)) - (property "Footprint" "" (id 2) (at 213.995 107.95 0) + (property "Value" "+3V3" (id 1) (at 204.216 103.5558 0)) + (property "Footprint" "" (id 2) (at 203.835 107.95 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 213.995 107.95 0) + (property "Datasheet" "" (id 3) (at 203.835 107.95 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid f88b9c3b-ac38-46ab-983d-241c8b760431)) ) - (symbol (lib_id "power:+5V") (at 194.945 107.95 0) (unit 1) + (symbol (lib_id "power:+5V") (at 184.785 107.95 0) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e8635f6) - (property "Reference" "#PWR0111" (id 0) (at 194.945 111.76 0) + (property "Reference" "#PWR0111" (id 0) (at 184.785 111.76 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+5V" (id 1) (at 195.326 103.5558 0)) - (property "Footprint" "" (id 2) (at 194.945 107.95 0) + (property "Value" "+5V" (id 1) (at 185.166 103.5558 0)) + (property "Footprint" "" (id 2) (at 184.785 107.95 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 194.945 107.95 0) + (property "Datasheet" "" (id 3) (at 184.785 107.95 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 8514ea21-f25f-4eea-84d9-1ea9fb3be802)) ) - (symbol (lib_id "Transistor_FET:2N7000") (at 204.47 97.79 90) (mirror x) (unit 1) + (symbol (lib_id "Transistor_FET:2N7000") (at 194.31 97.79 90) (mirror x) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e868e7f) - (property "Reference" "Q1" (id 0) (at 207.645 95.885 90)) - (property "Value" "2N7000" (id 1) (at 204.47 89.535 90)) - (property "Footprint" "Package_TO_SOT_THT:TO-92L_Wide" (id 2) (at 206.375 102.87 0) + (property "Reference" "Q1" (id 0) (at 197.485 95.885 90)) + (property "Value" "2N7000" (id 1) (at 194.31 89.535 90)) + (property "Footprint" "Package_TO_SOT_THT:TO-92L_Wide" (id 2) (at 196.215 102.87 0) (effects (font (size 1.27 1.27) italic) (justify left) hide) ) - (property "Datasheet" "https://www.fairchildsemi.com/datasheets/2N/2N7000.pdf" (id 3) (at 204.47 97.79 0) + (property "Datasheet" "https://www.fairchildsemi.com/datasheets/2N/2N7000.pdf" (id 3) (at 194.31 97.79 0) (effects (font (size 1.27 1.27)) (justify left) hide) ) (pin "1" (uuid cd99fc26-1d55-4c49-bbaf-60adcea10f71)) @@ -3486,71 +3655,71 @@ (pin "3" (uuid 24ab3ff2-897c-48ba-988a-246287be4bcc)) ) - (symbol (lib_id "Device:R_Small") (at 213.995 96.52 180) (unit 1) + (symbol (lib_id "Device:R_Small") (at 203.835 96.52 180) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e868e85) - (property "Reference" "R22" (id 0) (at 215.4936 95.3516 0) + (property "Reference" "R22" (id 0) (at 205.3336 95.3516 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Value" "2k2" (id 1) (at 215.4936 97.663 0) + (property "Value" "2k2" (id 1) (at 205.3336 97.663 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 213.995 96.52 0) + (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 203.835 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 213.995 96.52 0) + (property "Datasheet" "~" (id 3) (at 203.835 96.52 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 78c7aa45-7b17-41e8-8fd7-bde47adf1a92)) (pin "2" (uuid 4c26d8ec-8fce-4258-8778-40b48ac032f7)) ) - (symbol (lib_id "Device:R_Small") (at 194.945 96.52 180) (unit 1) + (symbol (lib_id "Device:R_Small") (at 184.785 96.52 180) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e868e8b) - (property "Reference" "R18" (id 0) (at 196.4436 95.3516 0) + (property "Reference" "R18" (id 0) (at 186.2836 95.3516 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Value" "2k2" (id 1) (at 196.4436 97.663 0) + (property "Value" "2k2" (id 1) (at 186.2836 97.663 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 194.945 96.52 0) + (property "Footprint" "Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal" (id 2) (at 184.785 96.52 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 194.945 96.52 0) + (property "Datasheet" "~" (id 3) (at 184.785 96.52 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid d1b592f4-f0c6-421d-86be-5f497475f83d)) (pin "2" (uuid e5a56d0a-23fd-4c78-9859-80c1720e9521)) ) - (symbol (lib_id "power:+3V3") (at 213.995 91.44 0) (unit 1) + (symbol (lib_id "power:+3V3") (at 203.835 91.44 0) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e868e98) - (property "Reference" "#PWR0112" (id 0) (at 213.995 95.25 0) + (property "Reference" "#PWR0112" (id 0) (at 203.835 95.25 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+3V3" (id 1) (at 214.376 87.0458 0)) - (property "Footprint" "" (id 2) (at 213.995 91.44 0) + (property "Value" "+3V3" (id 1) (at 204.216 87.0458 0)) + (property "Footprint" "" (id 2) (at 203.835 91.44 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 213.995 91.44 0) + (property "Datasheet" "" (id 3) (at 203.835 91.44 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 1077f747-170d-4e5c-ab05-196ecc6bb80f)) ) - (symbol (lib_id "power:+5V") (at 194.945 91.44 0) (unit 1) + (symbol (lib_id "power:+5V") (at 184.785 91.44 0) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e868e9f) - (property "Reference" "#PWR0113" (id 0) (at 194.945 95.25 0) + (property "Reference" "#PWR0113" (id 0) (at 184.785 95.25 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+5V" (id 1) (at 195.326 87.0458 0)) - (property "Footprint" "" (id 2) (at 194.945 91.44 0) + (property "Value" "+5V" (id 1) (at 185.166 87.0458 0)) + (property "Footprint" "" (id 2) (at 184.785 91.44 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 194.945 91.44 0) + (property "Datasheet" "" (id 3) (at 184.785 91.44 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid b3bd1ca2-f800-4c4d-8357-8d4e2319033a)) @@ -3638,19 +3807,19 @@ (pin "1" (uuid 807a8b14-2054-4038-abe4-58b074b5a72c)) ) - (symbol (lib_id "Connector:Conn_01x04_Male") (at 172.72 107.95 0) (unit 1) + (symbol (lib_id "Connector:Conn_01x04_Male") (at 162.56 107.95 0) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e8d69fe) - (property "Reference" "J5" (id 0) (at 173.99 102.87 0) + (property "Reference" "J5" (id 0) (at 163.83 102.87 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Value" "I2C@5V" (id 1) (at 172.085 109.22 0) + (property "Value" "I2C@5V" (id 1) (at 161.925 109.22 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" (id 2) (at 172.72 107.95 0) + (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" (id 2) (at 162.56 107.95 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 172.72 107.95 0) + (property "Datasheet" "~" (id 3) (at 162.56 107.95 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid 05e72729-9836-4c7b-a7a3-f8014caf7626)) @@ -3659,19 +3828,19 @@ (pin "4" (uuid c4d176c0-bdd9-4dee-80fc-487b6780a5c5)) ) - (symbol (lib_id "Connector:Conn_01x04_Male") (at 231.775 100.33 0) (mirror y) (unit 1) + (symbol (lib_id "Connector:Conn_01x04_Male") (at 221.615 100.33 0) (mirror y) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e8e4b6c) - (property "Reference" "J8" (id 0) (at 230.505 95.25 0) + (property "Reference" "J8" (id 0) (at 217.805 92.71 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Value" "I2C@3V3" (id 1) (at 232.41 101.6 0) + (property "Value" "I2C@3V3" (id 1) (at 217.805 94.615 0) (effects (font (size 1.27 1.27)) (justify right)) ) - (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" (id 2) (at 231.775 100.33 0) + (property "Footprint" "Connector_PinHeader_2.54mm:PinHeader_1x04_P2.54mm_Vertical" (id 2) (at 221.615 100.33 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "~" (id 3) (at 231.775 100.33 0) + (property "Datasheet" "~" (id 3) (at 221.615 100.33 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid b8c49482-54df-40eb-8376-659fb79cc443)) @@ -3680,33 +3849,33 @@ (pin "4" (uuid e9a7fac5-42e3-44e3-b35b-44287e8b8507)) ) - (symbol (lib_id "power:GND") (at 179.705 119.38 0) (unit 1) + (symbol (lib_id "power:GND") (at 169.545 119.38 0) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e8e86be) - (property "Reference" "#PWR0124" (id 0) (at 179.705 125.73 0) + (property "Reference" "#PWR0124" (id 0) (at 169.545 125.73 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 179.832 123.7742 0)) - (property "Footprint" "" (id 2) (at 179.705 119.38 0) + (property "Value" "GND" (id 1) (at 169.672 123.7742 0)) + (property "Footprint" "" (id 2) (at 169.545 119.38 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 179.705 119.38 0) + (property "Datasheet" "" (id 3) (at 169.545 119.38 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid b15a96ec-ae98-40fc-a90c-6ff84fd74e80)) ) - (symbol (lib_id "power:+5V") (at 179.705 92.075 0) (unit 1) + (symbol (lib_id "power:+5V") (at 169.545 92.075 0) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e8e894f) - (property "Reference" "#PWR0125" (id 0) (at 179.705 95.885 0) + (property "Reference" "#PWR0125" (id 0) (at 169.545 95.885 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "+5V" (id 1) (at 180.086 87.6808 0)) - (property "Footprint" "" (id 2) (at 179.705 92.075 0) + (property "Value" "+5V" (id 1) (at 169.926 87.6808 0)) + (property "Footprint" "" (id 2) (at 169.545 92.075 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 179.705 92.075 0) + (property "Datasheet" "" (id 3) (at 169.545 92.075 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid ba52c2a8-e1f3-4a2a-8914-d07134eae8c3)) @@ -3727,17 +3896,17 @@ (pin "2" (uuid 8f165c5a-cc57-4b1a-9012-be8434a85368)) ) - (symbol (lib_id "power:GND") (at 226.695 119.38 0) (unit 1) + (symbol (lib_id "power:GND") (at 216.535 119.38 0) (unit 1) (in_bom yes) (on_board yes) (uuid 00000000-0000-0000-0000-00005e8f55da) - (property "Reference" "#PWR0103" (id 0) (at 226.695 125.73 0) + (property "Reference" "#PWR0103" (id 0) (at 216.535 125.73 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Value" "GND" (id 1) (at 226.822 123.7742 0)) - (property "Footprint" "" (id 2) (at 226.695 119.38 0) + (property "Value" "GND" (id 1) (at 216.662 123.7742 0)) + (property "Footprint" "" (id 2) (at 216.535 119.38 0) (effects (font (size 1.27 1.27)) hide) ) - (property "Datasheet" "" (id 3) (at 226.695 119.38 0) + (property "Datasheet" "" (id 3) (at 216.535 119.38 0) (effects (font (size 1.27 1.27)) hide) ) (pin "1" (uuid fcf45bb9-e164-492a-b5c7-e117d4c951c8)) @@ -4314,6 +4483,22 @@ (pin "6" (uuid 915e9c63-ab87-4607-b4bf-d01fd73ef20f)) ) + (symbol (lib_id "power:+3V3") (at 245.11 88.9 0) (unit 1) + (in_bom yes) (on_board yes) (fields_autoplaced) + (uuid 2f2146c9-5574-465e-b957-57e79114cbfc) + (property "Reference" "#PWR?" (id 0) (at 245.11 92.71 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "+3V3" (id 1) (at 245.11 83.82 0)) + (property "Footprint" "" (id 2) (at 245.11 88.9 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 245.11 88.9 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 4b95576f-667e-491a-bce0-e32fa9ae3f2a)) + ) + (symbol (lib_id "Graphic:Logo_Open_Hardware_Small") (at 233.045 175.26 0) (unit 1) (in_bom yes) (on_board yes) (fields_autoplaced) (uuid 44293aa5-64c4-4440-a33c-eae5be98dd99) @@ -4414,6 +4599,22 @@ (pin "1" (uuid ff304030-62e2-4c9b-ba2b-e8ed2ce45b6e)) ) + (symbol (lib_id "power:GND") (at 245.11 113.03 0) (unit 1) + (in_bom yes) (on_board yes) (fields_autoplaced) + (uuid aee8d1f7-f837-4983-a004-c62e4bb0cfa9) + (property "Reference" "#PWR?" (id 0) (at 245.11 119.38 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Value" "GND" (id 1) (at 245.11 118.11 0)) + (property "Footprint" "" (id 2) (at 245.11 113.03 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "" (id 3) (at 245.11 113.03 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid 79f29c6d-0129-40e6-b178-d30c0c98d109)) + ) + (symbol (lib_id "Device:C_Small") (at 76.835 44.45 180) (unit 1) (in_bom yes) (on_board yes) (uuid c13e234f-8b1a-4e76-9590-92bcde13ce73) @@ -4433,6 +4634,31 @@ (pin "2" (uuid 9decf648-5aa4-4758-8c56-52fd36db325b)) ) + (symbol (lib_id "Sensor_Pressure:BMP280") (at 242.57 102.87 0) (unit 1) + (in_bom yes) (on_board yes) + (uuid f42acc52-67f7-43fc-8c3e-55e1ee030e02) + (property "Reference" "U?" (id 0) (at 234.95 93.98 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Value" "BMP280" (id 1) (at 232.41 109.855 0) + (effects (font (size 1.27 1.27)) (justify left)) + ) + (property "Footprint" "Package_LGA:Bosch_LGA-8_2x2.5mm_P0.65mm_ClockwisePinNumbering" (id 2) (at 242.57 120.65 0) + (effects (font (size 1.27 1.27)) hide) + ) + (property "Datasheet" "https://ae-bst.resource.bosch.com/media/_tech/media/datasheets/BST-BMP280-DS001.pdf" (id 3) (at 242.57 102.87 0) + (effects (font (size 1.27 1.27)) hide) + ) + (pin "1" (uuid bc63026b-90bb-4f5a-aa7a-9a2eb12c53c8)) + (pin "2" (uuid 4fafab0e-47c0-4721-948b-4bab3e9d4c43)) + (pin "3" (uuid f0e3628f-25c7-4da9-ae27-f984bd9770b8)) + (pin "4" (uuid c72da359-88f5-4f5f-9c73-ea9d019ff4fd)) + (pin "5" (uuid a50cd6fb-fb8c-42a4-8353-05cd541ab36d)) + (pin "6" (uuid 432a18b7-9bfa-40e4-9293-370defac13ff)) + (pin "7" (uuid e48a8ae9-6d94-4f6f-9107-14d7a28a4296)) + (pin "8" (uuid b782fe96-b1da-40d4-8535-621e8e720261)) + ) + (symbol (lib_id "Device:R_Small") (at 76.835 34.925 180) (unit 1) (in_bom yes) (on_board yes) (uuid fe38bae4-d554-42a8-97c4-4dd1f28b244a) @@ -4526,9 +4752,15 @@ (path "/00000000-0000-0000-0000-00005e8e894f" (reference "#PWR0125") (unit 1) (value "+5V") (footprint "") ) + (path "/2f2146c9-5574-465e-b957-57e79114cbfc" + (reference "#PWR?") (unit 1) (value "+3V3") (footprint "") + ) (path "/6d8637f9-708c-4e1e-b0bb-c80ab3cb3775" (reference "#PWR?") (unit 1) (value "GND") (footprint "") ) + (path "/aee8d1f7-f837-4983-a004-c62e4bb0cfa9" + (reference "#PWR?") (unit 1) (value "GND") (footprint "") + ) (path "/00000000-0000-0000-0000-00005eb22cb1" (reference "C1") (unit 1) (value "150n") (footprint "Capacitor_THT:C_Disc_D10.5mm_W5.0mm_P7.50mm") ) @@ -4661,5 +4893,8 @@ (path "/00000000-0000-0000-0000-00005e98248b" (reference "U4") (unit 1) (value "MCP1700-3302E") (footprint "Package_TO_SOT_THT:TO-92L_Wide") ) + (path "/f42acc52-67f7-43fc-8c3e-55e1ee030e02" + (reference "U?") (unit 1) (value "BMP280") (footprint "Package_LGA:Bosch_LGA-8_2x2.5mm_P0.65mm_ClockwisePinNumbering") + ) ) ) diff --git a/hardware/ds-15901_interface/ds-15901_interface.pdf b/hardware/ds-15901_interface/ds-15901_interface.pdf index d6b7796..928d2e8 100644 Binary files a/hardware/ds-15901_interface/ds-15901_interface.pdf and b/hardware/ds-15901_interface/ds-15901_interface.pdf differ diff --git a/test_software/__pycache__/epever_control.cpython-36.pyc b/test_software/__pycache__/epever_control.cpython-36.pyc index 2952807..5fe7fbf 100644 Binary files a/test_software/__pycache__/epever_control.cpython-36.pyc and b/test_software/__pycache__/epever_control.cpython-36.pyc differ diff --git a/test_software/epever_control.py b/test_software/epever_control.py index 6b40055..bcf0386 100644 --- a/test_software/epever_control.py +++ b/test_software/epever_control.py @@ -92,4 +92,4 @@ class EpeverChargeController(minimalmodbus.Instrument): def get_pressure(self): """Charging mode: 0x0001 = PWM""" - return self.retriable_read_register(9, 0, 4) + return self.retriable_read_register(9, 1, 4)