|
@@ -20,11 +20,17 @@
|
|
|
Serial.print("] INDEX_LAST["); Serial.print( DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A);
|
|
Serial.print("] INDEX_LAST["); Serial.print( DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A);
|
|
|
Serial.print("] INDEX_CURRENT["); Serial.print( DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
|
|
Serial.print("] INDEX_CURRENT["); Serial.print( DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
|
|
|
Serial.print("] NEXT_A["); Serial.print( DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A);
|
|
Serial.print("] NEXT_A["); Serial.print( DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A);
|
|
|
|
|
+ Serial.print("] DISPLAY_array16_A["); Serial.print( DISPLAY_array16_A);
|
|
|
Serial.println("] ");
|
|
Serial.println("] ");
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
- int i = DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;
|
|
|
|
|
|
|
+ ARDUINO_ARRAY_INDEX_CURRENT_T i = DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;
|
|
|
if(i == ARDUINO_ARRAY_INDEX_CORRUPT) {
|
|
if(i == ARDUINO_ARRAY_INDEX_CORRUPT) {
|
|
|
|
|
+ #ifdef DEBUG
|
|
|
|
|
+ Serial.print(" [#30 i == ARDUINO_ARRAY_INDEX_CORRUPT] [");
|
|
|
|
|
+ Serial.print(i);
|
|
|
|
|
+
|
|
|
|
|
+ #endif
|
|
|
DISPLAY_A[i]._queue_id = 0; //current queue task
|
|
DISPLAY_A[i]._queue_id = 0; //current queue task
|
|
|
DISPLAY_A[i].DISPLAY_pos_seq_A = 0 ;
|
|
DISPLAY_A[i].DISPLAY_pos_seq_A = 0 ;
|
|
|
DISPLAY_A[i].DISPLAY_pos_id_A = 0 ;
|
|
DISPLAY_A[i].DISPLAY_pos_id_A = 0 ;
|
|
@@ -33,33 +39,86 @@
|
|
|
DISPLAY_A[i].time_seq_id_A = 0 ;
|
|
DISPLAY_A[i].time_seq_id_A = 0 ;
|
|
|
DISPLAY_A[i].time_min_run_A = 0 ;
|
|
DISPLAY_A[i].time_min_run_A = 0 ;
|
|
|
|
|
|
|
|
|
|
+
|
|
|
ARDUINO_ATTR_ARRAY_S__commit_added_element(
|
|
ARDUINO_ATTR_ARRAY_S__commit_added_element(
|
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_A , i);
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_A , i);
|
|
|
|
|
+ #ifdef DEBUG
|
|
|
|
|
+ Serial.print(" [#43 ARDUINO_ATTR_ARRAY_S__commit_added_element] ");
|
|
|
|
|
+ Serial.print("#47 ARDUINO_ARRAY_INDEX_CURRENT_A: [");
|
|
|
|
|
+ Serial.print(DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A);
|
|
|
|
|
+ Serial.print("] ");
|
|
|
|
|
+ #endif
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
i = DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A ;
|
|
i = DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A ;
|
|
|
//DISPLAY_array16_T DISPLAY_array16_AA =
|
|
//DISPLAY_array16_T DISPLAY_array16_AA =
|
|
|
- String(DISPLAY_array16_A).toCharArray(DISPLAY_A[i].DISPLAY_array16_A,16) ;
|
|
|
|
|
- DISPLAY_A[i]._queue_id = 0; //current queue task
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ /* String message = "" ;
|
|
|
|
|
+ DISPLAY_array16_T DISPLAY_array16_AAT ;
|
|
|
|
|
+ message.concat(DISPLAY_array16_A) ;
|
|
|
|
|
+ message.toCharArray(DISPLAY_array16_AAT, 16);
|
|
|
|
|
+
|
|
|
|
|
+ */
|
|
|
|
|
+ //String(DISPLAY_array16_A).toCharArray(DISPLAY_A[i].DISPLAY_array16_A,16) ;
|
|
|
|
|
+
|
|
|
|
|
+ //DISPLAY_array16_T DISPLAY_array16_AAA[16]="";
|
|
|
|
|
+
|
|
|
|
|
+ //DISPLAY_array16_T DISPLAY_array16_AA[16] ; //= {012345678901234" ;
|
|
|
|
|
+
|
|
|
|
|
+ //String("12345678901234").toCharArray(DISPLAY_array16_AA);
|
|
|
|
|
+ // DISPLAY_array16_AA = "012345678901234" ;
|
|
|
|
|
+ // char dupa[16]= "#50 Added ports ";
|
|
|
|
|
+ /*
|
|
|
|
|
+ String message16=String(DISPLAY_array16_A);
|
|
|
|
|
+ message16.concat(DISPLAY_array16_FILL_A);//("_____________________");
|
|
|
|
|
+ //message16.reserve(16);
|
|
|
|
|
+ //DISPLAY_array16_T
|
|
|
|
|
+ char DISPLAY_array16_AAAA[16];
|
|
|
|
|
+ message16.toCharArray(DISPLAY_array16_AAAA,16);
|
|
|
|
|
+ */
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ /* #ifdef DEBUG
|
|
|
|
|
+ Serial.print("#57 ["); Serial.print(message16);
|
|
|
|
|
+ Serial.print("] #82["); Serial.print(DISPLAY_array16_AAAA); Serial.println("] ");
|
|
|
|
|
+ Serial.print("] #82A["); Serial.print(message16); Serial.println("] ");
|
|
|
|
|
+ Serial.print("] #82B["); Serial.print(String(DISPLAY_array16_AAAA)); Serial.println("] ");
|
|
|
|
|
+
|
|
|
|
|
+ #endif*/
|
|
|
|
|
+ /* DISPLAY_A[i]._queue_id = 0; //current queue task
|
|
|
DISPLAY_A[i].DISPLAY_pos_seq_A = DISPLAY_pos_seq_A ;
|
|
DISPLAY_A[i].DISPLAY_pos_seq_A = DISPLAY_pos_seq_A ;
|
|
|
DISPLAY_A[i].DISPLAY_pos_id_A = 0 ;
|
|
DISPLAY_A[i].DISPLAY_pos_id_A = 0 ;
|
|
|
- //DISPLAY_A[i].DISPLAY_array16_A = DISPLAY_array16_AA ;
|
|
|
|
|
|
|
+ strcpy( DISPLAY_A[i].DISPLAY_array16_A , DISPLAY_array16_A);
|
|
|
|
|
+ */
|
|
|
|
|
+ //memcpy( DISPLAY_A[i].DISPLAY_array16_A , DISPLAY_array16_A, 16);
|
|
|
|
|
+
|
|
|
|
|
+ //strcpy( DISPLAY_array16_A, DISPLAY_A[i].DISPLAY_array16_A );
|
|
|
|
|
+ //DISPLAY_A[i].DISPLAY_array16_A = DISPLAY_array16_AAAA ; // DISPLAY_array16_AAAA ;//"012345678901234" ;
|
|
|
|
|
+ // DISPLAY_array16_A ;
|
|
|
DISPLAY_A[i].DISPLAY_TARGET_A = DISPLAY_TARGET_A ;
|
|
DISPLAY_A[i].DISPLAY_TARGET_A = DISPLAY_TARGET_A ;
|
|
|
|
|
+ #ifdef DEBUG
|
|
|
|
|
+ Serial.print("#66 ");
|
|
|
|
|
+ #endif
|
|
|
if(time_seq_id_A == 0 ) {
|
|
if(time_seq_id_A == 0 ) {
|
|
|
DISPLAY_A[i].time_seq_id_A = millis() ;
|
|
DISPLAY_A[i].time_seq_id_A = millis() ;
|
|
|
} else {
|
|
} else {
|
|
|
DISPLAY_A[i].time_seq_id_A = time_seq_id_A ;
|
|
DISPLAY_A[i].time_seq_id_A = time_seq_id_A ;
|
|
|
}
|
|
}
|
|
|
- if(time_min_run_A == 0) {
|
|
|
|
|
- DISPLAY_A[i].time_min_run_A = DISPLAY_A[i].time_seq_id_A + ARDUINO_time_seq_id_A_INCREMENT;
|
|
|
|
|
|
|
+
|
|
|
|
|
+ #ifdef DEBUG
|
|
|
|
|
+ Serial.print("#66 ");
|
|
|
|
|
+ #endif
|
|
|
|
|
+ if(time_min_run_A == 0 and not(time_seq_id_A == 0)) {
|
|
|
|
|
+ DISPLAY_A[i].time_min_run_A = time_seq_id_A + ARDUINO_time_seq_id_A_INCREMENT;
|
|
|
} else {
|
|
} else {
|
|
|
DISPLAY_A[i].time_min_run_A = time_min_run_A ;
|
|
DISPLAY_A[i].time_min_run_A = time_min_run_A ;
|
|
|
}
|
|
}
|
|
|
ARDUINO_ATTR_ARRAY_S__commit_added_element(
|
|
ARDUINO_ATTR_ARRAY_S__commit_added_element(
|
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_A , i);
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_A , i);
|
|
|
|
|
|
|
|
- #if defined(DEBUG)
|
|
|
|
|
|
|
+ #ifdef DEBUG
|
|
|
// if(DEBUG > 6) {
|
|
// if(DEBUG > 6) {
|
|
|
Serial.print("#172 DISPLAY__add_record[DEBUG] AFTER #COUNT["); Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
|
|
Serial.print("#172 DISPLAY__add_record[DEBUG] AFTER #COUNT["); Serial.print(Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
|
|
|
Serial.print("] INDEX_LAST["); Serial.print( DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A);
|
|
Serial.print("] INDEX_LAST["); Serial.print( DISPLAY_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A);
|