ETX sampling rule update

Min sampling rule is now compared to MAC radio attempts not a MAC-Data-request attempts.
In link failure case will respond now faster and not need so many etx propes in 1 minute.

Change-Id: Ieb1108aa19672021258eedd16484532751c82d46

Author: Juha Heiskanen

source/Service_Libs/etx/etx.c

@@ -64,11 +64,11 @@ typedef struct {
     uint32_t max_etx_update;
     uint32_t max_etx;
     uint16_t hysteresis;                            // 12 bit fraction
+    uint16_t init_etx_sample_count;
     uint8_t accum_threshold;
     uint8_t etx_min_sampling_time;
     uint8_t ext_storage_list_size;
-    uint8_t min_sample_count;
-    uint8_t init_etx_sample_count;
+    uint8_t min_attempts_count;
     bool cache_sample_requested;
     int8_t interface_id;
 } ext_info_t;
@@ -81,7 +81,7 @@ static ext_info_t etx_info = {
     .etx_storage_list = NULL,
     .etx_cache_storage_list = NULL,
     .ext_storage_list_size = 0,
-    .min_sample_count = 0,
+    .min_attempts_count = 0,
     .max_etx_update = 0,
     .max_etx = 0xffff,
     .init_etx_sample_count = 1,
@@ -146,7 +146,6 @@ static void etx_cache_entry_init(uint8_t attribute_index)
     storage->attempts_count = 0;
     storage->etx_timer = etx_info.etx_min_sampling_time;
     storage->received_acks = 0;
-    storage->sample_count = 0;
 }
 
 static bool etx_update_possible(etx_sample_storage_t *storage, etx_storage_t *entry, uint16_t time_update)
@@ -161,9 +160,9 @@ static bool etx_update_possible(etx_sample_storage_t *storage, etx_storage_t *en
 
     if (entry->etx_samples > etx_info.init_etx_sample_count) {
         //Slower ETX update phase
-        if (storage->sample_count >= etx_info.min_sample_count) {
+        if (storage->attempts_count >= etx_info.min_attempts_count) {
 
-            if (storage->etx_timer == 0 || storage->sample_count == 0xff) {
+            if (storage->etx_timer == 0 || storage->attempts_count == 0xffff || storage->received_acks == 0xff) {
                 //Got least min sample in requested time or max possible sample
                 return true;
             }
@@ -187,7 +186,6 @@ static etx_sample_storage_t *etx_cache_sample_update(uint8_t attribute_index, ui
     if (ack_rx) {
         storage->received_acks++;
     }
-    storage->sample_count++;
     return storage;
 
 }
@@ -223,10 +221,6 @@ void etx_transm_attempts_update(int8_t interface_id, uint8_t attempts, bool succ
         etx_sample_storage_t *storage = etx_cache_sample_update(attribute_index, attempts, success);
         entry->accumulated_failures = 0;
 
-        if (!success && entry->etx_samples < etx_info.init_etx_sample_count) {
-            storage->sample_count = etx_info.init_etx_sample_count; //Force stop probing if any init fail totally
-        }
-
         if (!etx_update_possible(storage, entry, 0)) {
             return;
         }
@@ -613,14 +607,14 @@ bool etx_storage_list_allocate(int8_t interface_id, uint8_t etx_storage_size)
 
 }
 
-bool etx_cached_etx_parameter_set(uint8_t min_wait_time, uint8_t etx_min_sample_count, uint8_t init_etx_sample_count)
+bool etx_cached_etx_parameter_set(uint8_t min_wait_time, uint8_t etx_min_attempts_count, uint8_t init_etx_sample_count)
 {
     //No ini ETX allocation done yet
     if (etx_info.ext_storage_list_size == 0) {
         return false;
     }
 
-    if (min_wait_time || etx_min_sample_count) {
+    if (min_wait_time || etx_min_attempts_count) {
         if (init_etx_sample_count == 0) {
             return false;
         }
@@ -647,7 +641,7 @@ bool etx_cached_etx_parameter_set(uint8_t min_wait_time, uint8_t etx_min_sample_
         etx_info.etx_cache_storage_list = NULL;
     }
 
-    etx_info.min_sample_count = etx_min_sample_count;
+    etx_info.min_attempts_count = etx_min_attempts_count;
     etx_info.etx_min_sampling_time = min_wait_time;
     etx_info.init_etx_sample_count = init_etx_sample_count;
 

source/Service_Libs/etx/etx.h

@@ -64,7 +64,6 @@ typedef struct etx_sample_storage_s {
     uint16_t           attempts_count;         /*!< TX attempt count */
     uint8_t            etx_timer;              /*!< Count down from configured value 0 means that ETX Update is possible done again*/
     uint8_t            received_acks;          /*!< Received ACK's */
-    uint8_t            sample_count;           /*!< Finished TX count */
 } etx_sample_storage_t;
 
 /**
@@ -266,14 +265,14 @@ void etx_cache_timer(int8_t interface_id, uint16_t seconds_update);
  *  ETX update will happen when min wait time is reached and also reached min etx sample count.
  *
  * \param min_wait_time how many seconds must wait before do new ETX
- * \param etx_min_sample_count define how many completed TX process must be done for new ETX. Min accepted value is 4.
+ * \param etx_min_attempts_count define how many TX attempts process must be done for new ETX. Min accepted value is 4.
  * \param init_etx_sample_count How Many sample is need to init etx calculate
  *
  * \return true Enable is OK
  * \return false Memory allocation fail
  *
  */
-bool etx_cached_etx_parameter_set(uint8_t min_wait_time, uint8_t etx_min_sample_count, uint8_t init_etx_sample_count);
+bool etx_cached_etx_parameter_set(uint8_t min_wait_time, uint8_t etx_min_attempts_count, uint8_t init_etx_sample_count);
 
 
 /**

test/nanostack/unittest/stub/etx_stub.c

@@ -87,7 +87,7 @@ void etx_cache_timer(int8_t interface_id, uint16_t seconds_update)
 
 }
 
-bool etx_cached_etx_parameter_set(uint8_t min_wait_time, uint8_t etx_min_sample_count, uint8_t init_etx_sample_count)
+bool etx_cached_etx_parameter_set(uint8_t min_wait_time, uint8_t etx_min_attempts_count, uint8_t init_etx_sample_count)
 {
     return true;
 }