Merge remote-tracking branch 'origin/master' into develop

test/test_transmit_history/test_main.cpp

@@ -303,6 +303,10 @@ void setup()
 {
     initializeTestEnvironment();
 
+    // Wait for portduino's millis() clock to start ticking before tests run
+    testDelay(10);
+    testDelay(2000);
+
     UNITY_BEGIN();
 
     RUN_TEST(test_setLastSentToMesh_stores_millis);

test/test_utf8/test_main.cpp

@@ -163,7 +163,7 @@ void test_above_max_codepoint()
     TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
 }
 
-int main(int argc, char **argv)
+void setup()
 {
     UNITY_BEGIN();
 
@@ -191,5 +191,7 @@ int main(int argc, char **argv)
     RUN_TEST(test_valid_max_codepoint);
     RUN_TEST(test_above_max_codepoint);
 
-    return UNITY_END();
+    exit(UNITY_END());
 }
+
+void loop() {}