use xymap from fl namespace

BlitzCityDIY · BlitzCityDIY · commit a26563c8d13b · 2025-01-06T18:35:49.000-05:00
diff --git a/GemmaM0_Band_Jacket/DiscoBandCamp/XYmap.h b/GemmaM0_Band_Jacket/DiscoBandCamp/XYmap.h
@@ -84,4 +84,4 @@ uint16_t XY(uint16_t x, uint16_t y, uint16_t width, uint16_t height)
 }
 
 // Instantiate an XYMap object
-XYMap myXYMap = XYMap::constructWithUserFunction(kMatrixWidth, kMatrixHeight, XY);
+fl::XYMap myXYMap = fl::XYMap::constructWithUserFunction(kMatrixWidth, kMatrixHeight, XY);
diff --git a/GemmaM0_Band_Jacket/DiscoBandCamp/effects.h b/GemmaM0_Band_Jacket/DiscoBandCamp/effects.h
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: MIT
 
 //   Selection of effects from the FastLED library & Macetech RGB Shades
-#include "XYmap.h"
 
 //  Triple Sine Waves
 void threeSine() {
diff --git a/GemmaM0_Band_Jacket/DiscoBandCamp/utils.h b/GemmaM0_Band_Jacket/DiscoBandCamp/utils.h
@@ -3,7 +3,6 @@
 // SPDX-License-Identifier: MIT
 
 // Assorted useful functions and variables
-#include "XYmap.h"
 // Global variables
 boolean effectInit = false;   // indicates if a pattern has been recently switched
 uint16_t effectDelay = 0;   // time between automatic effect changes

Original file line number	Diff line number	Diff line change
`@@ -84,4 +84,4 @@ uint16_t XY(uint16_t x, uint16_t y, uint16_t width, uint16_t height)`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`// Instantiate an XYMap object`
`87`		`-XYMap myXYMap = XYMap::constructWithUserFunction(kMatrixWidth, kMatrixHeight, XY);`
	`87`	`+fl::XYMap myXYMap = fl::XYMap::constructWithUserFunction(kMatrixWidth, kMatrixHeight, XY);`