-
-
Notifications
You must be signed in to change notification settings - Fork 731
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement basic hardware detection (#435)
- Loading branch information
Showing
23 changed files
with
1,519 additions
and
78 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package keba | ||
|
|
||
| import ( | ||
| "io" | ||
| "net" | ||
| "strings" | ||
|
|
||
| "github.com/andig/evcc/util" | ||
| ) | ||
|
|
||
| // Sender is a KEBA UDP sender | ||
| type Sender struct { | ||
| conn *net.UDPConn | ||
| } | ||
|
|
||
| // NewSender creates KEBA UDP sender | ||
| func NewSender(addr string) (*Sender, error) { | ||
| addr = util.DefaultPort(addr, Port) | ||
| raddr, err := net.ResolveUDPAddr("udp", addr) | ||
|
|
||
| var conn *net.UDPConn | ||
| if err == nil { | ||
| conn, err = net.DialUDP("udp", nil, raddr) | ||
| } | ||
|
|
||
| c := &Sender{ | ||
| conn: conn, | ||
| } | ||
|
|
||
| return c, err | ||
| } | ||
|
|
||
| // Send msg to receiver | ||
| func (c *Sender) Send(msg string) error { | ||
| _, err := io.Copy(c.conn, strings.NewReader(msg)) | ||
| return err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "net" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "github.com/andig/evcc/detect" | ||
| "github.com/andig/evcc/util" | ||
| "github.com/korylprince/ipnetgen" | ||
| "github.com/olekukonko/tablewriter" | ||
| "github.com/spf13/cobra" | ||
| "github.com/spf13/viper" | ||
| ) | ||
|
|
||
| // detectCmd represents the vehicle command | ||
| var detectCmd = &cobra.Command{ | ||
| Use: "detect [host ...] [subnet ...]", | ||
| Short: "Auto-detect compatible hardware", | ||
| Long: `Automatic discovery using detect scans the local network for available devices. | ||
| Scanning focuses on devices that are commonly used that are detectable with reasonable efforts. | ||
| On successful detection, suggestions for EVCC configuration can be made. The suggestions should simplify | ||
| configuring EVCC but are probably not sufficient for fully automatic configuration.`, | ||
| Run: runDetect, | ||
| } | ||
|
|
||
| func init() { | ||
| rootCmd.AddCommand(detectCmd) | ||
| } | ||
|
|
||
| // IPsFromSubnet creates a list of ip addresses for given subnet | ||
| func IPsFromSubnet(arg string) (res []string) { | ||
| gen, err := ipnetgen.New(arg) | ||
| if err != nil { | ||
| log.FATAL.Fatal("could not create iterator") | ||
| } | ||
|
|
||
| for ip := gen.Next(); ip != nil; ip = gen.Next() { | ||
| res = append(res, ip.String()) | ||
| } | ||
|
|
||
| return res | ||
| } | ||
|
|
||
| // ParseHostIPNet converts host or cidr into a host list | ||
| func ParseHostIPNet(arg string) (res []string) { | ||
| if ip := net.ParseIP(arg); ip != nil { | ||
| return []string{ip.String()} | ||
| } | ||
|
|
||
| _, ipnet, err := net.ParseCIDR(arg) | ||
|
|
||
| // simple host | ||
| if err != nil { | ||
| return []string{arg} | ||
| } | ||
|
|
||
| // check subnet size | ||
| if bits, _ := ipnet.Mask.Size(); bits < 24 { | ||
| log.INFO.Println("skipping large subnet:", ipnet) | ||
| return | ||
| } | ||
|
|
||
| return IPsFromSubnet(arg) | ||
| } | ||
|
|
||
| func display(res []detect.Result) { | ||
| table := tablewriter.NewWriter(os.Stdout) | ||
| table.SetHeader([]string{"IP", "Hostname", "Task", "Details"}) | ||
| table.SetAutoMergeCells(true) | ||
| table.SetRowLine(true) | ||
|
|
||
| for _, hit := range res { | ||
| switch hit.ID { | ||
| case detect.TaskPing, detect.TaskTCP80, detect.TaskTCP502: | ||
| continue | ||
|
|
||
| default: | ||
| host := "" | ||
| hosts, err := net.LookupAddr(hit.Host) | ||
| if err == nil && len(hosts) > 0 { | ||
| host = strings.TrimSuffix(hosts[0], ".") | ||
| } | ||
|
|
||
| details := "" | ||
| if hit.Details != nil { | ||
| details = fmt.Sprintf("%+v", hit.Details) | ||
| } | ||
|
|
||
| // fmt.Printf("%-16s %-20s %-16s %s\n", hit.Host, host, hit.ID, details) | ||
| table.Append([]string{hit.Host, host, hit.ID, details}) | ||
| } | ||
| } | ||
|
|
||
| fmt.Println("") | ||
| table.Render() | ||
|
|
||
| fmt.Println(` | ||
| Please open https://github.com/andig/evcc/issues/new in your browser and copy the | ||
| results above into a new issue. Please tell us: | ||
| 1. Is the scan result correct? | ||
| 2. If not correct: please describe your hardware setup.`) | ||
| } | ||
|
|
||
| func runDetect(cmd *cobra.Command, args []string) { | ||
| util.LogLevel(viper.GetString("log"), nil) | ||
|
|
||
| println(viper.GetString("log")) | ||
| fmt.Println(` | ||
| Auto detection will now start to scan the network for available devices. | ||
| Scanning focuses on devices that are commonly used that are detectable with reasonable efforts. | ||
| On successful detection, suggestions for EVCC configuration can be made. The suggestions should simplify | ||
| configuring EVCC but are probably not sufficient for fully automatic configuration.`) | ||
| fmt.Println() | ||
|
|
||
| // args | ||
| var hosts []string | ||
| for _, arg := range args { | ||
| hosts = append(hosts, ParseHostIPNet(arg)...) | ||
| } | ||
|
|
||
| // autodetect | ||
| if len(hosts) == 0 { | ||
| ips := util.LocalIPs() | ||
| if len(ips) == 0 { | ||
| log.FATAL.Fatal("could not find ip") | ||
| } | ||
|
|
||
| myIP := ips[0] | ||
| log.INFO.Println("my ip:", myIP.IP) | ||
|
|
||
| hosts = append(hosts, "127.0.0.1") | ||
| hosts = append(hosts, IPsFromSubnet(myIP.String())...) | ||
| } | ||
|
|
||
| // magic happens here | ||
| res := detect.Work(log, 50, hosts) | ||
| display(res) | ||
| } |
Oops, something went wrong.