pvvx
diff --git a/‎Makefile‎
Lines changed: 2 additions & 2 deletions b/‎Makefile‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎WEBFiles/protect/i219u.htm‎
Lines changed: 1 addition & 1 deletion b/‎WEBFiles/protect/i219u.htm‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎WEBFilesRS485/sht7x.ovl‎
0 Bytes b/‎WEBFilesRS485/sht7x.ovl‎
0 Bytes
diff --git a/‎WEBFilesRS485/udptp.ovl‎
0 Bytes b/‎WEBFilesRS485/udptp.ovl‎
0 Bytes
diff --git a/‎WEBFilesRS485/wdrv.ovl‎
0 Bytes b/‎WEBFilesRS485/wdrv.ovl‎
0 Bytes
diff --git a/‎WEBFilesTCP2UART/ina219.htm‎
Lines changed: 1 addition & 1 deletion b/‎WEBFilesTCP2UART/ina219.htm‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎WEBFilesTCP2UART/protect/debug.htm‎
Lines changed: 2 additions & 1 deletion b/‎WEBFilesTCP2UART/protect/debug.htm‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎WEBFilesTCP2UART/protect/init.ini‎
Lines changed: 1 addition & 2 deletions b/‎WEBFilesTCP2UART/protect/init.ini‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎info/libs/main/user_interface.c‎
Lines changed: 9 additions & 0 deletions b/‎info/libs/main/user_interface.c‎
Lines changed: 9 additions & 0 deletions
diff --git a/‎ovls/i219u/main/ina219u.c‎
Lines changed: 3 additions & 3 deletions b/‎ovls/i219u/main/ina219u.c‎
Lines changed: 3 additions & 3 deletions
@@ -6,9 +6,9 @@
 
 ESPOPTION ?= -p COM7 -b 460800
 
-UPLOADADDR = http://atesp8266/fsupload TESP8266
+UPLOADADDR = http://stesp8266/fsupload TESP8266
 
-UPLOADOVL = ./ovls/bin/sync.ovl
+UPLOADOVL = ./ovls/bin/i219u.ovl
 
 # SPI_SPEED = 40MHz or 80MHz
 SPI_SPEED?=80
 
@@ -7,7 +7,7 @@
 </head>
 <body>
 ~inc:menu.inc~
-<! ~sys_debug=0~,~mdbw60=0,2~>
+<! ~sys_debug=0~,~mdbw60=5,4~>
 <div class="content">
 <h2 class="title">UDP INA219 Port</h2>
 <table class="form"><form method="post" action="">
 
@@ -1,6 +1,6 @@
 ~inc:grfx1.inc~
 <td width="50%">Ivcc: <span id="xdata" style="font-weight:bold">?</span> mA</td>
-<! ~sys_debug=0~,~mdbw60=0,2~,~ovl:ina219.ovl~>
+<! ~sys_debug=0~,~mdbw60=5,4~,~ovl:ina219.ovl~>
 <script type="text/javascript">
  var xmlfile = 'ina219.xml';
  var xmin = 70;
 
@@ -9,7 +9,8 @@
 <h2 class="title">Debug and Tests</h2>
 <p class="center">
 Chart <a href="/heap.htm">'heap'</a>, <a href="/adc.htm">ADC</a>, <a href="/vdd.htm">Vdd</a>, <a href="/tst.htm">ST-AP RSSI</a><br><br>
-Overlays <a href="/protect/udpwave.htm">UDP Wave Port</a>, <a href="/protect/udptst.htm">UDP Test Port</a>, <a href="/protect/mdb.htm?ovl=sht7x.ovl">SHT71</a><br><br>
+Overlays <a href="/protect/udpwave.htm">UDP Wave Port</a>, <a href="/protect/udptst.htm">UDP Test Port</a>, <a href="/protect/i219u.htm">UDP INA219 Port</a>, <a href="/protect/mdb.htm?ovl=sht7x.ovl">SHT71</a><br><br>
+<a href="/ina219.htm">INA219</a>,  <a href="/i219ws.htm">INA219 WebSock</a><br><br>
 Page <a href="/protect/mdb.htm">Modbus Data</a>, <a href="/sample.htm">Vars Sample</a>, <a href="/websock.htm">Websock Sample</a><br><br>
 Get <a href="/system.xml">system.xml</a>, <a href="/protect/aps.xml">aps.xml</a>, <a href="/protect/pr_request.xml">pr_request.xml</a>, <a href="/protect/mdb.bin">mdb.bin</a><br><br><br>
 <a title='Not work for any mode...' href='/timeout.htm?sys_reset=12345'>SoftWare Reset</a>, <a title='Not work for any mode...' href='/timeout.htm?sys_restart=12345'>System Restart</a><br><br>
 
@@ -1,7 +1,6 @@
-mdbfini=protect/mdbini.bin
 sys_ram0x60000f00=0x48
 sys_ram0x60000f00=0x65
 sys_ram0x60000f00=0x6c
 sys_ram0x60000f00=0x6c
 sys_ram0x60000f00=0x6f
-sys_ram0x60000f00=0x21
+sys_ram0x60000f00=0x21
@@ -566,6 +566,15 @@ void system_deep_sleep_local_2(void)
 	IO_RTC_2 = 1<<20; // rtc_enter_sleep()	HWREG(PERIPHS_RTC_BASEADDR, 0x08) = 0x100000;
 }
 
+Т.е. вместо того, чтобы написать:
+void __attribute__ ((noreturn)) system_deep_sleep_local_2(void)
+{
+	....
+	IO_RTC_2 = 1<<20; // rtc_enter_sleep()	
+	while(1);
+}
+
+
 
 void system_deep_sleep_instant(void *timer_arg) // В ранних SDK _sys_deep_sleep_timer()
 {
 
@@ -165,7 +165,7 @@ uint16 ICACHE_FLASH_ATTR IntReadIna219(uint32 num)
  //#define TIMER0_USE_NMI_VECTOR
  Предел при NMI примерно до 50 кГц из-за прервания обработки WiFi...
  ------------------------------------------------------------------------------*/
-void timer0_isr(void)
+void ICACHE_FLASH_ATTR timer0_isr(void)
 {
 	if(out_wave_pbuf != NULL) {
 		out_wave_pbuf[wdrv_buf_wr_idx] = IntReadIna219(wdrv_buf_wr_idx);
@@ -211,7 +211,7 @@ int ICACHE_FLASH_ATTR OpenINA219(void)
 		return -2;
 }
 
-void wdrv_stop(void)
+void ICACHE_FLASH_ATTR wdrv_stop(void)
 {
 #ifdef USE_TIMER0
 	timer0_stop();	
@@ -458,7 +458,7 @@ void ICACHE_FLASH_ATTR close_wdrv(void)
 
 //=============================================================================
 //=============================================================================
-int ovl_init(int flg)
+int ICACHE_FLASH_ATTR ovl_init(int flg)
 {
 int i = 0;
 	switch(flg) {
Original file line number	Diff line number	Diff line change
`@@ -566,6 +566,15 @@ void system_deep_sleep_local_2(void)`
`566`	`566`	`IO_RTC_2 = 1<<20; // rtc_enter_sleep() HWREG(PERIPHS_RTC_BASEADDR, 0x08) = 0x100000;`
`567`	`567`	`}`
`568`	`568`
	`569`	`+Т.е. вместо того, чтобы написать:`
	`570`	`+void __attribute__ ((noreturn)) system_deep_sleep_local_2(void)`
	`571`	`+{`
	`572`	`+ ....`
	`573`	`+ IO_RTC_2 = 1<<20; // rtc_enter_sleep()`
	`574`	`+ while(1);`
	`575`	`+}`
	`576`	`+`
	`577`	`+`
`569`	`578`
`570`	`579`	`void system_deep_sleep_instant(void *timer_arg) // В ранних SDK _sys_deep_sleep_timer()`
`571`	`580`	`{`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ uint16 ICACHE_FLASH_ATTR IntReadIna219(uint32 num)`
`165`	`165`	`//#define TIMER0_USE_NMI_VECTOR`
`166`	`166`	`Предел при NMI примерно до 50 кГц из-за прервания обработки WiFi...`
`167`	`167`	`------------------------------------------------------------------------------*/`
`168`		`-void timer0_isr(void)`
	`168`	`+void ICACHE_FLASH_ATTR timer0_isr(void)`
`169`	`169`	`{`
`170`	`170`	`if(out_wave_pbuf != NULL) {`
`171`	`171`	`out_wave_pbuf[wdrv_buf_wr_idx] = IntReadIna219(wdrv_buf_wr_idx);`
`@@ -211,7 +211,7 @@ int ICACHE_FLASH_ATTR OpenINA219(void)`
`211`	`211`	`return -2;`
`212`	`212`	`}`
`213`	`213`
`214`		`-void wdrv_stop(void)`
	`214`	`+void ICACHE_FLASH_ATTR wdrv_stop(void)`
`215`	`215`	`{`
`216`	`216`	`#ifdef USE_TIMER0`
`217`	`217`	`timer0_stop();`
`@@ -458,7 +458,7 @@ void ICACHE_FLASH_ATTR close_wdrv(void)`
`458`	`458`
`459`	`459`	`//=============================================================================`
`460`	`460`	`//=============================================================================`
`461`		`-int ovl_init(int flg)`
	`461`	`+int ICACHE_FLASH_ATTR ovl_init(int flg)`
`462`	`462`	`{`
`463`	`463`	`int i = 0;`
`464`	`464`	`switch(flg) {`