Merge branch 'master' into rpi-update

platformio.ini

@@ -47,15 +47,22 @@ lib_deps =
 build_src_filter = +<*> -<html/*> --<external/*>
 monitor_speed=115200
 
-
+; The following env is for syntax highlighting only,
+; it is NOT for building the firmware for Linux.
+; To build the firmware for Linux, please follow:
+; https://openthings.freshdesk.com/support/solutions/articles/5000631599
 [env:linux]
 platform = native
 build_flags = 
 	${env.build_flags}
 	-DOSPI
 
+; The following env is for syntax highlighting only,
+; it is NOT for building the firmware for Linux.
+; To build the firmware for Linux, please follow:
+; https://openthings.freshdesk.com/support/solutions/articles/5000631599
 [env:demo]
 platform = native
 build_flags = 
 	${env.build_flags}
-	-DDEMO
+	-DDEMO