|
|
@@ -1,31 +1,56 @@
|
|
|
|
|
|
|
|
|
|
|
|
-void _Slave_Ports_queue__INIT( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A) {
|
|
|
+void _Slave_Ports_queue__INIT( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A,
|
|
|
+Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_T &Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A
|
|
|
+) {
|
|
|
Serial.println("_Slave_Ports_queue__INIT");
|
|
|
- int i;
|
|
|
- for(i=0;i<10;i++) {
|
|
|
|
|
|
- Slave_Ports_Status_QUEUE_A[i].QUEUE_ID_A = 0;
|
|
|
- Slave_Ports_Status_QUEUE_A[i].TASK_TYPE_A = TASK_TYPE_T_NOT_USED_________________;
|
|
|
- Slave_Ports_Status_QUEUE_A[i].TASK_PORT_ASSOC_A = {} ;
|
|
|
- Slave_Ports_Status_QUEUE_A[i].time_seq_id = 0;
|
|
|
+ //INIT 2015
|
|
|
+ ARDUINO_ARRAY_INDEX_CURRENT_T i = Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ;
|
|
|
+ if(Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A == ARDUINO_ARRAY_INDEX_CORRUPT) {
|
|
|
+ Slave_Ports_Status_QUEUE_A[i].QUEUE_ID_A = 0;
|
|
|
+ Slave_Ports_Status_QUEUE_A[i].TASK_TYPE_A = TASK_TYPE_T_NOT_USED_________________;
|
|
|
+ Slave_Ports_Status_QUEUE_A[i].TASK_PORT_ASSOC_A = {} ;
|
|
|
+ Slave_Ports_Status_QUEUE_A[i].time_seq_id = 0;
|
|
|
Slave_Ports_Status_QUEUE_A[i].time_min_run = 0;
|
|
|
|
|
|
- // Slave_Ports_Status_QUEUE_A[i]=Slave_Ports_Status_QUEUE_A[i];
|
|
|
+ ARDUINO_ATTR_ARRAY_S__commit_added_element(
|
|
|
+ Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
+ i);
|
|
|
+ //#ifdef DEBUG_QUEUE
|
|
|
+ Serial.println("[#22] _Slave_Ports_queue__INIT [OK] ");
|
|
|
+ //#endif
|
|
|
}
|
|
|
|
|
|
+ /*
|
|
|
+ int i;
|
|
|
+ for(i=0;i<=ARDUINO_ARRAY_INDEX_LIMIT_QUEUE;i++) {
|
|
|
+
|
|
|
+ Slave_Ports_Status_QUEUE_A[i].QUEUE_ID_A = 0;
|
|
|
+ Slave_Ports_Status_QUEUE_A[i].TASK_TYPE_A = TASK_TYPE_T_NOT_USED_________________;
|
|
|
+ Slave_Ports_Status_QUEUE_A[i].TASK_PORT_ASSOC_A = {} ;
|
|
|
+ Slave_Ports_Status_QUEUE_A[i].time_seq_id = 0;
|
|
|
+ Slave_Ports_Status_QUEUE_A[i].time_min_run = 0;
|
|
|
+
|
|
|
+ // Slave_Ports_Status_QUEUE_A[i]=Slave_Ports_Status_QUEUE_A[i];
|
|
|
+ }
|
|
|
+
|
|
|
+ */
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//Queue<_Slave_Ports_queueT> _Slave_Ports_queue = Queue<_Slave_Ports_queueT>(5);
|
|
|
-void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A) {
|
|
|
+void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QUEUE_A,
|
|
|
+Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_T &Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A
|
|
|
+) {
|
|
|
int i;
|
|
|
Serial.println("#100 _Slave_Ports_queue__list Slave_Ports_Status_QUEUE_A): ");
|
|
|
//Serial.println(sizeof(Slave_Ports_Status_QUEUE_A));
|
|
|
- for(i=0;i<=10;i++) { //sizeof(_LCD_print_buffors)
|
|
|
+ for(i=ARDUINO_ARRAY_INDEX_FIRST;i<=ARDUINO_ARRAY_INDEX_LIMIT_QUEUE;i++) { //sizeof(_LCD_print_buffors)
|
|
|
|
|
|
if(Slave_Ports_Status_QUEUE_A[i].QUEUE_ID_A == 0 and
|
|
|
Slave_Ports_Status_QUEUE_A[i].TASK_TYPE_A == 0 and
|
|
|
@@ -159,7 +184,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
Serial.print("] TASK_TYPE_A["); Serial.print(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);
|
|
|
Serial.print("] Will wait() to next ["); Serial.print(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_seq_id);
|
|
|
Serial.print("] POP/ID ["); Serial.print(_Slave_Ports_queue_pop); Serial.println("] ");
|
|
|
- _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_A,
|
|
|
+ _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A,
|
|
|
Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_PORT_ASSOC_A,
|
|
|
Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_seq_id,
|
|
|
@@ -172,7 +197,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
|
|
|
Serial.print("#224 running _Slave_Ports_ttl_decrement = "); Serial.println( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A); Serial.println("]");
|
|
|
//#include "_Slave_Ports_ttl_decrement.h"
|
|
|
- _Slave_Ports_ttl_decrement_POP(Slave_Ports_Status_QUEUE_A, _Slave_Ports_queue_pop , Slave_Ports_Status_A ) ;
|
|
|
+ _Slave_Ports_ttl_decrement_POP(Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A, _Slave_Ports_queue_pop , Slave_Ports_Status_A ) ;
|
|
|
Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop]={} ;
|
|
|
|
|
|
} else if(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A == TASK_TYPE_T_Slave_Ports_broadcast____) {
|
|
|
@@ -223,7 +248,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
DISPLAY_A[Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].DISPLAY_ARDUINO_ARRAY_INDEX_A].time_seq_id_A,
|
|
|
DISPLAY_A[Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].DISPLAY_ARDUINO_ARRAY_INDEX_A].time_min_run_A,
|
|
|
//queue
|
|
|
- Slave_Ports_Status_QUEUE_A,
|
|
|
+ Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A,
|
|
|
Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_PORT_ASSOC_A);
|
|
|
|
|
|
@@ -236,7 +261,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
//#include "_Slave_Ports_ttl_decrement.h"
|
|
|
_Slave_Ports_I2C_POP(
|
|
|
//Slave_Ports_Status_QUEUE_A, _Slave_Ports_queue_pop , Slave_Ports_Status_A
|
|
|
- Slave_Ports_Status_QUEUE_A,
|
|
|
+ Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
_Slave_Ports_queue_pop ,
|
|
|
Slave_Ports_Status_A,
|
|
|
Slave_Ports_Status_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
@@ -260,7 +285,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
Serial.print("$177 Error unsupported type TASK_TYPE_A["); Serial.print( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A);
|
|
|
_Slave_Ports_queue_task_type_DESC(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A) ;
|
|
|
Serial.println("] REASSIGN NEXT QUEUE FOR FURTHER ACTION");
|
|
|
- _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_A,
|
|
|
+ _Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A,
|
|
|
Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_PORT_ASSOC_A,
|
|
|
millis(),
|