upd derive rewir by geom

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/P5_automation_arduino_status_submodule/P5_automation_arduino_status_submodule.ino

@@ -84,8 +84,8 @@ U8G2_SSD1306_128X32_UNIVISION_F_HW_I2C u8g2(U8G2_R0);
   pinMode(out_test_status_p5_bus_1_port_8_green_led_pin, OUTPUT);
   pinMode(in_test_status_p5_bus_1_port_9_black_buttopn_pin, INPUT_PULLUP);
     //analogWrite(test_pwm_pin, 20);
-  pinMode(in_test_status_p5_temp_1, INPUT_PULLUP);//INPUT_PULLUP
-  pinMode(in_test_status_p5_temp_2, INPUT_PULLUP);
+ // pinMode(in_test_status_p5_temp_1, INPUT_PULLUP);//INPUT_PULLUP
+ // pinMode(in_test_status_p5_temp_2, INPUT_PULLUP);
   pinMode(in_test_status_p5_temp_3, INPUT_PULLUP);
   pinMode(in_test_status_p5_temp_4, INPUT_PULLUP);
 
@@ -178,8 +178,8 @@ void loop(void) {
     STATUS_PHYS_PIN_INPUT_INT_OK_F(STATUS_SYSTEM_CONDITION_A, in_test_status_p5_bus_1_port_9_black_buttopn_pin);
     //status_pin(in_test_status_p5_bus_1_port_9_black_buttopn_pin);
       
-    STATUS_PHYS_PIN_INPUT_RANGE_F(in_test_status_p5_temp_1, in_test_status_p5_temp_1_RANGE_A,  STATUS_SYSTEM_CONDITION_ERROR_COUNT_A);
-    STATUS_PHYS_PIN_INPUT_RANGE_F(in_test_status_p5_temp_2, in_test_status_p5_temp_2_RANGE_A,  STATUS_SYSTEM_CONDITION_ERROR_COUNT_A);
+   //Z STATUS_PHYS_PIN_INPUT_RANGE_F(in_test_status_p5_temp_1, in_test_status_p5_temp_1_RANGE_A,  STATUS_SYSTEM_CONDITION_ERROR_COUNT_A);
+   //Z STATUS_PHYS_PIN_INPUT_RANGE_F(in_test_status_p5_temp_2, in_test_status_p5_temp_2_RANGE_A,  STATUS_SYSTEM_CONDITION_ERROR_COUNT_A);
    #if defined(HAS_u8g2)
         u8g2.setCursor(0,20);
        //  u8g2.setFont(u8g2_font_m2icon_5_tf);  // choose a suitable font

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/P5_automation_arduino_status_submodule/___CONFIG/config_status.h

@@ -13,8 +13,10 @@ STATUS_PHYS_PIN_INPUT_T in_test_status_p5_temp_4 = A3 ;
     STATUS_PHYS_PIN_INPUT_RANGE_T in_test_status_p5_temp_4_RANGE_A = { 0 , 2000 } ;
 
 STATUS_PHYS_PIN_INPUT_T in_test_status_p5_current = A6 ;
+          STATUS_PHYS_PIN_INPUT_RANGE_T in_test_status_p5_curren_RANGE_A = { 0 , 1230 } ; //== 830 za malo
+        //STATUS_PHYS_PIN_INPUT_RANGE_T in_test_status_p5_curren_RANGE_A = { 0 , 730 } ; //== tez lapie opor 730 z pokazywaniem 900
+        //STATUS_PHYS_PIN_INPUT_RANGE_T in_test_status_p5_curren_RANGE_A = { 0 , 670 } ; //== about lapie szybkie jalowe wcisniecie gazu 670
         //STATUS_PHYS_PIN_INPUT_RANGE_T in_test_status_p5_curren_RANGE_A = { 0 , 520 } ; //== about 2A test
-        STATUS_PHYS_PIN_INPUT_RANGE_T in_test_status_p5_curren_RANGE_A = { 0 , 520 } ; //== about 2A test
 
 
 

SE/stuff/P5_Automation_can-dev-res-working-1930/___SUBMODULES___/P5_automation_arduino_status_submodule/___main/__main_struct_status_func.h

@@ -25,9 +25,17 @@ void STATUS_PHYS_PIN_INPUT_RANGE_F(STATUS_PHYS_PIN_INPUT_ANALOG_T pin,
      
               #if defined(HAS_u8g2)
                //u8g2.print("");
-               u8g2.print (level);
+               u8g2.print (level); 
+               //u8g2.print("[");
+                 //u8g2.print (level / STATUS_PHYS_PIN_INPUT_RANGE_A.STATUS_PHYS_PIN_INPUT_VALUE_MIN_A * 100);
+                 //u8g2.print("/");
+                // u8g2.print (level / STATUS_PHYS_PIN_INPUT_RANGE_A.STATUS_PHYS_PIN_INPUT_VALUE_MAX_A *100);
+                 
                  u8g2.print(",");
                u8g2.sendBuffer();         // transfer internal memory to the display
+               
+               if(STATUS_SYSTEM_CONDITION_ERROR_COUNT_A > 0 ) delay(200);
+               
              #endif
 }
 

SE/superedit-STATYSTYKA_TABELE.php

@@ -779,6 +779,14 @@ function STATYSTYKA_TABELE() {
 			$sqlList[] = " alter table USERS2_MARKETING_OVERWIEV add P_ACCOUNT varchar(40) not null  ; ";
 			$sqlList[] = "ALTER TABLE `USERS2_MARKETING_OVERWIEV_REWIR` CHANGE `the_geom` `the_geom` POLYGON NULL DEFAULT NULL;";
 			$sqlList[] = "ALTER TABLE `USERS2_MARKETING_OVERWIEV` CHANGE `the_geom` `the_geom` POLYGON NULL DEFAULT NULL;";
+			
+			$sqlList[] = "update BUILDINGS as b 
+							inner join (
+							select p.NAZWA_REWI , p.the_geom from MK_Rewiry as p    group by p.ID order by ST_Area(p.the_geom) 
+							) as p on  ST_Intersects(p.the_geom,b.the_geom)
+							set b.M_REWIR=p.NAZWA_REWI where  b.M_REWIR='' ;";
+			
+			
 			$sqlList[] = "update BUILDINGS as b 
 							inner join (
 							select p.ID , p.the_geom from IN7_MK_BAZA_DYSTRYBUCJI as p    group by p.ID order by ST_Area(p.the_geom)