|
@@ -284,7 +284,7 @@ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE(
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
|
// || DEBUG_QUEUE)
|
|
// || DEBUG_QUEUE)
|
|
|
#if not defined(DISABLE_ANY_PRINT)
|
|
#if not defined(DISABLE_ANY_PRINT)
|
|
|
- Serial.println("[ #297 ARDUINO_ATTR_ARRAY_S__commit_added_element] [INCREMENTED] ARDUINO_QUEUE_ELEMENT_FLAG_A[");Serial.print(ARDUINO_QUEUE_ELEMENT_FLAG_A,BIN); Serial.print("] ");
|
|
|
|
|
|
|
+ Serial.println(F("[ #297 ARDUINO_ATTR_ARRAY_S__commit_added_element] [INCREMENTED] ARDUINO_QUEUE_ELEMENT_FLAG_A["));Serial.print(ARDUINO_QUEUE_ELEMENT_FLAG_A,BIN); Serial.print(F("] "));
|
|
|
#endif
|
|
#endif
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
@@ -292,22 +292,22 @@ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE(
|
|
|
if(ARDUINO_ARRAY_INDEX_CURRENT_A == ARDUINO_ARRAY_INDEX_CORRUPT ) {
|
|
if(ARDUINO_ARRAY_INDEX_CURRENT_A == ARDUINO_ARRAY_INDEX_CORRUPT ) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
|
#if not defined(DISABLE_ANY_PRINT)
|
|
#if not defined(DISABLE_ANY_PRINT)
|
|
|
- Serial.println("[ #2398 commit_added_element] [ARDUINO_ARRAY_INDEX_CORRUPT] ignored");
|
|
|
|
|
|
|
+ Serial.println(F("[ #2398 commit_added_element] [ARDUINO_ARRAY_INDEX_CORRUPT] ignored"));
|
|
|
#endif
|
|
#endif
|
|
|
#endif
|
|
#endif
|
|
|
} else if(ARDUINO_QUEUE_ELEMENT_FLAG_A & ARDUINO_QUEUE_ELEMENT_FLAG_INITIAL_CORRUPT) {
|
|
} else if(ARDUINO_QUEUE_ELEMENT_FLAG_A & ARDUINO_QUEUE_ELEMENT_FLAG_INITIAL_CORRUPT) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
|
- Serial.println("[ #3338 commit_added_element] [ARDUINO_QUEUE_ELEMENT_FLAG_INITIAL_CORRUPT] ignored");
|
|
|
|
|
|
|
+ Serial.println(F("[ #3338 commit_added_element] [ARDUINO_QUEUE_ELEMENT_FLAG_INITIAL_CORRUPT] ignored"));
|
|
|
#endif
|
|
#endif
|
|
|
} else {
|
|
} else {
|
|
|
//if should index rotate
|
|
//if should index rotate
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
|
- Serial.print("[#555 commit_added_element] [if should index rotate]?? ");
|
|
|
|
|
|
|
+ Serial.print(F("[#555 commit_added_element] [if should index rotate]?? "));
|
|
|
#endif
|
|
#endif
|
|
|
if((ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A + 1) >= ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A) {
|
|
if((ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A + 1) >= ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A) {
|
|
|
|
|
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
|
- Serial.print(" +[ARDUINO_ARRAY_COUNT_A][HIT] ");
|
|
|
|
|
|
|
+ Serial.print(F(" +[ARDUINO_ARRAY_COUNT_A][HIT] "));
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
@@ -315,7 +315,7 @@ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE(
|
|
|
if(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A == ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ) {
|
|
if(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A == ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_CURRENT_A ) {
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A = ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A ;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A = ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LAST_A ;
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
|
- Serial.print("+set last[PEEK_A]["); Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A); Serial.print("] ");
|
|
|
|
|
|
|
+ Serial.print(F("+set last[PEEK_A][")); Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A); Serial.print(F("] "));
|
|
|
#endif
|
|
#endif
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -326,9 +326,9 @@ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE(
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A ++;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A ++;
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
|
#if not defined(DISABLE_ANY_PRINT)
|
|
#if not defined(DISABLE_ANY_PRINT)
|
|
|
- Serial.print("433[ELSE] [QUEUE++]");
|
|
|
|
|
|
|
+ Serial.print(F("433[ELSE] [QUEUE++]"));
|
|
|
Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
|
|
Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A);
|
|
|
- Serial.print("] ");
|
|
|
|
|
|
|
+ Serial.print(F("] "));
|
|
|
#endif
|
|
#endif
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
@@ -341,17 +341,17 @@ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE(
|
|
|
if((ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A + 1) >= ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A) {
|
|
if((ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A + 1) >= ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A) {
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A = ARDUINO_ARRAY_INDEX_FIRST ;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A = ARDUINO_ARRAY_INDEX_FIRST ;
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
|
- Serial.print("[NEXT ROTATE]");
|
|
|
|
|
|
|
+ Serial.print(F("[NEXT ROTATE]"));
|
|
|
Serial.print( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A);
|
|
Serial.print( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A);
|
|
|
- Serial.print("] ");
|
|
|
|
|
|
|
+ Serial.print(F("] "));
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
|
- Serial.print("[NEXT ++]");
|
|
|
|
|
|
|
+ Serial.print(F("[NEXT ++]"));
|
|
|
Serial.print( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A);
|
|
Serial.print( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A);
|
|
|
- Serial.print("] ");
|
|
|
|
|
|
|
+ Serial.print(F("] "));
|
|
|
#endif
|
|
#endif
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A++ ;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A++ ;
|
|
|
}
|
|
}
|
|
@@ -367,7 +367,7 @@ ARDUINO_FUNCT_INIT_RESULT_T ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE(
|
|
|
if(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A > 0) { } else {
|
|
if(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A > 0) { } else {
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A = ARDUINO_ARRAY_INDEX_CURRENT_A ;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A = ARDUINO_ARRAY_INDEX_CURRENT_A ;
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ATTR_ARRAY_S__commit_added_element_QUEUE)
|
|
|
- Serial.print("+init[ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A]["); Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A); Serial.print("] ");
|
|
|
|
|
|
|
+ Serial.print(F("+init[ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A][")); Serial.print(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A); Serial.print(F("] "));
|
|
|
#endif
|
|
#endif
|
|
|
}
|
|
}
|
|
|
return true ;
|
|
return true ;
|
|
@@ -402,28 +402,35 @@ ARDUINO_ARRAY_INDEX_NEXT_LOCK_T ARDUINO_ARRAY_INDEX_POP_LOCK( ARDUINO_ATTR_ARRAY
|
|
|
ARDUINO_ARRAY_INDEX_NEXT_A = ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A ;
|
|
ARDUINO_ARRAY_INDEX_NEXT_A = ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A ;
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
#if not defined(DISABLE_ANY_PRINT)
|
|
#if not defined(DISABLE_ANY_PRINT)
|
|
|
- Serial.print(" [ARDUINO_ARRAY_INDEX_POP_LOCK]? ");
|
|
|
|
|
- #endif
|
|
|
|
|
|
|
+ //Serial.print(" [ARDUINO_ARRAY_INDEX_POP_LOCK]? ");
|
|
|
|
|
+ SPFTFTFTFT2(queue,index,pop,lock,-405);
|
|
|
|
|
+
|
|
|
|
|
+ #endif
|
|
|
|
|
+
|
|
|
#endif
|
|
#endif
|
|
|
if(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A > 0) {
|
|
if(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A > 0) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" [INCREMENT][PEEK] ");
|
|
|
|
|
|
|
+ //Serial.print(" [INCREMENT][PEEK] ");
|
|
|
|
|
+ SPFTFT(increment,peek);
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
if((ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A + 1) >= ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A) {
|
|
if((ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A + 1) >= ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_LIMIT_A) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" [INCREMENT][ROTATE]? ");
|
|
|
|
|
|
|
+ //Serial.print(" [INCREMENT][ROTATE]? ");
|
|
|
|
|
+ SPFTFT2(increment,rotate,"?");
|
|
|
#endif
|
|
#endif
|
|
|
if(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A == ARDUINO_ARRAY_INDEX_FIRST) {
|
|
if(ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A == ARDUINO_ARRAY_INDEX_FIRST) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" [INCREMENT][=NEXT][QUEUE FORCE 0] ");
|
|
|
|
|
|
|
+ //Serial.print(" [INCREMENT][=NEXT][QUEUE FORCE 0] ");
|
|
|
|
|
+ SPFTFTFTFT2(increment,next,queue,force,0);
|
|
|
#endif
|
|
#endif
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A = 0;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A = 0;
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A = 0 ; //--;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A = 0 ; //--;
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A = 0 ; //--;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_COUNT_A = 0 ; //--;
|
|
|
} else {
|
|
} else {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" [INCREMENT--][NEXT]=ARDUINO_ARRAY_INDEX_FIRST ");
|
|
|
|
|
|
|
+ //Serial.print(" [INCREMENT--][NEXT]=ARDUINO_ARRAY_INDEX_FIRST ");
|
|
|
|
|
+ SPFTFTFTFT(increment,next,index,first) ;
|
|
|
#endif
|
|
#endif
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A = ARDUINO_ARRAY_INDEX_FIRST ;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A = ARDUINO_ARRAY_INDEX_FIRST ;
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A --;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A --;
|
|
@@ -432,11 +439,13 @@ ARDUINO_ARRAY_INDEX_NEXT_LOCK_T ARDUINO_ARRAY_INDEX_POP_LOCK( ARDUINO_ATTR_ARRAY
|
|
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" [INCREMENT][NOTROTATE]? ");
|
|
|
|
|
|
|
+ //Serial.print(" [INCREMENT][NOTROTATE]? ");
|
|
|
|
|
+ SPFTFTFT(increment,not,rotate);
|
|
|
#endif
|
|
#endif
|
|
|
if((ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A + 1) == ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A) {
|
|
if((ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A + 1) == ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" 2[INCREMENT][=CURRENT] [QUEUE FORCE 0] ");
|
|
|
|
|
|
|
+ //Serial.print(" 2[INCREMENT][=CURRENT] [QUEUE FORCE 0] ");
|
|
|
|
|
+ SPFTFTFTFT2(increment,current,queue,force,0);
|
|
|
#endif
|
|
#endif
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A = 0;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A = 0;
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A = 0;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A = 0;
|
|
@@ -444,7 +453,8 @@ ARDUINO_ARRAY_INDEX_NEXT_LOCK_T ARDUINO_ARRAY_INDEX_POP_LOCK( ARDUINO_ATTR_ARRAY
|
|
|
} else {
|
|
} else {
|
|
|
|
|
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" [POP][NEXT] ");
|
|
|
|
|
|
|
+ //Serial.print(" [POP][NEXT] ");
|
|
|
|
|
+ SPFTFT(pop,next);
|
|
|
#endif
|
|
#endif
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A++;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_QUEUE_PEEK_A++;
|
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A --;
|
|
ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_COUNT_A --;
|
|
@@ -457,11 +467,13 @@ ARDUINO_ARRAY_INDEX_NEXT_LOCK_T ARDUINO_ARRAY_INDEX_POP_LOCK( ARDUINO_ATTR_ARRAY
|
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" [POP][EMPTY] ");
|
|
|
|
|
|
|
+ //Serial.print(" [POP][EMPTY] ");
|
|
|
|
|
+ SPFTFT(pop,empty);
|
|
|
#endif
|
|
#endif
|
|
|
}
|
|
}
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" [POP][RETURNED["); Serial.print(ARDUINO_ARRAY_INDEX_NEXT_A); Serial.println("] ");
|
|
|
|
|
|
|
+ //Serial.print(" [POP][RETURNED["); Serial.print(ARDUINO_ARRAY_INDEX_NEXT_A); Serial.println("] ");
|
|
|
|
|
+ SPFT2(pop,ARDUINO_ARRAY_INDEX_NEXT_A);
|
|
|
#endif
|
|
#endif
|
|
|
return ARDUINO_ARRAY_INDEX_NEXT_A ;
|
|
return ARDUINO_ARRAY_INDEX_NEXT_A ;
|
|
|
|
|
|
|
@@ -481,35 +493,40 @@ ARDUINO_ARRAY_INDEX_NEXT_LOCK_T ARDUINO_ARRAY_INDEX_NEXT_LOCK(
|
|
|
ARDUINO_ARRAY_INDEX_NEXT_T ARDUINO_ARRAY_INDEX_NEXT_A ;
|
|
ARDUINO_ARRAY_INDEX_NEXT_T ARDUINO_ARRAY_INDEX_NEXT_A ;
|
|
|
|
|
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print("[ARDUINO_ARRAY_INDEX_NEXT_LOCK] [ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A]? ");
|
|
|
|
|
|
|
+ //Serial.print("[ARDUINO_ARRAY_INDEX_NEXT_LOCK] [ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A]? ");
|
|
|
|
|
+ SPFTFTFT(index,next,lock);
|
|
|
#endif
|
|
#endif
|
|
|
if( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__TO_INITIALIZE) {
|
|
if( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__TO_INITIALIZE) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" [ARDUINO_ARRAY_ATTR_INDEX__TO_INITIALIZE]? [ERROR] !=[ARDUINO_ARRAY_ATTR_INDEX__TO_INITIALIZE] ");
|
|
|
|
|
|
|
+ //Serial.print(" [ARDUINO_ARRAY_ATTR_INDEX__TO_INITIALIZE]? [ERROR] !=[ARDUINO_ARRAY_ATTR_INDEX__TO_INITIALIZE] ");
|
|
|
|
|
+ SPFTFTFTFT2(index,to,init,error,-502);
|
|
|
#endif
|
|
#endif
|
|
|
} else if(( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__INITIALIZED)
|
|
} else if(( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__INITIALIZED)
|
|
|
or ( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__READY_TO_QUERY)) {
|
|
or ( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__READY_TO_QUERY)) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" [ARDUINO_ARRAY_ATTR_INDEX__INITIALIZE][OK] if->? ");
|
|
|
|
|
|
|
+ //Serial.print(" [ARDUINO_ARRAY_ATTR_INDEX__INITIALIZE][OK] if->? ");
|
|
|
|
|
+ SPFTFT2(index,init,-508);
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
if( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__LOCK) {
|
|
if( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__LOCK) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" &[ARDUINO_ARRAY_ATTR_INDEX__LOCK] [LOCKED] [FALSE] ");
|
|
|
|
|
|
|
+ //Serial.print(" &[ARDUINO_ARRAY_ATTR_INDEX__LOCK] [LOCKED] [FALSE] ");
|
|
|
|
|
+ SPFTFTFT(index,lock,false);
|
|
|
#endif
|
|
#endif
|
|
|
// ARDUINO_ARRAY_INDEX_NEXT_LOCK_A = NULL ;
|
|
// ARDUINO_ARRAY_INDEX_NEXT_LOCK_A = NULL ;
|
|
|
return 0;
|
|
return 0;
|
|
|
} else if( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__TO_COMMIT) {
|
|
} else if( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__TO_COMMIT) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" =[ARDUINO_ARRAY_ATTR_INDEX__TO_COMMIT] [FALSE] ");
|
|
|
|
|
|
|
+ //Serial.print(" =[ARDUINO_ARRAY_ATTR_INDEX__TO_COMMIT] [FALSE] ");
|
|
|
|
|
+ SPFTFTFTFT(index,to,commit,false);
|
|
|
#endif
|
|
#endif
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
|
|
} else if(( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__READY_TO_QUERY)
|
|
} else if(( ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A & ARDUINO_ARRAY_ATTR_INDEX__READY_TO_QUERY)
|
|
|
or (ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A == ARDUINO_ARRAY_ATTR_INDEX__INITIALIZED )) {
|
|
or (ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A == ARDUINO_ARRAY_ATTR_INDEX__INITIALIZED )) {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" =[ARDUINO_ARRAY_ATTR_INDEX__TO_INCREMENT][OK] -> [ARDUINO_ARRAY_ATTR_QUEUE_add_distance] ");
|
|
|
|
|
|
|
+ Serial.print(F(" =[ARDUINO_ARRAY_ATTR_INDEX__TO_INCREMENT][OK] -> [ARDUINO_ARRAY_ATTR_QUEUE_add_distance] "));
|
|
|
#endif
|
|
#endif
|
|
|
//ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A =
|
|
//ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_ATTR_INDEX_OPTIONS_A =
|
|
|
//ARDUINO_ARRAY_ATTR_QUEUE_add_distance(ARDUINO_ATTR_ARRAY_A ) ;//, ARDUINO_QUEUE_ELEMENT_FLAG_STANDARD , ARDUINO_ARRAY_INDEX_NEXT_A, ARDUINO_ARRAY_INDEX_A) ;
|
|
//ARDUINO_ARRAY_ATTR_QUEUE_add_distance(ARDUINO_ATTR_ARRAY_A ) ;//, ARDUINO_QUEUE_ELEMENT_FLAG_STANDARD , ARDUINO_ARRAY_INDEX_NEXT_A, ARDUINO_ARRAY_INDEX_A) ;
|
|
@@ -518,7 +535,7 @@ ARDUINO_ARRAY_INDEX_NEXT_LOCK_T ARDUINO_ARRAY_INDEX_NEXT_LOCK(
|
|
|
return ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A ;
|
|
return ARDUINO_ATTR_ARRAY_A.ARDUINO_ARRAY_INDEX_NEXT_A ;
|
|
|
} else {
|
|
} else {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" =518[ARDUINO_ARRAY_ATTR_INDEX__TO_INCREMENT][ERROR][ELSE] ");
|
|
|
|
|
|
|
+ Serial.print(F(" =518[ARDUINO_ARRAY_ATTR_INDEX__TO_INCREMENT][ERROR][ELSE] "));
|
|
|
#endif
|
|
#endif
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
@@ -526,7 +543,7 @@ ARDUINO_ARRAY_INDEX_NEXT_LOCK_T ARDUINO_ARRAY_INDEX_NEXT_LOCK(
|
|
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
#if defined(DEBUG) || defined(DISABLE_LOOP) || defined(DEBUG_QUEUE) || defined(DEBUG_STRUCT_INIT) || defined(DEBUG_STORAGE_QUEUE_TEST) || defined(DEBUG_ARDUINO_ARRAY_INDEX_NEXT_LOCK)
|
|
|
- Serial.print(" ![ARDUINO_ARRAY_ATTR_INDEX__INITIALIZED] =521[ELSE][ERROR] ");
|
|
|
|
|
|
|
+ Serial.print(F(" ![ARDUINO_ARRAY_ATTR_INDEX__INITIALIZED] =521[ELSE][ERROR] "));
|
|
|
#endif
|
|
#endif
|
|
|
return 0;
|
|
return 0;
|
|
|
}
|
|
}
|
|
@@ -573,7 +590,7 @@ char DISPLAY_array16_I(char message[], int count){ //to provide messages concat
|
|
|
DISPLAY_array16_S.toCharArray(DISPLAY_array16_A, DISPLAY_array16_S.length());
|
|
DISPLAY_array16_S.toCharArray(DISPLAY_array16_A, DISPLAY_array16_S.length());
|
|
|
#ifdef DEBUG
|
|
#ifdef DEBUG
|
|
|
if(DEBUG > 4) {
|
|
if(DEBUG > 4) {
|
|
|
- Serial.print("#189 DISPLAY_array16_I ") ; Serial.print(DISPLAY_array16_A); Serial.println(" ] ");
|
|
|
|
|
|
|
+ Serial.print(F("#189 DISPLAY_array16_I ")) ; Serial.print(DISPLAY_array16_A); Serial.println(F(" ] "));
|
|
|
}
|
|
}
|
|
|
#endif
|
|
#endif
|
|
|
return DISPLAY_array16_A ;
|
|
return DISPLAY_array16_A ;
|
|
@@ -616,7 +633,7 @@ void BYTE_SAFE_DECREMENT_TO_LIMIT(byte limit_min_with, byte &curr_value, int try
|
|
|
//return limit_min_with;
|
|
//return limit_min_with;
|
|
|
curr_value = limit_min_with ;
|
|
curr_value = limit_min_with ;
|
|
|
} else {
|
|
} else {
|
|
|
- Serial.print(" SAFE DECR detect curr["); Serial.print(curr_value); Serial.print("] decrement["); Serial.print(try_decrement); Serial.print("] ");
|
|
|
|
|
|
|
+ Serial.print(F(" SAFE DECR detect curr[")); Serial.print(curr_value); Serial.print(F("] decrement[")); Serial.print(try_decrement); Serial.print(F("] "));
|
|
|
curr_value = (curr_value - try_decrement) ;
|
|
curr_value = (curr_value - try_decrement) ;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -628,7 +645,7 @@ void INT_SAFE_DECREMENT_TO_LIMIT(int limit_min_with, int &curr_value, int try_de
|
|
|
//return limit_min_with;
|
|
//return limit_min_with;
|
|
|
curr_value = limit_min_with ;
|
|
curr_value = limit_min_with ;
|
|
|
} else {
|
|
} else {
|
|
|
- Serial.print(" SAFE DECR detect curr["); Serial.print(curr_value); Serial.print("] decrement["); Serial.print(try_decrement); Serial.print("] ");
|
|
|
|
|
|
|
+ Serial.print(F(" SAFE DECR detect curr[")); Serial.print(curr_value); Serial.print(F("] decrement[")); Serial.print(try_decrement); Serial.print(F("] "));
|
|
|
curr_value = (curr_value - try_decrement) ;
|
|
curr_value = (curr_value - try_decrement) ;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|