diff --git a/firmware-repeater/0x02000.bin b/firmware-repeater/0x02000.bin index 2406301..67d4a6f 100644 Binary files a/firmware-repeater/0x02000.bin and b/firmware-repeater/0x02000.bin differ diff --git a/firmware-repeater/0x82000.bin b/firmware-repeater/0x82000.bin index a7c4dc3..8f0e4a5 100644 Binary files a/firmware-repeater/0x82000.bin and b/firmware-repeater/0x82000.bin differ diff --git a/firmware-repeater/sha1sums b/firmware-repeater/sha1sums index 121796c..9153035 100644 --- a/firmware-repeater/sha1sums +++ b/firmware-repeater/sha1sums @@ -1,3 +1,3 @@ -0eb12ac84f53f2f0c40829b2ab31818c0d70bc66 firmware/0x02000.bin -d5104f0605653e0e62ffb562522f56e69078c333 firmware/0x82000.bin +6b1c0bd11dd89a89e41a3510f843ff46df2f5b47 firmware/0x02000.bin +1b460b5daf4f75d73f47d8d9f811e4d6d25e537b firmware/0x82000.bin 9bd7d25204d71b3db5f35e0b2def8a6aaa7f765c firmware/0x00000.bin diff --git a/user/bridge.c b/user/bridge.c index ce85a57..a772dd1 100644 --- a/user/bridge.c +++ b/user/bridge.c @@ -12,6 +12,7 @@ #include "user_interface.h" #include "sys_time.h" #include "config_flash.h" +#include "easygpio.h" extern sysconfig_t config; @@ -363,7 +364,7 @@ static err_t ICACHE_FLASH_ATTR bridge_output_sta(struct netif *netif, struct pbu #if DAILY_LIMIT Bytes_per_day += p->tot_len; #endif - + err_t err = s_orig_lo_ap(s_ap_nif, p); pbuf_header(p, -(s16_t)sizeof(eth_hdr_t)); return err; } @@ -381,6 +382,9 @@ static err_t ICACHE_FLASH_ATTR bridge_input_ap(struct pbuf *p, struct netif *inp { if (os_strcmp(config.ssid, WIFI_SSID) == 0) return s_orig_input_ap(p, inp); + if (config.status_led <= 16) + easygpio_outputSet(config.status_led, 1); + struct pbuf *q = pbuf_alloc(PBUF_RAW, p->tot_len + 16, PBUF_RAM); Bytes_out += p->tot_len; @@ -439,7 +443,9 @@ static err_t ICACHE_FLASH_ATTR bridge_input_sta(struct pbuf *p, struct netif *in #if DAILY_LIMIT Bytes_per_day += p->tot_len; #endif - + if (config.status_led <= 16) + easygpio_outputSet(config.status_led, 0); + if (!q) return s_orig_input_sta(p, inp); pbuf_copy(q, p); diff --git a/user/user_main.c b/user/user_main.c index 3c839bd..549852a 100755 --- a/user/user_main.c +++ b/user/user_main.c @@ -1189,8 +1189,11 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn) os_sprintf_flash(response, "set [use_peap|peap_identity|peap_username|peap_password] \r\n"); to_console(response); #endif - os_sprintf_flash(response, "set [ap_mac|sta_mac|ssid_hidden|sta_hostname|max_clients] \r\nset [network|dns|ip|netmask|gw] \r\n"); + os_sprintf_flash(response, "set [ap_mac|sta_mac|ssid_hidden|sta_hostname|max_clients] \r\n"); to_console(response); +#ifndef REPEATER_MODE + os_sprintf_flash(response, "set [network|dns|ip|netmask|gw] \r\n"); + to_console(response);#endif #if HAVE_ENC28J60 #if DCHPSERVER_ENC28J60 os_sprintf_flash(response, "set [eth_dhcpd] \r\n"); @@ -1199,12 +1202,14 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn) os_sprintf_flash(response, "set [eth_enable|eth_ip|eth_netmask|eth_gw|eth_mac] \r\n"); to_console(response); #endif +#ifndef REPEATER_MODE os_sprintf_flash(response, "set [max_nat|max_portmap|tcp_timeout|udp_timeout] \r\nroute clear|route add |route delete \r\ninterface [up|down]\r\nportmap [add|remove] [TCP|UDP] \r\n"); to_console(response); #if ACLS os_sprintf_flash(response, "show acl|acl [from_sta|to_sta|from_ap|to_ap] [IP|TCP|UDP] [] [] [allow|deny|allow_monitor|deny_monitor]\r\nacl [from_sta|to_sta|from_ap|to_ap] clear\r\n"); to_console(response); #endif +#endif #if DAILY_LIMIT os_sprintf_flash(response, "set [daily_limit|timezone] \r\n"); to_console(response); @@ -1225,6 +1230,7 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn) os_sprintf_flash(response, "set [upstream_kbps|downstream_kbps] \r\n"); to_console(response); #endif +#ifndef REPEATER_MODE os_sprintf_flash(response, "set [automesh|am_threshold"); to_console(response); #if ALLOW_SLEEP @@ -1233,6 +1239,7 @@ void ICACHE_FLASH_ATTR console_handle_command(struct espconn *pespconn) #endif os_sprintf_flash(response, "] \r\n"); to_console(response); +#endif os_sprintf_flash(response, "set [speed|status_led|hw_reset|config_port|config_access|web_port] \r\nsave [config|dhcp]\r\nconnect|disconnect|reset [factory]|lock|unlock |quit\r\n"); to_console(response); os_sprintf_flash(response, "set [client_watchdog|ap_watchdog] \r\n");