Fixed error when building without telnet and/or ftp module

Author: loboris

MicroPython_BUILD/components/micropython/esp32/machine_timer.c

@@ -60,6 +60,7 @@ typedef struct _machine_timer_obj_t {
     uint8_t state;
     uint8_t type;
     int8_t debug_pin;
+    int8_t debug_pin_mode;
     mp_uint_t repeat;
     mp_uint_t period;
     uint64_t event_num;
@@ -215,7 +216,10 @@ STATIC void machine_timer_isr(void *self_in)
     	TIMERG0.hw_timer[self->id & 1].config.alarm_en = self->repeat;
     }
 
-    if (self->debug_pin >= 0) gpio_set_level(self->debug_pin, (self->event_num & 1));
+    if (self->debug_pin >= 0) {
+    	if (self->debug_pin_mode >= 0) gpio_set_level(self->debug_pin, (self->debug_pin_mode & 1));
+    	else gpio_set_level(self->debug_pin, (self->event_num & 1));
+    }
     self->event_num++;
 
     if ((self->callback) && (mp_sched_schedule(self->callback, self, NULL))) self->cb_num++;
@@ -313,6 +317,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
         { MP_QSTR_mode,         MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = TIMER_TYPE_PERIODIC} },
         { MP_QSTR_callback,     MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = mp_const_none} },
         { MP_QSTR_dbgpin,       MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
+        { MP_QSTR_dbgpinmode,   MP_ARG_KW_ONLY | MP_ARG_INT, {.u_int = -1} },
     };
 
     machine_timer_disable(self);
@@ -355,6 +360,7 @@ STATIC mp_obj_t machine_timer_init_helper(machine_timer_obj_t *self, mp_uint_t n
 			// set the debug gpio if used
 			if ((args[3].u_int >= 0) && (args[3].u_int < 34)) {
 				self->debug_pin = args[3].u_int;
+				self->debug_pin_mode = args[4].u_int;
 				gpio_pad_select_gpio(self->debug_pin);
 				gpio_set_direction(self->debug_pin, GPIO_MODE_OUTPUT);
 				gpio_set_level(self->debug_pin, 0);

MicroPython_BUILD/components/micropython/py/modthread.c

@@ -445,20 +445,29 @@ STATIC mp_obj_t mod_thread_list(mp_uint_t n_args, const mp_obj_t *args) {
 					thr->stack_max, th_type);
 		}
 		free(list.threads);
+		#ifdef CONFIG_MICROPY_USE_TELNET
 		if (TelnetTaskHandle) {
 			mp_printf(&mp_plat_print, "ID=%u, Name: Telnet, Stack=%d, MaxUsed=%d, Type: SERVICE\n",
 					TelnetTaskHandle, TELNET_STACK_LEN, TELNET_STACK_LEN - uxTaskGetStackHighWaterMark(TelnetTaskHandle));
 		}
+		#endif
+
+		#ifdef CONFIG_MICROPY_USE_FTPSERVER
 		if (FtpTaskHandle) {
 			mp_printf(&mp_plat_print, "ID=%u, Name: Ftp, Stack=%d, MaxUsed=%d, Type: SERVICE\n",
 					FtpTaskHandle, FTP_STACK_LEN, FTP_STACK_LEN - uxTaskGetStackHighWaterMark(FtpTaskHandle));
 		}
+		#endif
 		return mp_const_none;
 	}
 	else {
 		int services = 0;
+		#ifdef CONFIG_MICROPY_USE_TELNET
 		if (TelnetTaskHandle) services++;
+		#endif
+		#ifdef CONFIG_MICROPY_USE_FTPSERVER
 		if (FtpTaskHandle) services++;
+		#endif
 		mp_obj_t thr_info[6];
 		mp_obj_t tuple[num+services];
 		for (n=0; n<num; n++) {
@@ -474,6 +483,7 @@ STATIC mp_obj_t mod_thread_list(mp_uint_t n_args, const mp_obj_t *args) {
 			tuple[n] = mp_obj_new_tuple(6, thr_info);
 		}
 		free(list.threads);
+		#ifdef CONFIG_MICROPY_USE_TELNET
 		if (TelnetTaskHandle) {
 			thr_info[0] = mp_obj_new_int((int)TelnetTaskHandle);
 			thr_info[1] = mp_obj_new_int(THREAD_TYPE_SERVICE);
@@ -484,6 +494,8 @@ STATIC mp_obj_t mod_thread_list(mp_uint_t n_args, const mp_obj_t *args) {
 			tuple[n] = mp_obj_new_tuple(6, thr_info);
 			n++;
 		}
+		#endif
+		#ifdef CONFIG_MICROPY_USE_FTPSERVER
 		if (FtpTaskHandle) {
 			thr_info[0] = mp_obj_new_int((int)FtpTaskHandle);
 			thr_info[1] = mp_obj_new_int(THREAD_TYPE_SERVICE);
@@ -494,6 +506,7 @@ STATIC mp_obj_t mod_thread_list(mp_uint_t n_args, const mp_obj_t *args) {
 			tuple[n] = mp_obj_new_tuple(6, thr_info);
 			n++;
 		}
+		#endif
 
 		return mp_obj_new_tuple(n, tuple);
 	}