Merge pull request #204 from adafruit/minor-cleanup

hathach · web-flow · commit 7255b55ffe4d · 2021-05-19T15:59:17.000+07:00
clean up
diff --git a/src/main.c b/src/main.c
@@ -207,7 +207,7 @@ int main(void)
   if ( !dfu_skip )
   {
     // DFU button pressed
-    dfu_start  = dfu_start || (button_pressed(BUTTON_DFU) && !dfu_skip);
+    dfu_start  = dfu_start || button_pressed(BUTTON_DFU);
 
     // DFU + FRESET are pressed --> OTA
     _ota_dfu = _ota_dfu  || ( button_pressed(BUTTON_DFU) && button_pressed(BUTTON_FRESET) ) ;

Original file line number	Diff line number	Diff line change
`@@ -207,7 +207,7 @@ int main(void)`
`207`	`207`	`if ( !dfu_skip )`
`208`	`208`	`{`
`209`	`209`	`// DFU button pressed`
`210`		`- dfu_start = dfu_start \|\| (button_pressed(BUTTON_DFU) && !dfu_skip);`
	`210`	`+ dfu_start = dfu_start \|\| button_pressed(BUTTON_DFU);`
`211`	`211`
`212`	`212`	`// DFU + FRESET are pressed --> OTA`
`213`	`213`	`_ota_dfu = _ota_dfu \|\| ( button_pressed(BUTTON_DFU) && button_pressed(BUTTON_FRESET) ) ;`