diff --git a/catalyst.go b/catalyst.go index 91f631a..667991c 100644 --- a/catalyst.go +++ b/catalyst.go @@ -40,7 +40,7 @@ func ConfigureTeamEthernet(red1, red2, red3, blue1, blue2, blue3 *Team) error { delete(oldTeamVlans, team.Id) } else { addTeamVlansCommand += fmt.Sprintf("no access-list 1%d\naccess-list 1%d permit ip "+ - "10.%d.%d.0 0.0.0.255 host %s\ninterface Vlan%d\nip address 10.%d.%d.1 255.255.255.0\n", vlan, + "10.%d.%d.0 0.0.0.255 host %s\ninterface Vlan%d\nip address 10.%d.%d.61 255.255.255.0\n", vlan, vlan, team.Id/100, team.Id%100, eventServerAddress, vlan, team.Id/100, team.Id%100) } } @@ -77,7 +77,7 @@ func getTeamVlans() (map[int]int, error) { } // Parse out the team IDs and VLANs from the config dump. - re := regexp.MustCompile("(?s)interface Vlan(\\d\\d)\\s+ip address 10\\.(\\d+)\\.(\\d+)\\.1") + re := regexp.MustCompile("(?s)interface Vlan(\\d\\d)\\s+ip address 10\\.(\\d+)\\.(\\d+)\\.61") teamVlanMatches := re.FindAllStringSubmatch(config, -1) if teamVlanMatches == nil { // There are probably no teams currently configured. diff --git a/static/css/alliance_station_display.css b/static/css/alliance_station_display.css index a45a9af..77d52a7 100644 --- a/static/css/alliance_station_display.css +++ b/static/css/alliance_station_display.css @@ -1,5 +1,4 @@ html { - cursor: none; -webkit-user-select: none; -moz-user-select: none; overflow: hidden; @@ -28,7 +27,7 @@ body { } #teamId { position: absolute; - top: 7%; + top: 0; left: 0; right: 0; margin: 0 auto; @@ -67,7 +66,7 @@ body { color: #f00; } #blueScore { - color: #00f; + color: #66f; } #logo { position: absolute; @@ -85,5 +84,5 @@ body { background-color: #00f; } [data-status=bypass] { - background-color: #999; + background-color: #666; } diff --git a/switch_config.txt b/switch_config.txt index e115201..c81a9f5 100644 --- a/switch_config.txt +++ b/switch_config.txt @@ -135,27 +135,27 @@ interface Vlan2 ip address 10.0.100.2 255.255.255.0 ! interface Vlan11 - ip address 10.0.1.1 255.255.255.0 + ip address 10.0.1.61 255.255.255.0 ip access-group 111 in ! interface Vlan12 - ip address 10.0.2.1 255.255.255.0 + ip address 10.0.2.61 255.255.255.0 ip access-group 112 in ! interface Vlan13 - ip address 10.0.3.1 255.255.255.0 + ip address 10.0.3.61 255.255.255.0 ip access-group 113 in ! interface Vlan14 - ip address 10.0.4.1 255.255.255.0 + ip address 10.0.4.61 255.255.255.0 ip access-group 114 in ! interface Vlan15 - ip address 10.0.5.1 255.255.255.0 + ip address 10.0.5.61 255.255.255.0 ip access-group 115 in ! interface Vlan16 - ip address 10.0.6.1 255.255.255.0 + ip address 10.0.6.61 255.255.255.0 ip access-group 116 in ! ip classless