Merge branch 'master' into cmake-lib

Author: jp-bennett

cores/portduino/Arduino.h

@@ -51,6 +51,6 @@ void portduinoAddArguments(const struct argp_child &child, void *childArguments)
  * write a 6 byte 'macaddr'/unique ID to the dmac parameter
  * This value can be customized with the --macaddr parameter and it defaults to 00:00:00:00:00:01
  */
-void getMacAddr(uint8_t *dmac);
+void _getMacAddr(uint8_t *dmac);
 void reboot();
 #endif

cores/portduino/FS/vfs_api.h

@@ -19,7 +19,7 @@
 #include "FSImpl.h"
 
 extern "C" {
-#include <sys/unistd.h>
+#include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 }

cores/portduino/main.cpp

@@ -89,7 +89,7 @@ static error_t parse_opt(int key, char *arg, struct argp_state *state) {
   return 0;
 }
 
-void getMacAddr(uint8_t *dmac) {
+void _getMacAddr(uint8_t *dmac) {
 
   dmac[0] = 0x80;
   dmac[1] = 0;