Fix GPIO Controller lazy loading (#196)

jacobguilbeau · web-flow · commit 6b0eb4d6358a · 2022-08-03T09:36:46.000+01:00
diff --git a/AtomCommon/AtomBase.cs b/AtomCommon/AtomBase.cs
@@ -43,7 +43,7 @@ public static GpioButton Button
             {
                 if (_button == null)
                 {
-                    _button = new(39, _gpio, false);
+                    _button = new(39, GpioController, false);
                 }
 
                 return _button;
diff --git a/nanoFramework.Fire/Fire.cs b/nanoFramework.Fire/Fire.cs
@@ -53,7 +53,7 @@ public static GpioButton ButtonLeft
             {
                 if (_left == null)
                 {
-                    _left = new(39, _gpio, false);
+                    _left = new(39, GpioController, false);
                 }
 
                 return _left;
@@ -69,7 +69,7 @@ public static GpioButton ButtonCenter
             {
                 if (_center == null)
                 {
-                    _center = new(38, _gpio, false);
+                    _center = new(38, GpioController, false);
                 }
 
                 return _center;
@@ -85,7 +85,7 @@ public static GpioButton ButtonRight
             {
                 if (_right == null)
                 {
-                    _right = new(37, _gpio, false);
+                    _right = new(37, GpioController, false);
                 }
 
                 return _right;
@@ -166,9 +166,7 @@ static Fire()
             _power.ChargingCutOffCurrent = ChargingCutOffCurrent.C500mA;
             _power.ChargingCuttOffVoltage = ChargingCutOffVoltage.V4_2;
 
-            // Setup buttons
-            _gpio = new();
-
+            
             // Config GPIOs for SPI (screen and SD Card)
             Configuration.SetPinFunction(23, DeviceFunction.SPI1_MOSI);
             Configuration.SetPinFunction(19, DeviceFunction.SPI1_MISO);
diff --git a/nanoFramework.M5Core/M5Core.cs b/nanoFramework.M5Core/M5Core.cs
@@ -34,7 +34,7 @@ public static GpioButton ButtonLeft
             {
                 if (_left == null)
                 {
-                    _left = new(39, _gpio, false);
+                    _left = new(39, GpioController, false);
                 }
 
                 return _left;
@@ -50,7 +50,7 @@ public static GpioButton ButtonCenter
             {
                 if (_center == null)
                 {
-                    _center = new(38, _gpio, false);
+                    _center = new(38, GpioController, false);
                 }
 
                 return _center;
@@ -66,7 +66,7 @@ public static GpioButton ButtonRight
             {
                 if (_right == null)
                 {
-                    _right = new(37, _gpio, false);
+                    _right = new(37, GpioController, false);
                 }
 
                 return _right;
@@ -151,9 +151,7 @@ static M5Core()
             _power.ChargingCutOffCurrent = ChargingCutOffCurrent.C500mA;
             _power.ChargingCuttOffVoltage = ChargingCutOffVoltage.V4_2;
 
-            // Setup buttons
-            _gpio = new();
-
+            
             // Config GPIOs for SPI (screen and SD Card)
             Configuration.SetPinFunction(23, DeviceFunction.SPI1_MOSI);
             Configuration.SetPinFunction(19, DeviceFunction.SPI1_MISO);
diff --git a/nanoFramework.M5StickCommon/M5StickCBase.cs b/nanoFramework.M5StickCommon/M5StickCBase.cs
@@ -52,7 +52,7 @@ public static GpioButton ButtonM5
             {
                 if (_buttonM5 == null)
                 {
-                    _buttonM5 = new(37, _gpio, false);
+                    _buttonM5 = new(37, GpioController, false);
                 }
 
                 return _buttonM5;
@@ -68,7 +68,7 @@ public static GpioButton ButtonRight
             {
                 if (_buttonRight == null)
                 {
-                    _buttonRight = new(39, _gpio, false);
+                    _buttonRight = new(39, GpioController, false);
                 }
 
                 return _buttonRight;
@@ -84,7 +84,7 @@ public static GpioPin Led
             {
                 if (_led == null)
                 {
-                    _led = _gpio.OpenPin(10, PinMode.Output);
+                    _led = GpioController.OpenPin(10, PinMode.Output);
                 }
 
                 return _led;

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ public static GpioButton Button`
`43`	`43`	`{`
`44`	`44`	`if (_button == null)`
`45`	`45`	`{`
`46`		`- _button = new(39, _gpio, false);`
	`46`	`+ _button = new(39, GpioController, false);`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`return _button;`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public static GpioButton ButtonLeft`
`53`	`53`	`{`
`54`	`54`	`if (_left == null)`
`55`	`55`	`{`
`56`		`- _left = new(39, _gpio, false);`
	`56`	`+ _left = new(39, GpioController, false);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`return _left;`
`@@ -69,7 +69,7 @@ public static GpioButton ButtonCenter`
`69`	`69`	`{`
`70`	`70`	`if (_center == null)`
`71`	`71`	`{`
`72`		`- _center = new(38, _gpio, false);`
	`72`	`+ _center = new(38, GpioController, false);`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`return _center;`
`@@ -85,7 +85,7 @@ public static GpioButton ButtonRight`
`85`	`85`	`{`
`86`	`86`	`if (_right == null)`
`87`	`87`	`{`
`88`		`- _right = new(37, _gpio, false);`
	`88`	`+ _right = new(37, GpioController, false);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`return _right;`
`@@ -166,9 +166,7 @@ static Fire()`
`166`	`166`	`_power.ChargingCutOffCurrent = ChargingCutOffCurrent.C500mA;`
`167`	`167`	`_power.ChargingCuttOffVoltage = ChargingCutOffVoltage.V4_2;`
`168`	`168`
`169`		`- // Setup buttons`
`170`		`- _gpio = new();`
`171`		`-`
	`169`	`+`
`172`	`170`	`// Config GPIOs for SPI (screen and SD Card)`
`173`	`171`	`Configuration.SetPinFunction(23, DeviceFunction.SPI1_MOSI);`
`174`	`172`	`Configuration.SetPinFunction(19, DeviceFunction.SPI1_MISO);`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public static GpioButton ButtonLeft`
`34`	`34`	`{`
`35`	`35`	`if (_left == null)`
`36`	`36`	`{`
`37`		`- _left = new(39, _gpio, false);`
	`37`	`+ _left = new(39, GpioController, false);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`return _left;`
`@@ -50,7 +50,7 @@ public static GpioButton ButtonCenter`
`50`	`50`	`{`
`51`	`51`	`if (_center == null)`
`52`	`52`	`{`
`53`		`- _center = new(38, _gpio, false);`
	`53`	`+ _center = new(38, GpioController, false);`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`return _center;`
`@@ -66,7 +66,7 @@ public static GpioButton ButtonRight`
`66`	`66`	`{`
`67`	`67`	`if (_right == null)`
`68`	`68`	`{`
`69`		`- _right = new(37, _gpio, false);`
	`69`	`+ _right = new(37, GpioController, false);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`return _right;`
`@@ -151,9 +151,7 @@ static M5Core()`
`151`	`151`	`_power.ChargingCutOffCurrent = ChargingCutOffCurrent.C500mA;`
`152`	`152`	`_power.ChargingCuttOffVoltage = ChargingCutOffVoltage.V4_2;`
`153`	`153`
`154`		`- // Setup buttons`
`155`		`- _gpio = new();`
`156`		`-`
	`154`	`+`
`157`	`155`	`// Config GPIOs for SPI (screen and SD Card)`
`158`	`156`	`Configuration.SetPinFunction(23, DeviceFunction.SPI1_MOSI);`
`159`	`157`	`Configuration.SetPinFunction(19, DeviceFunction.SPI1_MISO);`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ public static GpioButton ButtonM5`
`52`	`52`	`{`
`53`	`53`	`if (_buttonM5 == null)`
`54`	`54`	`{`
`55`		`- _buttonM5 = new(37, _gpio, false);`
	`55`	`+ _buttonM5 = new(37, GpioController, false);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`return _buttonM5;`
`@@ -68,7 +68,7 @@ public static GpioButton ButtonRight`
`68`	`68`	`{`
`69`	`69`	`if (_buttonRight == null)`
`70`	`70`	`{`
`71`		`- _buttonRight = new(39, _gpio, false);`
	`71`	`+ _buttonRight = new(39, GpioController, false);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`return _buttonRight;`
`@@ -84,7 +84,7 @@ public static GpioPin Led`
`84`	`84`	`{`
`85`	`85`	`if (_led == null)`
`86`	`86`	`{`
`87`		`- _led = _gpio.OpenPin(10, PinMode.Output);`
	`87`	`+ _led = GpioController.OpenPin(10, PinMode.Output);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`return _led;`