Merge pull request #451 from adafruit/deinit-check

me-no-dev · web-flow · commit de025b8f40e4 · 2022-09-23T11:04:39.000+03:00
don't reset LEDC channel if it wasn't used by camera
diff --git a/target/xclk.c b/target/xclk.c
@@ -13,7 +13,8 @@
 static const char* TAG = "camera_xclk";
 #endif
 
-static ledc_channel_t g_ledc_channel = 0;
+#define NO_CAMERA_LEDC_CHANNEL 0xFF
+static ledc_channel_t g_ledc_channel = NO_CAMERA_LEDC_CHANNEL;
 
 esp_err_t xclk_timer_conf(int ledc_timer, int xclk_freq_hz)
 {
@@ -60,5 +61,8 @@ esp_err_t camera_enable_out_clock(camera_config_t* config)
 
 void camera_disable_out_clock()
 {
-    ledc_stop(LEDC_LOW_SPEED_MODE, g_ledc_channel, 0);
+    if (g_ledc_channel != NO_CAMERA_LEDC_CHANNEL) {
+        ledc_stop(LEDC_LOW_SPEED_MODE, g_ledc_channel, 0);
+        g_ledc_channel = NO_CAMERA_LEDC_CHANNEL;
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`	`static const char* TAG = "camera_xclk";`
`14`	`14`	`#endif`
`15`	`15`
`16`		`-static ledc_channel_t g_ledc_channel = 0;`
	`16`	`+#define NO_CAMERA_LEDC_CHANNEL 0xFF`
	`17`	`+static ledc_channel_t g_ledc_channel = NO_CAMERA_LEDC_CHANNEL;`
`17`	`18`
`18`	`19`	`esp_err_t xclk_timer_conf(int ledc_timer, int xclk_freq_hz)`
`19`	`20`	`{`
`@@ -60,5 +61,8 @@ esp_err_t camera_enable_out_clock(camera_config_t* config)`
`60`	`61`
`61`	`62`	`void camera_disable_out_clock()`
`62`	`63`	`{`
`63`		`- ledc_stop(LEDC_LOW_SPEED_MODE, g_ledc_channel, 0);`
	`64`	`+ if (g_ledc_channel != NO_CAMERA_LEDC_CHANNEL) {`
	`65`	`+ ledc_stop(LEDC_LOW_SPEED_MODE, g_ledc_channel, 0);`
	`66`	`+ g_ledc_channel = NO_CAMERA_LEDC_CHANNEL;`
	`67`	`+ }`
`64`	`68`	`}`