Revert to previous logic

steadramon · steadramon · commit 5b0a52ed3031 · 2025-03-08T15:07:42.000Z
diff --git a/ESPGeiger/src/GMC/GMC.cpp b/ESPGeiger/src/GMC/GMC.cpp
@@ -29,8 +29,7 @@ void GMC::s_tick(unsigned long stick_now)
   if (stick_now - lastPing >= pingInterval)
   {
     if (lastPing == 0) {
-      lastPing = stick_now;
-      lastPing += random(30) * 1000;
+      lastPing = random(30) * 1000;
       return;
     }
     lastPing = stick_now - (stick_now % 1000);
diff --git a/ESPGeiger/src/Radmon/Radmon.cpp b/ESPGeiger/src/Radmon/Radmon.cpp
@@ -51,8 +51,7 @@ void Radmon::s_tick(unsigned long stick_now)
         rtimer = RADMON_INTERVAL;
       }
       setInterval(rtimer);
-      lastPing = stick_now;
-      lastPing += random(30) * 1000;
+      lastPing = random(rtimer / 2) * 1000;
       return;
     }
     lastPing = stick_now - (stick_now % 1000);
diff --git a/ESPGeiger/src/Thingspeak/Thingspeak.cpp b/ESPGeiger/src/Thingspeak/Thingspeak.cpp
@@ -28,8 +28,7 @@ void Thingspeak::s_tick(unsigned long stick_now)
   if (stick_now - lastPing >= pingInterval)
   {
     if (lastPing == 0) {
-      lastPing = stick_now;
-      lastPing += random(30) * 1000;
+      lastPing = random(30) * 1000;
       return;
     }
     lastPing = stick_now - (stick_now % 1000);

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,7 @@ void GMC::s_tick(unsigned long stick_now)`
`29`	`29`	`if (stick_now - lastPing >= pingInterval)`
`30`	`30`	`{`
`31`	`31`	`if (lastPing == 0) {`
`32`		`- lastPing = stick_now;`
`33`		`- lastPing += random(30) * 1000;`
	`32`	`+ lastPing = random(30) * 1000;`
`34`	`33`	`return;`
`35`	`34`	`}`
`36`	`35`	`lastPing = stick_now - (stick_now % 1000);`
Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,7 @@ void Radmon::s_tick(unsigned long stick_now)`
`51`	`51`	`rtimer = RADMON_INTERVAL;`
`52`	`52`	`}`
`53`	`53`	`setInterval(rtimer);`
`54`		`- lastPing = stick_now;`
`55`		`- lastPing += random(30) * 1000;`
	`54`	`+ lastPing = random(rtimer / 2) * 1000;`
`56`	`55`	`return;`
`57`	`56`	`}`
`58`	`57`	`lastPing = stick_now - (stick_now % 1000);`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ void Thingspeak::s_tick(unsigned long stick_now)`
`28`	`28`	`if (stick_now - lastPing >= pingInterval)`
`29`	`29`	`{`
`30`	`30`	`if (lastPing == 0) {`
`31`		`- lastPing = stick_now;`
`32`		`- lastPing += random(30) * 1000;`
	`31`	`+ lastPing = random(30) * 1000;`
`33`	`32`	`return;`
`34`	`33`	`}`
`35`	`34`	`lastPing = stick_now - (stick_now % 1000);`