# HG changeset patch
# User Edouard Tisserant <edouard.tisserant@gmail.com>
# Date 1663160358 -7200
# Node ID 0e0252339e837d29f888845fcadd1c3e9b0c083a
# Parent  428fb2472f433b8b0eda66cf7306e39ee9067389# Parent  7af7a23e4adb63c91e98f05da5f78201b081289a
Merged changes from default

diff -r 428fb2472f43 -r 0e0252339e83 svghmi/svghmi.c
--- a/svghmi/svghmi.c	Wed Sep 14 14:56:25 2022 +0200
+++ b/svghmi/svghmi.c	Wed Sep 14 14:59:18 2022 +0200
@@ -103,12 +103,14 @@
     void *dest_p = NULL;
     void *value_p = NULL;
     size_t sz = 0;
+    int do_sample = 0;
     while(session_index < MAX_CONNECTIONS) {
         if(dsc->wstate[session_index] == buf_set){
             /* if being subscribed */
             if(dsc->refresh_period_ms[session_index]){
-                if(dsc->age_ms[session_index] + ticktime_ms < dsc->refresh_period_ms[session_index]){
-                    dsc->age_ms[session_index] += ticktime_ms;
+                uint16_t new_age_ms = dsc->age_ms[session_index] + ticktime_ms;
+                if(new_age_ms < dsc->refresh_period_ms[session_index]){
+                    dsc->age_ms[session_index] = new_age_ms;
                 }else{
                     dsc->wstate[session_index] = buf_tosend;
                     global_write_dirty = 1;
@@ -116,33 +118,30 @@
             }
         }
 
-        /* variable is sample only if just subscribed
+        /* variable is sampled if just subscribed (initial value)
            or already subscribed and having value change */
-        int do_sample = 0;
+        int sample_session = 0;
         int just_subscribed = dsc->wstate[session_index] == buf_new;
-        if(!just_subscribed){
+        if(just_subscribed){
+            sample_session = 1;
+        } else {
             int already_subscribed = dsc->refresh_period_ms[session_index] > 0;
             if(already_subscribed){
-                if(!value_changed){
-                    if(!value_p){
-                        UnpackVar(dsc, &value_p, NULL, &sz);
-                        if(__Is_a_string(dsc)){
-                            sz = ((STRING*)value_p)->len + 1;
-                        }
-                        dest_p = &wbuf[dsc->buf_index];
-                    }
+                /* compute value_changed once only */
+                if(!value_p){
+                    UnpackVar(dsc, &value_p, NULL, &sz);
+                    if(__Is_a_string(dsc)){
+                        sz = ((STRING*)value_p)->len + 1;
+                    }
+                    dest_p = &wbuf[dsc->buf_index];
                     value_changed = memcmp(dest_p, value_p, sz) != 0;
-                    do_sample = value_changed;
-                }else{
-                    do_sample = 1;
-                }
-            }
-        } else {
-            do_sample = 1;
-        }
-
-
-        if(do_sample){
+                }
+                sample_session = value_changed;
+            }
+        }
+
+
+        if(sample_session){
             if(dsc->wstate[session_index] != buf_set && dsc->wstate[session_index] != buf_tosend) {
                 if(dsc->wstate[session_index] == buf_new \
                    || ticktime_ms > dsc->refresh_period_ms[session_index]){
@@ -153,13 +152,23 @@
                 }
                 dsc->age_ms[session_index] = 0;
             }
+            do_sample = 1;
         }
 
         session_index++;
     }
-    /* copy value if changed (and subscribed) */
-    if(value_changed)
+
+    /* copy value if one at least one session did sample */
+    if(do_sample){
+        if(!value_p){
+            UnpackVar(dsc, &value_p, NULL, &sz);
+            if(__Is_a_string(dsc)){
+                sz = ((STRING*)value_p)->len + 1;
+            }
+            dest_p = &wbuf[dsc->buf_index];
+        }
         memcpy(dest_p, value_p, sz);
+    }
     return 0;
 }