Skip to content

Commit 64cec44

Browse files
CarlosRMontesinosIntelCarlosRMontesinosIntel
committed
Merge branch 'develop'
2 parents b547017 + 205d055 commit 64cec44

3 files changed

Lines changed: 81 additions & 2 deletions

File tree

‎Documents/BackEndFlowChart.pdf‎

201 KB
Binary file not shown.

‎FrontEnd/cat.html‎

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<!DOCTYPE html>
2+
<html lang="en" ng-app="ConnectAnything">
3+
<head>
4+
<title>Connect Anything</title>
5+
<link rel="shortcut icon" href="favicon.png" type="image/png"/>
6+
<script src="static/js/jquery.min.js"></script>
7+
<script src="static/js/underscore-min.js"></script>
8+
<script src="static/js/d3.min.js"></script>
9+
<script src="static/js/angular.min.js"></script>
10+
<script src="static/js/angular-route.min.js"></script>
11+
<script src="static/js/app.js"></script>
12+
13+
<link rel="stylesheet" href="static/css/bootstrap.min.css">
14+
<link rel="stylesheet" href="static/css/app.css">
15+
</head>
16+
<body>
17+
<div id="app-container" ng-controller="AppCtrl">
18+
19+
<ng-view></ng-view>
20+
21+
<div id="footer"
22+
class="container-fluid"
23+
ng-show="$location.path() === '/' ||
24+
$location.path() === '/play' ||
25+
$location.path() === '/add_remove_pins/sensors' ||
26+
$location.path() === '/add_remove_pins/actuators'">
27+
<div class="row">
28+
<div class="col-xs-2">
29+
<div id="add-sensors-button"
30+
ng-show="$location.path() === '/' ||
31+
$location.path() === '/add_remove_pins/sensors'"
32+
class="button square"
33+
ng-click="$location.path() === '/add_remove_pins/sensors' ?
34+
goBack(1) : goTo('add_remove_pins/sensors')">
35+
+
36+
</div>
37+
</div>
38+
<div class="col-xs-8">
39+
<div id="play-button"
40+
ng-if="$location.path() === '/'"
41+
class="button wide"
42+
ng-click="goTo('play');">
43+
Controller Mode
44+
</div>
45+
<div id="connect-button"
46+
ng-if="$location.path() === '/play'"
47+
class="button wide"
48+
ng-click="goTo('');">
49+
Configure
50+
</div>
51+
</div>
52+
<div class="col-xs-2">
53+
<div id="add-actuators-button"
54+
ng-hide="$location.path() === '/add_remove_pins/sensors'"
55+
class="button square"
56+
ng-click="$location.path() === '/add_remove_pins/actuators' ?
57+
goBack(1) : goTo('add_remove_pins/actuators')">
58+
+
59+
</div>
60+
</div>
61+
</div>
62+
</div>
63+
64+
<div id="loading"
65+
ng-hide="s.got_data">
66+
<div id="loading-msg">
67+
waiting for connection
68+
</div>
69+
</div>
70+
71+
</div>
72+
</body>
73+
</html>

‎README.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ConnectAnyThing is an easy tool for real-time electronic tinkering on Galileo us
99

1010
1) Put the ConnectAnyThing software onto a Galileo’s SD card, and power on.
1111

12-
2) Galileo broadcasts a Wi-Fi network called “ConnectAnyThing.” Join with your mobile device.
12+
2) Galileo broadcasts a Wi-Fi network called “ConnectAnyThing_\<last 5 digits of MAC address\>, ex: ConnectAnyThing_16afb.” Join with your mobile device.
1313

1414
3) Open a web browser on your device, go to "cat.com". The webpage lets you read inputs and control outputs in real-time from your mobile device.
1515

@@ -46,6 +46,7 @@ Sorin Blebea <sorin.blebea@intel.com><br />
4646
Sweta Patel <sweta.patel@intel.com><br />
4747
Adam Pasztory <adampasz@gmail.com><br />
4848
Alex T <alext.mkrs@gmail.com><br />
49+
Steve Sutton <steve_s1@ntlworld.com><br />
4950

5051
Our platform is a simplified version of the [LYT project]( https://github.com/secondstory/LYT ) developed by [Second Story] ( http://www.secondstory.com/ ).
5152

@@ -99,7 +100,7 @@ GEN2:
99100

100101
7) Put the Micro SD card in the Galileo board and power it up. **NOTE:** It could take up to 3 minutes for the board to boot-up.
101102

102-
8) On your mobile device or computer, connect to the "ConnectAnyThing" network. **NOTE:** If you don't see the network on your device, make sure your Galileo board has [firmware version 782 or above] ( https://communities.intel.com/docs/DOC-21838 ).
103+
8) On your mobile device or computer, connect to the "ConnectAnyThing_XXXXX" network, where XXXXX = last 5 MAC address digits of the physical board. **NOTE:** If you don't see the network on your device, make sure your Galileo board has [firmware version 782 or above] ( https://communities.intel.com/docs/DOC-21838 ).
103104

104105
9) Start Chrome (34+) on your device, and in the address bar, type either: "cat", "cat.com", or "192.168.0.10".
105106

@@ -112,6 +113,11 @@ We have created a Tinkering Kit with sensors, actuators, and other accessories p
112113

113114
## Release Notes
114115

116+
### Rev 0.2.4
117+
* Fixed iPhone connectivity issue.
118+
* Fixed Chrome 37+ compatibility issue.
119+
* Added automatic unique SSID generator (SSID = ConnectAnyThing_XXXXX, where XXXXX = last 5 MAC address digits).
120+
115121
### Rev 0.2.3
116122
* Compatible only with Galileo GEN2.
117123
* Servo control is enabled.

0 commit comments

Comments
 (0)