From e2e7a62bee8ad48aacf2d2d1260b09c23308cfd2 Mon Sep 17 00:00:00 2001 From: MaMe82 Date: Wed, 21 Nov 2018 01:39:15 +0100 Subject: [PATCH] minor changes --- cli_client/cmd_event.go | 2 +- cli_client/cmd_hid.go | 2 +- cli_client/cmd_net.go | 4 ++-- cli_client/cmd_wifi.go | 4 ++-- dist/scripts/servicestart.sh | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli_client/cmd_event.go b/cli_client/cmd_event.go index bf0155c..b25b13e 100644 --- a/cli_client/cmd_event.go +++ b/cli_client/cmd_event.go @@ -9,7 +9,7 @@ var tmpEventID int64 // usbCmd represents the usb command var evtCmd = &cobra.Command{ - Use: "EVT", + Use: "evt", Short: "Receive P4wnP1 service events", Run: func(cmd *cobra.Command, args []string) { err := receiveEvent(tmpEventID) diff --git a/cli_client/cmd_hid.go b/cli_client/cmd_hid.go index 4b5c11d..97e7d29 100644 --- a/cli_client/cmd_hid.go +++ b/cli_client/cmd_hid.go @@ -21,7 +21,7 @@ var ( ) var hidCmd = &cobra.Command{ - Use: "HID", + Use: "hid", Short: "Use keyboard or mouse functionality", } diff --git a/cli_client/cmd_net.go b/cli_client/cmd_net.go index 1ac32f6..98a8a27 100644 --- a/cli_client/cmd_net.go +++ b/cli_client/cmd_net.go @@ -35,7 +35,7 @@ func init(){ */ var netCmd = &cobra.Command{ - Use: "NET", + Use: "net", Short: "Configure Network settings of ethernet interfaces (including USB ethernet if enabled)", } @@ -272,7 +272,7 @@ func checkIPv4(ip4 string) error { func init() { rootCmd.AddCommand(netCmd) - netCmd.AddCommand(netGetCmd) +// netCmd.AddCommand(netGetCmd) netCmd.AddCommand(netSetCmd) netSetCmd.AddCommand(netSetManualCmd) netSetCmd.AddCommand(netSetDHCPClientCmd) diff --git a/cli_client/cmd_wifi.go b/cli_client/cmd_wifi.go index b923ecf..753650f 100644 --- a/cli_client/cmd_wifi.go +++ b/cli_client/cmd_wifi.go @@ -31,7 +31,7 @@ func init(){ */ var wifiCmd = &cobra.Command{ - Use: "WIFI", + Use: "wifi", Short: "Configure WiFi (spawn Access Point or join WiFi networks)", } @@ -190,7 +190,7 @@ func createWifiStaSettings(reg string, strSSID string, strPSK string, nonexmon b func init() { rootCmd.AddCommand(wifiCmd) - wifiCmd.AddCommand(wifiGetCmd) + //wifiCmd.AddCommand(wifiGetCmd) wifiCmd.AddCommand(wifiSetCmd) wifiSetCmd.AddCommand(wifiSetAPCmd) wifiSetCmd.AddCommand(wifiSetStaCmd) diff --git a/dist/scripts/servicestart.sh b/dist/scripts/servicestart.sh index df40b5c..4d7f5cb 100644 --- a/dist/scripts/servicestart.sh +++ b/dist/scripts/servicestart.sh @@ -12,18 +12,18 @@ P4wnP1_cli usb set --vid 0x1d6c --pid 0x1347 --manufacturer "MaMe82" --sn "deadb # - disable DHCP option 3 (router) by passing an empty value # - disable DHCP option 6 (DNS) by passing an empty value # - add a DHCP range from 172.16.0.2 to 172.16.0.2 (single IP) with a lease time of 1 minute -P4wnP1_cli NET set server -i usbeth -a 172.16.0.1 -m 255.255.255.248 -o "3:" -o "6:" -r "172.16.0.2|172.16.0.2|5m" +P4wnP1_cli net set server -i usbeth -a 172.16.0.1 -m 255.255.255.248 -o "3:" -o "6:" -r "172.16.0.2|172.16.0.2|5m" # Enable WiFi AP (reg US, channel 6, SSID/AP name: "P4wnP1", pre shared key: "MaMe82-P4wnP1", don't use nexmon firmware) # Note: As a pre-shared key is given, P4wnP1 assume the AP should use WPA2-PSK # Note 2: The SSID uses Unicode characters not necessarily supported by the console, but P4wnP1 supports UTF-8 ;-) -P4wnP1_cli WIFI set ap -r US -c 6 -s "💥🖥💥 Ⓟ➃ⓌⓃ🅟❶" -k "MaMe82-P4wnP1" --nonexmon +P4wnP1_cli wifi set ap -r US -c 6 -s "💥🖥💥 Ⓟ➃ⓌⓃ🅟❶" -k "MaMe82-P4wnP1" --nonexmon # Configure USB ethernet interface "wlan0" to run a DHCP server # - use IPv4 172.24.0.1 for interface with netmask 255.255.255.0 # - disable DHCP option 3 (router) by passing an empty value # - disable DHCP option 6 (DNS) by passing an empty value # - add a DHCP range from 172.24.0.10 to 172.24.0.20 with a lease time of 5 minutes -P4wnP1_cli NET set server -i wlan0 -a 172.24.0.1 -m 255.255.255.0 -o "3:" -o "6:" -r "172.24.0.10|172.24.0.20|5m" +P4wnP1_cli net set server -i wlan0 -a 172.24.0.1 -m 255.255.255.0 -o "3:" -o "6:" -r "172.24.0.10|172.24.0.20|5m" P4wnP1_cli led -b 2