|
|
@@ -129,7 +129,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
DISPLAY_T* DISPLAY_A ,
|
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_T &DISPLAY_T_ARDUINO_ATTR_ARRAY_A,
|
|
|
DISPLAY_PHYSICAL_CHAR_T &DISPLAY_PHYSICAL_CHAR_A,
|
|
|
- Adafruit_PWMServoDriver_T* Adafruit_PWMServoDriver_A
|
|
|
+ Adafruit_PWMServoDriver_T* Adafruit_PWMServoDriver_A, long time
|
|
|
) {
|
|
|
|
|
|
|
|
|
@@ -162,34 +162,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
|
|
|
// if (_Slave_Ports_queue_count > 0) {
|
|
|
if(ARDUINO_ARRAY_INDEX_POP_LOCK_A > 0) {
|
|
|
- /*
|
|
|
- String LCDarray1 = "`Slave_Ports_queue size [";
|
|
|
- LCDarray1.concat(_Slave_Ports_queue_count);
|
|
|
- LCDarray1.concat("] Oldest[");
|
|
|
- LCDarray1.concat(_Slave_Ports_queue_pop);
|
|
|
-
|
|
|
- LCDarray1.concat("] Curr[");
|
|
|
- LCDarray1.concat(Slave_Ports_ATTR_QUEUE_FRONT_A);
|
|
|
-
|
|
|
- String LCDarray2 = "] last[";
|
|
|
- LCDarray2.concat(Slave_Ports_ATTR_QUEUE_BACK_A);
|
|
|
- LCDarray2.concat("] Next[");
|
|
|
- LCDarray2.concat(Slave_Ports_ATTR_QUEUE_PEEK_A);
|
|
|
- Serial.print(LCDarray1);
|
|
|
- Serial.println(LCDarray2);
|
|
|
- */
|
|
|
- /* #if defined(DEBUG)
|
|
|
- Serial.print("#166 _queue__POP [DEBUG] INF size["); Serial.print(_Slave_Ports_queue_count);
|
|
|
- Serial.print("] pop["); Serial.print(_Slave_Ports_queue_pop);
|
|
|
- Serial.print("] front["); Serial.print(Slave_Ports_ATTR_QUEUE_FRONT_A);
|
|
|
- Serial.print("] back["); Serial.print(Slave_Ports_ATTR_QUEUE_BACK_A);
|
|
|
- Serial.print("] peek["); Serial.print(Slave_Ports_ATTR_QUEUE_PEEK_A);
|
|
|
- Serial.println("] ");
|
|
|
- #endif
|
|
|
- */
|
|
|
-// LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
|
|
|
-
|
|
|
- // if(Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].QUEUE_ID_A == 0 and
|
|
|
+
|
|
|
if(Slave_Ports_Status_QUEUE_A[ ARDUINO_ARRAY_INDEX_POP_LOCK_A ].QUEUE_ID_A == 0 and
|
|
|
//Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].QUEUE_ID_A == 0 and
|
|
|
// Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A == 0 and
|
|
|
@@ -199,37 +172,19 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
Slave_Ports_Status_QUEUE_A[ ARDUINO_ARRAY_INDEX_POP_LOCK_A ].time_seq_id == 0 and
|
|
|
// Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].time_min_run == 0 ) {
|
|
|
Slave_Ports_Status_QUEUE_A[ ARDUINO_ARRAY_INDEX_POP_LOCK_A ].time_min_run == 0 ) {
|
|
|
-
|
|
|
-
|
|
|
- /* todo
|
|
|
- String LCDarray1 = "#206 Error with queue";
|
|
|
- String LCDarray2 = "ID: ";
|
|
|
- LCDarray2.concat( _Slave_Ports_queue_pop); LCDarray2.concat("] ");
|
|
|
- Serial.print(LCDarray1);
|
|
|
- Serial.println(LCDarray2);
|
|
|
- // LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
|
|
|
- */
|
|
|
+
|
|
|
#if defined(DEBUG)
|
|
|
// if(DEBUG > 6) {
|
|
|
Serial.print("#166 [DEBUG] Error with queue [INDEX_CURR]=["); Serial.print(ARDUINO_ARRAY_INDEX_POP_LOCK_A);
|
|
|
Serial.println("] ");
|
|
|
// }
|
|
|
#endif
|
|
|
- } else {
|
|
|
- /*todo
|
|
|
- String LCDarray1 = "#407 Running task";
|
|
|
- String LCDarray2 = "ID: ";
|
|
|
- LCDarray2.concat( _Slave_Ports_queue_pop); LCDarray2.concat("] task_type[");
|
|
|
-
|
|
|
- LCDarray2.concat( Slave_Ports_Status_QUEUE_A[_Slave_Ports_queue_pop].TASK_TYPE_A); LCDarray2.concat("] ");
|
|
|
-
|
|
|
- Serial.print(LCDarray1);
|
|
|
- Serial.println(LCDarray2);
|
|
|
- // LCD_print(LCDarray1, LCDarray2, LCDtim / 3 ) ;
|
|
|
- */
|
|
|
- if(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].time_min_run > millis()) {
|
|
|
+ } else { //if all zeros
|
|
|
+
|
|
|
+
|
|
|
+ if(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].time_min_run > time) {
|
|
|
Serial.print("#182 QUEUE reassign .time_seq_id > millis() time_seq_id["); Serial.print( Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].time_seq_id);
|
|
|
- Serial.print("] millis()["); Serial.print(millis());
|
|
|
+ Serial.print("] millis()["); Serial.print(time);
|
|
|
Serial.print("] TASK_TYPE_A["); Serial.print(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].TASK_TYPE_A);
|
|
|
Serial.print("] Will wait() to next ["); Serial.print(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].time_seq_id);
|
|
|
Serial.print("] #["); Serial.print(ARDUINO_ARRAY_INDEX_POP_LOCK_A); Serial.print("] ID["); Serial.print(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].QUEUE_ID_A); Serial.println("] ");
|
|
|
@@ -240,7 +195,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].time_min_run,
|
|
|
Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A
|
|
|
);
|
|
|
- Serial.print("[WILL DELETE REC] millis()["); Serial.print(millis());
|
|
|
+ Serial.print("[WILL DELETE REC] millis()["); Serial.print(time);
|
|
|
Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A]={} ; //TODO delete by func
|
|
|
|
|
|
|
|
|
@@ -272,8 +227,9 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
Slave_Ports_Status_T_ARDUINO_ARRAY_ASSOC_TABLE_S_Port_ID_A,
|
|
|
DISPLAY_A ,
|
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_A,
|
|
|
- DISPLAY_PHYSICAL_CHAR_A
|
|
|
-
|
|
|
+ DISPLAY_PHYSICAL_CHAR_A,
|
|
|
+ time
|
|
|
+
|
|
|
/*Slave_Ports_Status_QUEUE_A,
|
|
|
_Slave_Ports_queue_pop ,
|
|
|
Slave_Ports_Status_A,
|
|
|
@@ -291,11 +247,24 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
|
|
|
|
|
|
// #include "_DISPLAY_queue_pop_func.h"
|
|
|
-
|
|
|
+ #if defined(DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________)
|
|
|
+ Serial.println("#250 [DISABLE_TASK_TYPE_T_DISPLAY_queue_pop________]");
|
|
|
+ Serial.print(" DISPLAY_array16_A["); Serial.print(DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_array16_A); Serial.print("] ");
|
|
|
+ Serial.print(" DISPLAY_pos_seq_A["); Serial.print(DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_pos_seq_A, BIN); Serial.print("] ");
|
|
|
+ Serial.print(" DISPLAY_TARGET_A["); Serial.print(DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_TARGET_A, BIN); Serial.print("] ");
|
|
|
+ Serial.print(" DISPLAY_ARDUINO_ARRAY_INDEX_A["); Serial.print(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A); Serial.print("] ");
|
|
|
+
|
|
|
+
|
|
|
+ Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A]={} ; //todo storage
|
|
|
+ Serial.print("#201 DELETED DISPLAY TASK_TYPE_A #["); Serial.print( ARDUINO_ARRAY_INDEX_POP_LOCK_A);Serial.println("] ");
|
|
|
+ #else
|
|
|
+ Serial.print(" DISPLAY_array16_A["); Serial.print(DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_array16_A); Serial.print("] ");
|
|
|
+ Serial.print("#201 DELETING DISPLAY TASK_TYPE_A #["); Serial.print( ARDUINO_ARRAY_INDEX_POP_LOCK_A);Serial.println("] ");
|
|
|
+
|
|
|
DISPLAY__print( DISPLAY_A ,
|
|
|
DISPLAY_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
DISPLAY_PHYSICAL_CHAR_A,
|
|
|
- DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_pos_seq_A,
|
|
|
+ "1234567890123456",//DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_pos_seq_A,
|
|
|
DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_array16_A,
|
|
|
DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].DISPLAY_TARGET_A,
|
|
|
DISPLAY_A[Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A].time_seq_id_A,
|
|
|
@@ -306,8 +275,7 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].TASK_PORT_ASSOC_A);
|
|
|
|
|
|
Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A]={} ; //todo storage
|
|
|
- Serial.print("#201 DELETED DISPLAY TASK_TYPE_A #["); Serial.print( ARDUINO_ARRAY_INDEX_POP_LOCK_A);
|
|
|
-
|
|
|
+ #endif
|
|
|
|
|
|
} else if(Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].TASK_TYPE_A == TASK_TYPE_T_Slave_Ports_set_I2C______) {
|
|
|
Serial.print("#221 running TASK_TYPE_T_Slave_Ports_set_I2C______ = "); Serial.println( Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].TASK_TYPE_A); Serial.println("]");
|
|
|
@@ -341,8 +309,8 @@ void _Slave_Ports_queue__list( Slave_Ports_Status_QUEUE_T* Slave_Ports_Status_QU
|
|
|
_Slave_Ports_queue__add( Slave_Ports_Status_QUEUE_A, Slave_Ports_Status_QUEUE_T_ARDUINO_ATTR_ARRAY_A ,
|
|
|
Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].TASK_TYPE_A,
|
|
|
Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].TASK_PORT_ASSOC_A,
|
|
|
- millis(),
|
|
|
- millis() + ARDUINO_time_seq_id_A_INCREMENT ,
|
|
|
+ time,
|
|
|
+ time+ ARDUINO_time_seq_id_A_INCREMENT ,
|
|
|
Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A].DISPLAY_ARDUINO_ARRAY_INDEX_A
|
|
|
);
|
|
|
Slave_Ports_Status_QUEUE_A[ARDUINO_ARRAY_INDEX_POP_LOCK_A]={} ;
|