Changes in 563c8e7: formatting

				HomeAutomation/OliveSmartOilMonitor.md
			
          @@ -7,59 +7,47 @@ title: OliveSmartOilMonitor

           # Web Service

           URL

          -:   myolive.co.uk 

          +: myolive.co.uk

           Open ports

          -:   80, 443 

          -

          -

          +: 80, 443

           # Box Contents

          -*   Olive Smart Sensor 

          -*   Olive Smart Hub 

          -*   USB plug 

          -*   Adjustable antenna 

          -*   Ethernet cable 

          -*   USB cable 

          -*   Instruction leaflet 

          -

          -

          -

          -## Olive Smart Sensor

          -

          -*   Easy installation 

          -*   Cannot replace the battery without voiding warranty 

          +- Olive Smart Sensor

          +- Olive Smart Hub

          +- USB plug

          +- Adjustable antenna

          +- Ethernet cable

          +- USB cable

          +- Instruction leaflet

          +# Olive Smart Sensor

          +- Easy installation

          +- Cannot replace the battery without voiding warranty

           Battery

          -:   CR2430, 3V. (Though a CR2032 will fit too.) 

          -

          -

          -

          -## Olive Smart Hub

          -

          -*   Antenna mount (type?) 

          -*   USB power 

          -*   RJ45 ethernet socket 

          +: CR2430, 3V. (Though a CR2032 will fit too.)

          +# Olive Smart Hub

          +- Antenna mount (type?)

          +- USB power

          +- RJ45 ethernet socket

           Manufacturer

          -:   Tekelek Europe 

          +: Tekelek Europe

           Model

          -:   TEK608A Broadband gateway 

          +: TEK608A Broadband gateway

           Open Ports

          -:   80 (http) 

          -

          -

          +: 80 (http)

          -### Web Interface

          +## Web Interface

          -Uses the microchip TCP/IP stack and `mchp.js` Microchip javascript library 

          +Uses the microchip TCP/IP stack and `mchp.js` Microchip javascript library

           `unitstatus.xml` (Status of the modem connection, 0:OK)

          @@ -67,8 +55,7 @@ Uses the microchip TCP/IP stack and `mchp.js` Microchip javascript library

               <connection_stat>0</connection_stat>

               </response>

          -

          -`rfstatus.xml`  (Status of each sensor connection, 0:OK, 2:Unknown)

          +`rfstatus.xml` (Status of each sensor connection, 0:OK, 2:Unknown)

               <response>

               <s1>%d</s1>

          @@ -77,103 +64,92 @@ Uses the microchip TCP/IP stack and `mchp.js` Microchip javascript library

               <s4>%d</s4>

               </response>

          +`pairstatus.xml` (Pairing status for the setup wizard)

          -`pairstatus.xml`  (Pairing status for the setup wizard)

          -

          -

          -`diag.htm` has the raw data from each sensor. [oilpal watchman][10] 

          +`diag.htm` has the raw data from each sensor. [oilpal watchman][10]

           See [github:markferry/tekelek-scraper](https://github.com/markferry/tekelek-scraper/)

          -

          -### Indicator LEDs

          +## Indicator LEDs

           Orange

          -:   Power On 

          +: Power On

           Green

          -:   Data activity 

          +: Data activity

           Red

          -:   Error code (sequence of flashes) 

          +: Error code (sequence of flashes)

          -

          -

          -### Antenna

          +## Antenna

           Type

          -:   

          +:

           Frequency

          -:   433MHz? 

          -

          -

          +: 433MHz?

          -### Error Codes

          +## Error Codes

           4 flashes

          -:   uplink failure 

          +: uplink failure

          +## SoC

          +### PIC

          -### SoC

          -

          -#### PIC

          -

          -[18F27J13][13] -I/ML 15387BA 

          +[18F27J13][13] -I/ML 15387BA

           Pins

          -:   28 

          +: 28

           PROM

          -:   128KB 

          +: 128KB

           SRAM

          -:   3760B 

          +: 3760B

           Remappable pins

          -:   19 

          +: 19

           Timers 8-bit

          -:   4 

          +: 4

           Timers 16-bit

          -:   4 

          +: 4

           ECCP/CCP

          -:   3/7 

          +: 3/7

           EUSART

          -:   2 

          +: 2

           MSSP[1][14] SPI w/DMA

          -:   2, Y 

          +: 2, Y

           MSSP I2C

          -:   Y 

          +: Y

           A/D 12-bit (ch)

          -:   10 

          +: 10

           Comparators

          -:   3 

          +: 3

           Deep Sleep

          -:   Y 

          +: Y

           PMP[2][16]/PSP

          -:   N 

          +: N

           CMTU[3][17]

          -:   Y 

          +: Y

           RTCC[4][18]

          -:   Y 

          +: Y

          - 

          -

           1 Master synchronous serial port [⇑][19]

           2 Parallel master port [⇑][20]

          @@ -182,63 +158,55 @@ RTCC[4][18]

           4 Realtime Clock and Calendar [⇑][22]

          +### Radio

          -

          -#### Radio

          -

          -[Si4330][23] BPS17E . 1515 

          -

          -

          +[Si4330][23] BPS17E . 1515

           Part Number

          -:   Si4330 

          +: Si4330

           Type

          -:   RX 

          +: RX

           Modulation Scheme (max kbps) FSK / OOK

          -:   256 / 40 

          +: 256 / 40

           Frequency Range (MHz)

          -:   240-960 

          +: 240-960

           Output Power Range (dBm)

          -:   - 

          +: -

           Sensitivity (dBm) 2.0 kbps FSK / 4.8 kbps OOK

          -:   -121 / -110 

          +: -121 / -110

           RX current (mA)

          -:   18.5 

          +: 18.5

           TX current (mA)

          -:   - 

          +: -

           Package

          -:   QFN20 

          -

          -

          -

          -#### SPI Flash

          -

          -[SST25VF040B][27] 80-41-S2AE 1537WC7-B 

          +: QFN20

          +### SPI Flash

          +[SST25VF040B][27] 80-41-S2AE 1537WC7-B

          -#### Ethernet Controller

          +### Ethernet Controller

           [ENC28J60][29] -I/ML 1512UPE

          - [10]: https://community.home-assistant.io/t/oilpal-watchman-ultrasonic-oil-tank-level-reading-for-home-assistant/113134

          - [13]: http://www.microchip.com/wwwproducts/en/PIC18F27J13

          - [14]: #fn1_1

          - [16]: #fn1_2

          - [17]: #fn1_3

          - [18]: #fn1_4

          - [19]: #fnr1_1

          - [20]: #fnr1_2

          - [21]: #fnr1_3

          - [22]: #fnr1_4

          - [23]: https://www.silabs.com/Marcom%20Documents/Resources/EZRadio-EZRadioPRO-Solutions.pdf

          - [27]: https://www.microchip.com/wwwproducts/en/SST25VF040B

          - [29]: http://www.microchip.com/wwwproducts/en/en022889

          +[10]: https://community.home-assistant.io/t/oilpal-watchman-ultrasonic-oil-tank-level-reading-for-home-assistant/113134

          +[13]: http://www.microchip.com/wwwproducts/en/PIC18F27J13

          +[14]: #fn1_1

          +[16]: #fn1_2

          +[17]: #fn1_3

          +[18]: #fn1_4

          +[19]: #fnr1_1

          +[20]: #fnr1_2

          +[21]: #fnr1_3

          +[22]: #fnr1_4

          +[23]: https://www.silabs.com/Marcom%20Documents/Resources/EZRadio-EZRadioPRO-Solutions.pdf

          +[27]: https://www.microchip.com/wwwproducts/en/SST25VF040B

          +[29]: http://www.microchip.com/wwwproducts/en/en022889

...	...	@@ -7,59 +7,47 @@ title: OliveSmartOilMonitor
7	7	# Web Service
8	8
9	9	URL
10		-: myolive.co.uk
	10	+: myolive.co.uk
11	11
12	12	Open ports
13		-: 80, 443
14		-
15		-
	13	+: 80, 443
16	14
17	15	# Box Contents
18	16
19		-* Olive Smart Sensor
20		-* Olive Smart Hub
21		-* USB plug
22		-* Adjustable antenna
23		-* Ethernet cable
24		-* USB cable
25		-* Instruction leaflet
26		-
27		-
28		-
29		-## Olive Smart Sensor
30		-
31		-* Easy installation
32		-* Cannot replace the battery without voiding warranty
	17	+- Olive Smart Sensor
	18	+- Olive Smart Hub
	19	+- USB plug
	20	+- Adjustable antenna
	21	+- Ethernet cable
	22	+- USB cable
	23	+- Instruction leaflet
33	24
	25	+# Olive Smart Sensor
34	26
	27	+- Easy installation
	28	+- Cannot replace the battery without voiding warranty
35	29
36	30	Battery
37		-: CR2430, 3V. (Though a CR2032 will fit too.)
38		-
39		-
40		-
41		-## Olive Smart Hub
42		-
43		-* Antenna mount (type?)
44		-* USB power
45		-* RJ45 ethernet socket
	31	+: CR2430, 3V. (Though a CR2032 will fit too.)
46	32
	33	+# Olive Smart Hub
47	34
	35	+- Antenna mount (type?)
	36	+- USB power
	37	+- RJ45 ethernet socket
48	38
49	39	Manufacturer
50		-: Tekelek Europe
	40	+: Tekelek Europe
51	41
52	42	Model
53		-: TEK608A Broadband gateway
	43	+: TEK608A Broadband gateway
54	44
55	45	Open Ports
56		-: 80 (http)
57		-
58		-
	46	+: 80 (http)
59	47
60		-### Web Interface
	48	+## Web Interface
61	49
62		-Uses the microchip TCP/IP stack and `mchp.js` Microchip javascript library
	50	+Uses the microchip TCP/IP stack and `mchp.js` Microchip javascript library
63	51
64	52	`unitstatus.xml` (Status of the modem connection, 0:OK)
65	53
...	...	@@ -67,8 +55,7 @@ Uses the microchip TCP/IP stack and `mchp.js` Microchip javascript library
67	55	<connection_stat>0</connection_stat>
68	56	</response>
69	57
70		-
71		-`rfstatus.xml` (Status of each sensor connection, 0:OK, 2:Unknown)
	58	+`rfstatus.xml` (Status of each sensor connection, 0:OK, 2:Unknown)
72	59
73	60	<response>
74	61	<s1>%d</s1>
...	...	@@ -77,103 +64,92 @@ Uses the microchip TCP/IP stack and `mchp.js` Microchip javascript library
77	64	<s4>%d</s4>
78	65	</response>
79	66
	67	+`pairstatus.xml` (Pairing status for the setup wizard)
80	68
81		-`pairstatus.xml` (Pairing status for the setup wizard)
82		-
83		-
84		-`diag.htm` has the raw data from each sensor. [oilpal watchman][10]
	69	+`diag.htm` has the raw data from each sensor. [oilpal watchman][10]
85	70
86	71	See [github:markferry/tekelek-scraper](https://github.com/markferry/tekelek-scraper/)
87	72
88		-
89		-### Indicator LEDs
	73	+## Indicator LEDs
90	74
91	75	Orange
92		-: Power On
	76	+: Power On
93	77
94	78	Green
95		-: Data activity
	79	+: Data activity
96	80
97	81	Red
98		-: Error code (sequence of flashes)
	82	+: Error code (sequence of flashes)
99	83
100		-
101		-
102		-### Antenna
	84	+## Antenna
103	85
104	86	Type
105		-:
	87	+:
106	88
107	89	Frequency
108		-: 433MHz?
109		-
110		-
	90	+: 433MHz?
111	91
112		-### Error Codes
	92	+## Error Codes
113	93
114	94	4 flashes
115		-: uplink failure
	95	+: uplink failure
116	96
	97	+## SoC
117	98
	99	+### PIC
118	100
119		-### SoC
120		-
121		-#### PIC
122		-
123		-[18F27J13][13] -I/ML 15387BA
	101	+[18F27J13][13] -I/ML 15387BA
124	102
125	103	Pins
126		-: 28
	104	+: 28
127	105
128	106	PROM
129		-: 128KB
	107	+: 128KB
130	108
131	109	SRAM
132		-: 3760B
	110	+: 3760B
133	111
134	112	Remappable pins
135		-: 19
	113	+: 19
136	114
137	115	Timers 8-bit
138		-: 4
	116	+: 4
139	117
140	118	Timers 16-bit
141		-: 4
	119	+: 4
142	120
143	121	ECCP/CCP
144		-: 3/7
	122	+: 3/7
145	123
146	124	EUSART
147		-: 2
	125	+: 2
148	126
149	127	MSSP[1][14] SPI w/DMA
150		-: 2, Y
	128	+: 2, Y
151	129
152	130	MSSP I2C
153		-: Y
	131	+: Y
154	132
155	133	A/D 12-bit (ch)
156		-: 10
	134	+: 10
157	135
158	136	Comparators
159		-: 3
	137	+: 3
160	138
161	139	Deep Sleep
162		-: Y
	140	+: Y
163	141
164	142	PMP[2][16]/PSP
165		-: N
	143	+: N
166	144
167	145	CMTU[3][17]
168		-: Y
	146	+: Y
169	147
170	148	RTCC[4][18]
171		-: Y
	149	+: Y
172	150
173	151
174	152
175		-
176		-
177	153	1 Master synchronous serial port [⇑][19]
178	154
179	155	2 Parallel master port [⇑][20]
...	...	@@ -182,63 +158,55 @@ RTCC[4][18]
182	158
183	159	4 Realtime Clock and Calendar [⇑][22]
184	160
	161	+### Radio
185	162
186		-
187		-#### Radio
188		-
189		-[Si4330][23] BPS17E . 1515
190		-
191		-
	163	+[Si4330][23] BPS17E . 1515
192	164
193	165	Part Number
194		-: Si4330
	166	+: Si4330
195	167
196	168	Type
197		-: RX
	169	+: RX
198	170
199	171	Modulation Scheme (max kbps) FSK / OOK
200		-: 256 / 40
	172	+: 256 / 40
201	173
202	174	Frequency Range (MHz)
203		-: 240-960
	175	+: 240-960
204	176
205	177	Output Power Range (dBm)
206		-: -
	178	+: -
207	179
208	180	Sensitivity (dBm) 2.0 kbps FSK / 4.8 kbps OOK
209		-: -121 / -110
	181	+: -121 / -110
210	182
211	183	RX current (mA)
212		-: 18.5
	184	+: 18.5
213	185
214	186	TX current (mA)
215		-: -
	187	+: -
216	188
217	189	Package
218		-: QFN20
219		-
220		-
221		-
222		-#### SPI Flash
223		-
224		-[SST25VF040B][27] 80-41-S2AE 1537WC7-B
	190	+: QFN20
225	191
	192	+### SPI Flash
226	193
	194	+[SST25VF040B][27] 80-41-S2AE 1537WC7-B
227	195
228		-#### Ethernet Controller
	196	+### Ethernet Controller
229	197
230	198	[ENC28J60][29] -I/ML 1512UPE
231	199
232		- [10]: https://community.home-assistant.io/t/oilpal-watchman-ultrasonic-oil-tank-level-reading-for-home-assistant/113134
233		- [13]: http://www.microchip.com/wwwproducts/en/PIC18F27J13
234		- [14]: #fn1_1
235		- [16]: #fn1_2
236		- [17]: #fn1_3
237		- [18]: #fn1_4
238		- [19]: #fnr1_1
239		- [20]: #fnr1_2
240		- [21]: #fnr1_3
241		- [22]: #fnr1_4
242		- [23]: https://www.silabs.com/Marcom%20Documents/Resources/EZRadio-EZRadioPRO-Solutions.pdf
243		- [27]: https://www.microchip.com/wwwproducts/en/SST25VF040B
244		- [29]: http://www.microchip.com/wwwproducts/en/en022889
	200	+[10]: https://community.home-assistant.io/t/oilpal-watchman-ultrasonic-oil-tank-level-reading-for-home-assistant/113134
	201	+[13]: http://www.microchip.com/wwwproducts/en/PIC18F27J13
	202	+[14]: #fn1_1
	203	+[16]: #fn1_2
	204	+[17]: #fn1_3
	205	+[18]: #fn1_4
	206	+[19]: #fnr1_1
	207	+[20]: #fnr1_2
	208	+[21]: #fnr1_3
	209	+[22]: #fnr1_4
	210	+[23]: https://www.silabs.com/Marcom%20Documents/Resources/EZRadio-EZRadioPRO-Solutions.pdf
	211	+[27]: https://www.microchip.com/wwwproducts/en/SST25VF040B
	212	+[29]: http://www.microchip.com/wwwproducts/en/en022889