Fix compilation errors from merge.

darkgrue · darkgrue · commit 34226a6a286e · 2020-11-05T15:05:36.000-06:00
ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.
The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.
diff --git a/M4_Eyes/file.cpp b/M4_Eyes/file.cpp
@@ -1,7 +1,8 @@
 //34567890123456789012345678901234567890123456789012345678901234567890123456
 
-#define ARDUINOJSON_ENABLE_COMMENTS 1
-#include <ArduinoJson.h>          // JSON config file functions
+#define ARDUINOJSON_ENABLE_COMMENTS 1	// ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.
+										// The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.
+#include <ArduinoJson.h>				// JSON config file functions
 #include "globals.h"
 
 extern Adafruit_Arcada arcada;
diff --git a/M4_Eyes/globals.h b/M4_Eyes/globals.h
@@ -235,7 +235,9 @@ extern float           screen2map(int in);
 extern float           map2screen(int in);
 
 // Functions in user.cpp
-#include <ArduinoJson.h>          // JSON config file functions
+#define ARDUINOJSON_ENABLE_COMMENTS 1	// ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.
+										// The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.
+#include <ArduinoJson.h>				// JSON config file functions
 extern void            user_setup(void);
 extern void            user_setup(StaticJsonDocument<2048> &doc);
 extern void            user_loop(void);
diff --git a/M4_Eyes/user.cpp b/M4_Eyes/user.cpp
@@ -17,7 +17,9 @@ void user_setup(void) {
 
 // Called once after the processing of the configuration file. This allows
 // user configuration to also be done based on the config file.
-#include <ArduinoJson.h>          // JSON config file functions
+#define ARDUINOJSON_ENABLE_COMMENTS 1	// ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.
+										// The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.
+#include <ArduinoJson.h>				// JSON config file functions
 void user_setup(StaticJsonDocument<2048> &doc) {
 }
 
diff --git a/M4_Eyes/user_fizzgig.cpp b/M4_Eyes/user_fizzgig.cpp
@@ -62,7 +62,9 @@ void user_setup(void) {
 
 // Called once after the processing of the configuration file. This allows
 // user configuration to also be done based on the config file.
-#include <ArduinoJson.h>          // JSON config file functions
+#define ARDUINOJSON_ENABLE_COMMENTS 1	// ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.
+										// The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.
+#include <ArduinoJson.h>				// JSON config file functions
 void user_setup(StaticJsonDocument<2048> &doc) {
 }
 
diff --git a/M4_Eyes/user_hid.cpp b/M4_Eyes/user_hid.cpp
@@ -40,7 +40,9 @@ void user_setup(void) {
 
 // Called once after the processing of the configuration file. This allows
 // user configuration to also be done based on the config file.
-#include <ArduinoJson.h>          // JSON config file functions
+#define ARDUINOJSON_ENABLE_COMMENTS 1	// ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.
+										// The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.
+#include <ArduinoJson.h>				// JSON config file functions
 void user_setup(StaticJsonDocument<2048> &doc) {
 }
 
diff --git a/M4_Eyes/user_neopixel.cpp b/M4_Eyes/user_neopixel.cpp
@@ -16,7 +16,9 @@ long firstPixelHue = 0;
 
 // Called once after the processing of the configuration file. This allows
 // user configuration to also be done based on the config file.
-#include <ArduinoJson.h>          // JSON config file functions
+#define ARDUINOJSON_ENABLE_COMMENTS 1	// ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.
+										// The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.
+#include <ArduinoJson.h>				// JSON config file functions
 void user_setup(StaticJsonDocument<2048> &doc) {
 }
 
diff --git a/M4_Eyes/user_touchneopixels.cpp b/M4_Eyes/user_touchneopixels.cpp
@@ -247,7 +247,9 @@ void user_setup(void) {
 
 // Called once after the processing of the configuration file. This allows
 // user configuration to also be done based on the config file.
-#include <ArduinoJson.h>          // JSON config file functions
+#define ARDUINOJSON_ENABLE_COMMENTS 1	// ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.
+										// The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.
+#include <ArduinoJson.h>				// JSON config file functions
 void user_setup(StaticJsonDocument<2048> &doc) {
 }
 
diff --git a/M4_Eyes/user_wiichuck.cpp b/M4_Eyes/user_wiichuck.cpp
@@ -28,7 +28,9 @@
 // Button Z: eyes blink
 // BOTH buttons: eyes are both wide AND blinking, and the colors change to red
 
-#include <ArduinoJson.h>          // JSON config file functions
+#define ARDUINOJSON_ENABLE_COMMENTS 1	// ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.
+										// The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.
+#include <ArduinoJson.h>				// JSON config file functions
 #include <WiiChuck.h>
 #include <Adafruit_NeoPixel.h>
 #include "globals.h"

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,9 @@ void user_setup(void) {`
`17`	`17`
`18`	`18`	`// Called once after the processing of the configuration file. This allows`
`19`	`19`	`// user configuration to also be done based on the config file.`
`20`		`-#include <ArduinoJson.h> // JSON config file functions`
	`20`	`+#define ARDUINOJSON_ENABLE_COMMENTS 1 // ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.`
	`21`	`+ // The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.`
	`22`	`+#include <ArduinoJson.h> // JSON config file functions`
`21`	`23`	`void user_setup(StaticJsonDocument<2048> &doc) {`
`22`	`24`	`}`
`23`	`25`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,9 @@ void user_setup(void) {`
`62`	`62`
`63`	`63`	`// Called once after the processing of the configuration file. This allows`
`64`	`64`	`// user configuration to also be done based on the config file.`
`65`		`-#include <ArduinoJson.h> // JSON config file functions`
	`65`	`+#define ARDUINOJSON_ENABLE_COMMENTS 1 // ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.`
	`66`	`+ // The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.`
	`67`	`+#include <ArduinoJson.h> // JSON config file functions`
`66`	`68`	`void user_setup(StaticJsonDocument<2048> &doc) {`
`67`	`69`	`}`
`68`	`70`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ void user_setup(void) {`
`40`	`40`
`41`	`41`	`// Called once after the processing of the configuration file. This allows`
`42`	`42`	`// user configuration to also be done based on the config file.`
`43`		`-#include <ArduinoJson.h> // JSON config file functions`
	`43`	`+#define ARDUINOJSON_ENABLE_COMMENTS 1 // ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.`
	`44`	`+ // The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.`
	`45`	`+#include <ArduinoJson.h> // JSON config file functions`
`44`	`46`	`void user_setup(StaticJsonDocument<2048> &doc) {`
`45`	`47`	`}`
`46`	`48`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,9 @@ long firstPixelHue = 0;`
`16`	`16`
`17`	`17`	`// Called once after the processing of the configuration file. This allows`
`18`	`18`	`// user configuration to also be done based on the config file.`
`19`		`-#include <ArduinoJson.h> // JSON config file functions`
	`19`	`+#define ARDUINOJSON_ENABLE_COMMENTS 1 // ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.`
	`20`	`+ // The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.`
	`21`	`+#include <ArduinoJson.h> // JSON config file functions`
`20`	`22`	`void user_setup(StaticJsonDocument<2048> &doc) {`
`21`	`23`	`}`
`22`	`24`
Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,9 @@ void user_setup(void) {`
`247`	`247`
`248`	`248`	`// Called once after the processing of the configuration file. This allows`
`249`	`249`	`// user configuration to also be done based on the config file.`
`250`		`-#include <ArduinoJson.h> // JSON config file functions`
	`250`	`+#define ARDUINOJSON_ENABLE_COMMENTS 1 // ARDUINOJSON_ENABLE_COMMENTS must be set to 1 before including the library.`
	`251`	`+ // The same value of ARDUINOJSON_ENABLE_COMMENTS must be set in each compilation unit.`
	`252`	`+#include <ArduinoJson.h> // JSON config file functions`
`251`	`253`	`void user_setup(StaticJsonDocument<2048> &doc) {`
`252`	`254`	`}`
`253`	`255`