Merge branch 'develop'

hathach · hathach · commit fd978044f1a3 · 2018-11-23T11:18:22.000+07:00
diff --git a/cores/nRF5/wiring_digital.c b/cores/nRF5/wiring_digital.c
@@ -31,7 +31,7 @@ void pinMode( uint32_t ulPin, uint32_t ulMode )
     return;
   }
 
-//  ulPin = g_ADigitalPinMap[ulPin];
+  ulPin = g_ADigitalPinMap[ulPin];
 
   // Set pin mode according to chapter '22.6.3 I/O Pin Configuration'
   switch ( ulMode )
@@ -84,7 +84,7 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )
     return;
   }
 
-//  ulPin = g_ADigitalPinMap[ulPin];
+  ulPin = g_ADigitalPinMap[ulPin];
   NRF_GPIO_Type* nrf_port = (NRF_GPIO_Type*) digitalPinToPort(ulPin);
 
   switch ( ulVal )
@@ -105,7 +105,7 @@ int digitalRead( uint32_t ulPin )
     return 0;
   }
 
-//  ulPin = g_ADigitalPinMap[ulPin];
+  ulPin = g_ADigitalPinMap[ulPin];
 
   // Return bit in OUT or IN depending on configured direction
   NRF_GPIO_Type* nrf_port = (NRF_GPIO_Type*) digitalPinToPort(ulPin);

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ void pinMode( uint32_t ulPin, uint32_t ulMode )`
`31`	`31`	`return;`
`32`	`32`	`}`
`33`	`33`
`34`		`-// ulPin = g_ADigitalPinMap[ulPin];`
	`34`	`+ ulPin = g_ADigitalPinMap[ulPin];`
`35`	`35`
`36`	`36`	`// Set pin mode according to chapter '22.6.3 I/O Pin Configuration'`
`37`	`37`	`switch ( ulMode )`
`@@ -84,7 +84,7 @@ void digitalWrite( uint32_t ulPin, uint32_t ulVal )`
`84`	`84`	`return;`
`85`	`85`	`}`
`86`	`86`
`87`		`-// ulPin = g_ADigitalPinMap[ulPin];`
	`87`	`+ ulPin = g_ADigitalPinMap[ulPin];`
`88`	`88`	`NRF_GPIO_Type* nrf_port = (NRF_GPIO_Type*) digitalPinToPort(ulPin);`
`89`	`89`
`90`	`90`	`switch ( ulVal )`
`@@ -105,7 +105,7 @@ int digitalRead( uint32_t ulPin )`
`105`	`105`	`return 0;`
`106`	`106`	`}`
`107`	`107`
`108`		`-// ulPin = g_ADigitalPinMap[ulPin];`
	`108`	`+ ulPin = g_ADigitalPinMap[ulPin];`
`109`	`109`
`110`	`110`	`// Return bit in OUT or IN depending on configured direction`
`111`	`111`	`NRF_GPIO_Type* nrf_port = (NRF_GPIO_Type*) digitalPinToPort(ulPin);`