import myconfig setting in cam_streamer

Author: daschr

app_httpd.cpp

@@ -28,8 +28,13 @@
 #include "src/logo.h"
 #include "storage.h"
 
+#if __has_include("myconfig.h")
+	struct station { const char ssid[65]; const char password[65]; const bool dhcp;};
+	#include "myconfig.h"
+#endif
+
 #ifndef MIN_FRAME_TIME
-	#warning "MIN_FRAME_TIME undefined, setting to default value of 500"
+	#warning "MIN_FRAME_TIME undefined, using default value of 500"
 	#define MIN_FRAME_TIME 500
 #endif
 

cam_streamer.cpp

@@ -11,8 +11,17 @@
 
 #include "cam_streamer.h"
 
+#if __has_include("myconfig.h")
+struct station {
+    const char ssid[65];
+    const char password[65];
+    const bool dhcp;
+};
+#include "myconfig.h"
+#endif
+
 #ifndef CAM_STREAMER_MAX_CLIENTS
-#warning "CAM_STREAMER_MAX_CLIENTS not defined, using default value of 10"
+#warning "CAM_STREAMER_MAX_CLIENTS undefined, using default value of 10"
 #define CAM_STREAMER_MAX_CLIENTS 10
 #endif
 
@@ -131,8 +140,8 @@ void cam_streamer_task(void *p) {
             }
 
             print_debug("[cam_streamer] fd %d dequeued\n", fd);
-            
-			if(is_send_error(httpd_socket_send(s->server, fd, s->part_buf, s->part_len, 0))) {
+
+            if(is_send_error(httpd_socket_send(s->server, fd, s->part_buf, s->part_len, 0))) {
                 cam_streamer_decrement_num_clients(s);
                 continue;
             }

cam_streamer.h

@@ -24,7 +24,7 @@ typedef struct {
     size_t num_clients;
 } cam_streamer_t;
 
-void cam_streamer_init(cam_streamer_t *s, httpd_handle_t server, uint16_t fps);
+void cam_streamer_init(cam_streamer_t *s, httpd_handle_t server, uint16_t frame_delay);
 void cam_streamer_set_frame_delay(cam_streamer_t *s, uint16_t frame_delay);
 void cam_streamer_task(void *p);
 void cam_streamer_start(cam_streamer_t *s);

myconfig.sample.h

@@ -22,7 +22,7 @@
  *    just replace your ssid and password in the line below.
  */
 
-struct station stationList[] = {{"my_ssid","my_password", true}};
+const struct station stationList[] = {{"my_ssid","my_password", true}};
 
 /*
  * You can extend the stationList[] above with additional SSID+Password pairs
@@ -148,6 +148,9 @@ struct station stationList[] = {{"ssid1", "pass1", true},
 // max_fps = 1000/min_frame_time
 // #define MIN_FRAME_TIME 500
 
+// Maximum number of clients of the stream
+// #define CAM_STREAMER_MAX_CLIENTS 10
+
 /*
  * Additional Features
  *