Merge branch 'master' into develop

hathach · hathach · commit b99144d78078 · 2020-04-13T14:14:21.000+07:00
diff --git a/cores/nRF5/wiring_analog.cpp b/cores/nRF5/wiring_analog.cpp
@@ -50,9 +50,10 @@ extern "C"
  */
 void analogWriteResolution( uint8_t res )
 {
-  HwPWM0.setResolution(res);
-  HwPWM1.setResolution(res);
-  HwPWM2.setResolution(res);
+  for (int i = 0; i<HWPWM_MODULE_NUM; i++)
+  {
+    HwPWMx[i]->setResolution(res);
+  }
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,10 @@ extern "C"`
`50`	`50`	`*/`
`51`	`51`	`void analogWriteResolution( uint8_t res )`
`52`	`52`	`{`
`53`		`- HwPWM0.setResolution(res);`
`54`		`- HwPWM1.setResolution(res);`
`55`		`- HwPWM2.setResolution(res);`
	`53`	`+ for (int i = 0; i<HWPWM_MODULE_NUM; i++)`
	`54`	`+ {`
	`55`	`+ HwPWMx[i]->setResolution(res);`
	`56`	`+ }`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`/**`