|
|
@@ -16,7 +16,9 @@
|
|
|
int I2C_port,
|
|
|
//int I2C_driver
|
|
|
I2C_driver_T I2C_driver,
|
|
|
- IS_Local_T IS_Local_A
|
|
|
+ IS_Local_T IS_Local_A,
|
|
|
+ time_seq_id_T time_seq_id,
|
|
|
+ time_min_run_T time_min_run
|
|
|
)
|
|
|
{
|
|
|
|
|
|
@@ -62,6 +64,8 @@
|
|
|
found = false ;
|
|
|
int found_id ;
|
|
|
for(i = ARDUINO_ARRAY_INDEX_FIRST; i<= Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A ; i++ ) {
|
|
|
+ //when add context - we should TTL_broadcast ourselves
|
|
|
+
|
|
|
if((Slave_Ports_Status_A[i].Port_ID == Port_ID) and (Slave_Ports_Status_A[i]._Slave_ID == _Slave_ID )) {
|
|
|
found = true ;
|
|
|
Serial.print("+D");Serial.print(i);
|
|
|
@@ -89,7 +93,12 @@
|
|
|
ARDUINO_ATTR_ARRAY_S__commit_added_element(
|
|
|
Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
i);//Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
+ _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ TASK_TYPE_T_Broadcast_state_LOW______ ,TASK_PORT_ASSOC_EMPTY ,time_seq_id, time_seq_id + 50000 , ARDUINO_ARRAY_INDEX_NOT_SET ) ;
|
|
|
+
|
|
|
+
|
|
|
} else {
|
|
|
//duplicated
|
|
|
//update
|
|
|
@@ -131,26 +140,30 @@
|
|
|
|
|
|
String title = "Ports of 0x" ; title.concat(String(Active_ControllerID_HEX , HEX)); title.concat(" ");
|
|
|
|
|
|
-
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_CURSOR_X_CHARS_A = 0 ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_CURSOR_Y_CHARS_A = 0 ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_string_A = title ;// "Ports"; //DISPLAY_string_A ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_COLOR_A = 0x0004 ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[1].DISPLAY_MENU_ITEM_FLAG_A = DISPLAY_MENU_ITEM_FLAG_INITIALIZED ;
|
|
|
-
|
|
|
-
|
|
|
|
|
|
+
|
|
|
+ int i_pos = 1;
|
|
|
int i;
|
|
|
-
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].ARDUINO_ARRAY_INDEX_CURRENT_A = 1 ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_SIZE_X_CHARS_MIN_A = 0 ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_SIZE_Y_CHARS_MIN_A = 0 ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_SIZE_X_CHARS_MAX_A = 0 ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_SIZE_Y_CHARS_MAX_A = 8 ;// DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_Y_CHARS_A ;
|
|
|
-
|
|
|
+
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].ARDUINO_ARRAY_INDEX_CURRENT_A = 1 ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_SIZE_X_CHARS_MIN_A = 0 ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_SIZE_Y_CHARS_MIN_A = 0 ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_SIZE_X_CHARS_MAX_A = 0 ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_SIZE_Y_CHARS_MAX_A = 8 ;// DISPLAY_PHYSICAL_CHAR_A.DISPLAY_PHYSICAL_Y_CHARS_A ;
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].DISPLAY_CURSOR_X_CHARS_A = 0 ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].DISPLAY_CURSOR_Y_CHARS_A = 0 ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].DISPLAY_string_A = title ;// "Ports"; //DISPLAY_string_A ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].DISPLAY_COLOR_A = 0x0004 ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].DISPLAY_MENU_ITEM_FLAG_A = DISPLAY_MENU_ITEM_FLAG_INITIALIZED ;
|
|
|
+
|
|
|
+
|
|
|
|
|
|
|
|
|
- for(i=ARDUINO_ARRAY_INDEX_FIRST ; i<=5 ; i++) {//i <= Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A
|
|
|
+ for(i=ARDUINO_ARRAY_INDEX_FIRST ; i<=Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ; i++) {//i <= Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A
|
|
|
DISPLAY_array16_T DISPLAY_array16_AA="" ;
|
|
|
DISPLAY_array16_T DISPLAY_array16_AB="" ;
|
|
|
|
|
|
@@ -159,7 +172,7 @@
|
|
|
|
|
|
if(Slave_Ports_Status_A[i].Port_ID > 0 ) {
|
|
|
|
|
|
-
|
|
|
+ i_pos ++ ;
|
|
|
|
|
|
String message = "";
|
|
|
String message2 ;
|
|
|
@@ -227,14 +240,16 @@
|
|
|
|
|
|
|
|
|
// String message = "P "; message.concat(Slave_Ports_Status_A[i].Port_ID) ; message.concat(" ");
|
|
|
+
|
|
|
+ if(i_pos < ARDUINO_ARRAY_INDEX_LIMIT_DISPLAY_MENU_ITEM_A) {
|
|
|
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_CURSOR_X_CHARS_A = 0 ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_CURSOR_Y_CHARS_A = i ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_string_A = message2 ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_COLOR_A = BLACK ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_MENU_ITEM_FLAG_A = DISPLAY_MENU_ITEM_FLAG_INITIALIZED ;
|
|
|
- DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].ARDUINO_ARRAY_INDEX_A = i ;
|
|
|
-
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].DISPLAY_CURSOR_X_CHARS_A = 0 ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].DISPLAY_CURSOR_Y_CHARS_A = i ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].DISPLAY_string_A = message2 ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].DISPLAY_COLOR_A = BLACK ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].DISPLAY_MENU_ITEM_FLAG_A = DISPLAY_MENU_ITEM_FLAG_INITIALIZED ;
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i_pos].ARDUINO_ARRAY_INDEX_A = i ;
|
|
|
+ }
|
|
|
|
|
|
//DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_CURSOR_X_CHARS_A = 0 ;
|
|
|
//DISPLAY_PHYSICAL_CHAR_A.DISPLAY_MENU_A[1].DISPLAY_MENU_ITEM_A[i+1].DISPLAY_CURSOR_Y_CHARS_A = i ;
|