temp

SE/projects/bocian

@@ -1 +1 @@
-Subproject commit b2da6943377d6c973952e19e448499028dd7945d
+Subproject commit 884f8afb76695cc71bcf21ec47914bf8571d6823

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

@@ -28,25 +28,31 @@ U8G2_SSD1306_128X32_UNIVISION_F_HW_I2C u8g2(U8G2_R0);
 
 int test_pwm_pin = 9;
 
+int in_test_status_p5_temp_1 = A0 ;
+int in_test_status_p5_temp_2 = A1 ;
+int in_test_status_p5_temp_3 = A2 ;
+int in_test_status_p5_temp_4 = A3 ;
+
 int out_test_status_p5_bus_1_port_6_red_led_pin = 5 ;
 int  in_test_status_p5_bus_1_port_7_red_buttopn_pin = 6 ;
 int out_test_status_p5_bus_1_port_8_green_led_pin = 7 ;
 int  in_test_status_p5_bus_1_port_9_black_buttopn_pin = 8 ;
 
 
+//#define HAS_task
 
-
-#include "___main/__main_task_struct.h"
-
+#if defined(HAS_task)
+ #include "___main/__main_task_struct.h"
+#endif
 
 //#include "scan_ports_setup.c"
 
 //static int outPins[] = {9};
 //static int inPins[] = {5};
-
-#include "___main/__main_task_func.h"
-#include "i2c_scanner_func.h"
-
+#if defined(HAS_task)
+    #include "___main/__main_task_func.h"
+    #include "i2c_scanner_func.h"
+#endif
 
  void setup(void) {
     #if defined(HAS_Adafruit_SSD1306)
@@ -67,6 +73,13 @@ int  in_test_status_p5_bus_1_port_9_black_buttopn_pin = 8 ;
   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_3, INPUT_PULLUP);
+  pinMode(in_test_status_p5_temp_4, INPUT_PULLUP);
+
+
+
 
    #if defined(HAS_u8g2)
    u8g2.clearBuffer();         // clear the internal memory
@@ -76,48 +89,43 @@ int  in_test_status_p5_bus_1_port_9_black_buttopn_pin = 8 ;
    u8g2.drawStr(4,29,"P5 status");  // write something to the internal memory
    u8g2.sendBuffer();         // transfer internal memory to the display
    #endif
-   
-   #include "i2c_scanner_setup.h"
-   i2c_scanner();
+   #if defined(HAS_task)
+        #include "i2c_scanner_setup.h"
+        i2c_scanner();
+   #endif
 }
 
 //#include "scan_ports.c"
 
 void status_pin(int pin) {
     int state = digitalRead(pin );
-       
-   
-        //A      u8g2.clearBuffer();         // clear the internal memory
-              //u8g2.setFont(u8g2_font_logisoso28_tr);  // choose a suitable font at https://github.com/olikraus/u8g2/wiki/fntlistall
-              //u8g2.drawStr(4,29,String(pin) );  // write something to the internal memory 
-              
-              
-       //A          u8g2.setFont(u8g2_font_amstrad_cpc_extended_8f);  // choose a suitable font
-
-       //A         u8g2.setCursor(3,10);
-   //A            u8g2.print (" P. [ ");
-   //A           u8g2.print(pin, DEC );  // write something to the internal memory
-    //A    u8g2.print (" ] ");
-
-   //A           u8g2.sendBuffer();         // transfer internal memory to the display
-        
-      //A   delay(100);
-        
            if(state == HIGH) {
               // Good
               #if defined(HAS_u8g2)
              // u8g2.setCursor (3, 20);
-              u8g2.print (" + ");
+              u8g2.print (" +");
               u8g2.sendBuffer();         // transfer internal memory to the display
               #endif
            } else
               // Bad
               #if defined(HAS_u8g2)
           //    u8g2.setCursor (3, 20);
-               u8g2.print (" - ");
+               u8g2.print (" -");
                u8g2.sendBuffer();         // transfer internal memory to the display
              #endif
-             delay(800);
+            
+}
+
+
+void status_analog_pin(int pin) {
+    int level = round(analogRead(pin ) / 10);
+              #if defined(HAS_u8g2)
+               //u8g2.print("");
+               u8g2.print (level);
+                 u8g2.print(",");
+               u8g2.sendBuffer();         // transfer internal memory to the display
+             #endif
+           
 }
 
 void loop(void) {
@@ -142,7 +150,7 @@ void loop(void) {
     #if defined(HAS_u8g2)
     u8g2.clearBuffer();        
     u8g2.setFont(u8g2_font_amstrad_cpc_extended_8f);  // choose a suitable font
-    u8g2.setCursor(3,10);
+    u8g2.setCursor(0,10);
     #endif
     
     #if defined(HAS_Adafruit_SSD1306)
@@ -158,7 +166,14 @@ void loop(void) {
     status_pin(out_test_status_p5_bus_1_port_8_green_led_pin);
     
     status_pin(in_test_status_p5_bus_1_port_9_black_buttopn_pin);
-    
+      #if defined(HAS_u8g2)
+        u8g2.setCursor(0,20);
+       //  u8g2.setFont(u8g2_font_m2icon_5_tf);  // choose a suitable font
+      #endif
+    status_analog_pin(in_test_status_p5_temp_1);
+    status_analog_pin(in_test_status_p5_temp_2);
+    status_analog_pin(in_test_status_p5_temp_3);
+    status_analog_pin(in_test_status_p5_temp_4);
 
   
 }

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

@@ -5,21 +5,41 @@
 //param - value
 
 
-void TASK_COMMIT(TASK_ARRAY_T TASK_ARRAY_A) {
-    static TASK_LIST_ARRAY_T TASK_LIST_ARRAY_A[100];
+TASK_ATTR_ID_T TASK_COMMIT(TASK_ARRAY_T TASK_ARRAY_A) {
+    static TASK_LIST_ARRAY_T TASK_LIST_ARRAY_A[TASK_LIST_ARRAY_A_LIMIT];
+    TASK_ATTR_ID_T TASK_ATTR_ID_NEW ;
 //String TASK_ATTR_NAME_A_S = toCharArray(buf, len)();
 // String TASK_ATTR_NAME_A_S( (TASK_ARRAY_A.TASK_ATTR_NAME_A) charArray);
 
-  Serial.print  ("TASK_COMMIT : 1[");
-  Serial.print (TASK_ARRAY_A.TASK_ATTR_NAME_A[1]);
-  Serial.print  ("] , 2[");
+ // Serial.print  ("TC1[");
+ // Serial.print (TASK_ARRAY_A.TASK_ATTR_NAME_A[1]);
+  Serial.print  ("],[");
   Serial.print (TASK_ARRAY_A.TASK_ATTR_PARAM_A[1]);
-  Serial.print  ("] , 3[");
+  Serial.print  ("],[");
   Serial.print (TASK_ARRAY_A.TASK_ATTR_PARAM_VALUE_INT_A);
-  Serial.print  ("] , 4[");
-  Serial.print (TASK_ARRAY_A.TASK_ATTR_PARAM_VALUE_CHAR_8_A);
+  Serial.print  ("],[");
+  Serial.print (TASK_ARRAY_A.TASK_ATTR_PARAM_VALUE_CHAR_8_A[1]);
   Serial.println  ("]");
 
+    for(int i = 1; i < TASK_LIST_ARRAY_A_LIMIT; i++) {
+      if(TASK_LIST_ARRAY_A[i].TASK_ATTR_ID_A > TASK_ATTR_ID_EMPTY_A ) {
+         Serial.print  ("T>0[");
+          Serial.print  (i);
+           Serial.print ("]");
+           Serial.println  (TASK_LIST_ARRAY_A[i].TASK_ATTR_ID_A);
+      } else {
+          Serial.print  ("T0[");
+             Serial.print  (i);
+           Serial.println  ("] ");
+            TASK_ATTR_ID_NEW = i ;
+           break;
+      }
+    }
+    
+    TASK_LIST_ARRAY_A[TASK_ATTR_ID_NEW].TASK_ATTR_ID_A = TASK_ATTR_ID_NEW ;
+    TASK_LIST_ARRAY_A[TASK_ATTR_ID_NEW].TASK_ARRAY_A = TASK_ARRAY_A ;
+    return TASK_ATTR_ID_NEW;
+   
 /*
     if(TASK_ARRAY_A.TASK_ATTR_NAME_A.equals("DIS_LCD") ) { // TASK_ATTR_NAME_DISPLAY_LCD_A ) {
      Serial.println ("TASK_ATTR_NAME_DISPLAY_LCD_A");

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

@@ -34,6 +34,7 @@ typedef TASK_ARRAY_S TASK_ARRAY_T;
 
 
 typedef int TASK_ATTR_ID_T;
+const TASK_ATTR_ID_T TASK_ATTR_ID_EMPTY_A = 0 ;
 
 struct TASK_LIST_ARRAY_S {
     TASK_ATTR_ID_T TASK_ATTR_ID_A; 
@@ -42,3 +43,4 @@ struct TASK_LIST_ARRAY_S {
 
 typedef TASK_LIST_ARRAY_S TASK_LIST_ARRAY_T;
 
+const int TASK_LIST_ARRAY_A_LIMIT = 20 ;

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

@@ -4,20 +4,19 @@
 void i2c_scanner() {
 
 
- TASK_ATTR_PARAM_VALUE_CHAR_8_T TASK_ATTR_PARAM_VALUE_CHAR_8_A = "I2C Sca" ;
+ //TASK_ATTR_PARAM_VALUE_CHAR_8_T TASK_ATTR_PARAM_VALUE_CHAR_8_A = "I2C Sca" ;
 
 
    TASK_ARRAY_T  TASK_ARRAY_A_MSG  = {} ; //= {} ;
  
   memcpy(TASK_ARRAY_A_MSG.TASK_ATTR_NAME_A, TASK_ATTR_NAME_DISPLAY_LCD_A, 8);
-
-//TASK_ARRAY_A_MSG.TASK_ATTR_NAME_A = {"DIS_LCD"} ; //TASK_ATTR_NAME_DISPLAY_LCD_A ;
   memcpy(TASK_ARRAY_A_MSG.TASK_ATTR_PARAM_A, TASK_ATTR_PARAM_TEXT_A, 8);
+  TASK_ARRAY_A_MSG.TASK_ATTR_PARAM_VALUE_INT_A  = TASK_ATTR_PARAM_VALUE_INT_EMPTY_A ;
 
-TASK_ARRAY_A_MSG.TASK_ATTR_PARAM_VALUE_INT_A  = TASK_ATTR_PARAM_VALUE_INT_EMPTY_A ;
-
-String TASK_ATTR_PARAM_VALUE_CHAR_8_A_S = "S1234567" ;
-TASK_ATTR_PARAM_VALUE_CHAR_8_A_S.toCharArray(TASK_ARRAY_A_MSG.TASK_ATTR_PARAM_VALUE_CHAR_8_A, 8);
+  String TASK_ATTR_PARAM_VALUE_CHAR_8_A_S = "I2C Sca"  ;
+  TASK_ATTR_PARAM_VALUE_CHAR_8_T TASK_ATTR_PARAM_VALUE_CHAR_8_A;
+  TASK_ATTR_PARAM_VALUE_CHAR_8_A_S.toCharArray(TASK_ATTR_PARAM_VALUE_CHAR_8_A, 8);
+  memcpy(TASK_ARRAY_A_MSG.TASK_ATTR_PARAM_VALUE_CHAR_8_A,TASK_ATTR_PARAM_VALUE_CHAR_8_A, 8);
 
 
 //TASK_ATTR_PARAM_VALUE_CHAR_8_T TASK_ARRAY_A_MSG.TASK_ATTR_PARAM_VALUE_CHAR_8_A  =  ;