From 34a460188e04a8fe3e98d0f9c0377dac2b1068f2 Mon Sep 17 00:00:00 2001
From: Victek <Victek@gmail.com>
Date: Tue, 9 Jun 2009 22:42:47 -0500
Subject: [PATCH] Add extra button actions

---
 release/src/router/httpd/tomato.c        | 11 +++++++----
 release/src/router/nvram/defaults.c      |  3 +++
 release/src/router/rc/buttons.c          | 14 ++++++++++++--
 release/src/router/www/admin-buttons.asp | 11 +++++++----
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/release/src/router/httpd/tomato.c b/release/src/router/httpd/tomato.c
index 837a20d62f..2828456050 100644
--- a/release/src/router/httpd/tomato.c
+++ b/release/src/router/httpd/tomato.c
@@ -593,11 +593,14 @@ static const nvset_t nvset_list[] = {
 
 // admin-buttons
 	{ "sesx_led",			V_RANGE(0, 255)		},	// amber, white, aoss
-	{ "sesx_b0",			V_RANGE(0, 4)		},	// 0-4: toggle wireless, reboot, shutdown, script
-	{ "sesx_b1",			V_RANGE(0, 4)		},	// "
-	{ "sesx_b2",			V_RANGE(0, 4)		},	// "
-	{ "sesx_b3",			V_RANGE(0, 4)		},	// "
+	{ "sesx_b0",			V_RANGE(0, 6)		},	// 0-6: toggle wireless, reboot, shutdown, script, script 1, script 2
+	{ "sesx_b1",			V_RANGE(0, 6)		},	// "
+	{ "sesx_b2",			V_RANGE(0, 6)		},	// "
+	{ "sesx_b3",			V_RANGE(0, 6)		},	// "
+	{ "sesx_b4",			V_RANGE(0, 6)		},	// "	
 	{ "sesx_script",		V_TEXT(0, 1024)		},	//
+	{ "sesx_script_1",		V_TEXT(0, 1024)		},	//
+	{ "sesx_script_2",		V_TEXT(0, 1024)		},	//
 
 // admin-debug
 	{ "debug_nocommit",		V_01				},
diff --git a/release/src/router/nvram/defaults.c b/release/src/router/nvram/defaults.c
index 2231069516..5ccd817d36 100644
--- a/release/src/router/nvram/defaults.c
+++ b/release/src/router/nvram/defaults.c
@@ -408,9 +408,12 @@ const defaults_t defaults[] = {
 	{ "sesx_b1",			"4"				},
 	{ "sesx_b2",			"4"				},
 	{ "sesx_b3",			"4"				},
+	{ "sesx_b4",			"4"				},
 	{ "sesx_script",
 		"[ $1 -ge 20 ] && telnetd -p 233 -l /bin/sh\n"
 	},
+	{ "sesx_script_1",		""				},
+	{ "sesx_script_2",		""				},
 	{ "script_brau",
 		"if [ ! -e /tmp/switch-start ]; then\n"
 		"  # do something at startup\n"
diff --git a/release/src/router/rc/buttons.c b/release/src/router/rc/buttons.c
index d343ec53db..4b966ace92 100644
--- a/release/src/router/rc/buttons.c
+++ b/release/src/router/rc/buttons.c
@@ -207,16 +207,18 @@ int buttons_main(int argc, char *argv[])
 
 #ifdef DEBUG_TEST
 				cprintf("ses count=%d\n", count);
+
 #endif
 
-			if ((count != 3) && (count != 7) && (count != 11)) {
+			if ((count != 3) && (count != 7) && (count != 11) && (count != 15) && (count != 19)) {
 				n = count >> 2;
 				if (n > 3) n = 3;
 				/*
 					0-2  = func0
 					4-6  = func1
 					8-10 = func2
-					12+  = func3
+					12-14 = func3
+					18+ = func4
 				*/
 
 #ifdef DEBUG_TEST
@@ -239,6 +241,14 @@ int buttons_main(int argc, char *argv[])
 						sprintf(s, "%d", count);
 						run_nvscript("sesx_script", s, 2);
 						break;
+					case '5':	// run a script
+						sprintf(s, "%d", count);
+						run_nvscript("sesx_script_1", s, 2);
+						break;
+					case '6':	// run a script
+						sprintf(s, "%d", count);
+						run_nvscript("sesx_script_2", s, 2);
+						break;
 					}
 				}
 #endif
diff --git a/release/src/router/www/admin-buttons.asp b/release/src/router/www/admin-buttons.asp
index 392328cab4..1fe16fcba0 100644
--- a/release/src/router/www/admin-buttons.asp
+++ b/release/src/router/www/admin-buttons.asp
@@ -28,7 +28,7 @@ textarea {
 <script type='text/javascript' src='debug.js'></script>
 
 <script type='text/javascript'>
-//	<% nvram("sesx_led,sesx_b0,sesx_b1,sesx_b2,sesx_b3,sesx_script,script_brau,t_model,t_features"); %>
+//	<% nvram("sesx_led,sesx_b0,sesx_b1,sesx_b2,sesx_b3,sesx_b4,sesx_script,sesx_script_1,sesx_script_2,script_brau,t_model,t_features"); %>
 
 var ses = features('ses');
 var brau = features('brau');
@@ -88,14 +88,17 @@ function earlyInit()
 <div class='section-title'>SES/AOSS Button</div>
 <div class='section'>
 <script type='text/javascript'>
-a = [[0,'Do Nothing'],[1,'Toggle Wireless'],[2,'Reboot'],[3,'Shutdown'],[4,'Run Custom Script']];
+a = [[0,'Do Nothing'],[1,'Toggle Wireless'],[2,'Reboot'],[3,'Shutdown'],[4,'Run Custom Script'],[5, 'Run Custom Script 1'],[6, 'Run Custom Script 2']];
 createFieldTable('', [
 	{ title: "When Pushed For..." },
 	{ title: '0-2 Seconds', indent: 2, name: 'sesx_b0', type: 'select', options: a, value: nvram.sesx_b0 || 0 },
 	{ title: '4-6 Seconds', indent: 2, name: 'sesx_b1', type: 'select', options: a, value: nvram.sesx_b1 || 0 },
 	{ title: '8-10 Seconds', indent: 2, name: 'sesx_b2', type: 'select', options: a, value: nvram.sesx_b2 || 0 },
-	{ title: '12+ Seconds', indent: 2, name: 'sesx_b3', type: 'select', options: a, value: nvram.sesx_b3 || 0 },
-	{ title: 'Custom Script', indent: 2, name: 'sesx_script', type: 'textarea', value: nvram.sesx_script }
+	{ title: '12-14 Seconds', indent: 2, name: 'sesx_b3', type: 'select', options: a, value: nvram.sesx_b3 || 0 },
+	{ title: '16+ Seconds', indent: 2, name: 'sesx_b4', type: 'select', options: a, value: nvram.sesx_b4 || 0 },
+	{ title: 'Custom Script', indent: 2, name: 'sesx_script', type: 'textarea', value: nvram.sesx_script },
+	{ title: 'Custom Script 1', indent: 2, name: 'sesx_script_1', type: 'textarea', value: nvram.sesx_script_1 },
+	{ title: 'Custom Script 2', indent: 2, name: 'sesx_script_2', type: 'textarea', value: nvram.sesx_script_2 }
 ]);
 </script>
 </div>
-- 
2.11.4.GIT