Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@CarlosRMontesinosIntel
CarlosRMontesinosIntel committed Jun 6, 2014
2 parents 1ee5d00 + 4cad60a commit 3be241c
Show file tree
Hide file tree
Showing 22 changed files with 2,464 additions and 1,413 deletions.
761 changes: 668 additions & 93 deletions BackEnd/BackEnd.ino
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions BackEnd/boardstate.conf
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"ssid":"ConnectAnyThing","pins":{"0":{"label":"","is_analog":false,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"1":{"label":"","is_analog":false,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"2":{"label":"","is_analog":false,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"3":{"label":"","is_analog":true,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"4":{"label":"","is_analog":false,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"5":{"label":"","is_analog":true,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"6":{"label":"","is_analog":true,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"7":{"label":"","is_analog":false,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"8":{"label":"","is_analog":false,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"9":{"label":"","is_analog":true,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"10":{"label":"","is_analog":true,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"11":{"label":"","is_analog":true,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"12":{"label":"","is_analog":false,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"13":{"label":"","is_analog":false,"is_input":false,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"14":{"label":"","is_analog":true,"is_input":true,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"15":{"label":"","is_analog":true,"is_input":true,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"16":{"label":"","is_analog":true,"is_input":true,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"17":{"label":"","is_analog":true,"is_input":true,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"18":{"label":"","is_analog":true,"is_input":true,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0},"19":{"label":"","is_analog":true,"is_input":true,"input_min":0.0,"input_max":1.0,"is_inverted":false,"is_visible":false,"value":0.0,"is_timer_on":false,"timer_value":0.0,"damping":0}},"connections":[]}
89 changes: 28 additions & 61 deletions FrontEnd/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,84 +18,51 @@

<ng-view></ng-view>

<div id="add-pins-menu"
ng-switch="s.adding_pins"
ng-class="{'hide': s.settings_pin !== null || s.adding_pins === null}">
<div id="add-pins-menu-pins-container">

<div id="add-sensors"
class="container-fluid sensors"
ng-switch-when="sensors">

<div class="row">
<div class="col-xs-12 sensors column-title">
add/remove sensors
</div>
</div>

<div class="row">
<div class="col-xs-4" ng-repeat="pin in d.sensors" pin-stub></div>
</div>
</div>

<div id="add-actuators"
class="container-fluid actuators"
ng-switch-when="actuators">

<div class="row">
<div class="col-xs-12 actuators column-title">
add/remove actuators
</div>
</div>

<div class="row">
<div class="col-xs-4" ng-repeat="pin in d.actuators" pin-stub></div>
</div>
</div>

</div>
<div id="add-pins-menu-bg-footer"
ng-class="{
'sensors': s.adding_pins === 'sensors',
'actuators': s.adding_pins === 'actuators'}"></div>
<div id="add-pins-menu-bg"></div>
</div>

<div id="footer"
ng-class="{
'container-fluid': true,
'hide': s.settings_pin !== null}">
class="container-fluid"
ng-show="$location.path() === '/' ||
$location.path() === '/play' ||
$location.path() === '/add_remove_pins/sensors' ||
$location.path() === '/add_remove_pins/actuators'">
<div class="row">
<div class="col-xs-2">
<div id="add-sensors-button"
ng-if='$location.path() === "/" && s.adding_pins !== "actuators"'
class="button square yellow-bg"
ng-click="toggle_add_pins_menu_for('sensors')">
ng-show="$location.path() === '/' ||
$location.path() === '/add_remove_pins/sensors'"
class="button square"
ng-click="$location.path() === '/add_remove_pins/sensors' ?
goBack(1) : goTo('add_remove_pins/sensors')">
+
</div>
</div>
<div class="col-xs-8">
<a id="play-button"
ng-if='$location.path() === "/" && s.adding_pins === null'
class="button wide black-bg"
href="#play">Controller Mode</a>
<a id="connect-button"
ng-if='$location.path() === "/play" && s.adding_pins === null'
class="button wide black-bg"
href="/">Configure</a>
<div id="play-button"
ng-if="$location.path() === '/'"
class="button wide"
ng-click="goTo('play');">
Controller Mode
</div>
<div id="connect-button"
ng-if="$location.path() === '/play'"
class="button wide"
ng-click="goTo('');">
Configure
</div>
</div>
<div class="col-xs-2">
<div id="add-actuators-button"
ng-if='s.adding_pins !== "sensors"'
class="button square green-bg"
ng-click="toggle_add_pins_menu_for('actuators')">
ng-hide="$location.path() === '/add_remove_pins/sensors'"
class="button square"
ng-click="$location.path() === '/add_remove_pins/actuators' ?
goBack(1) : goTo('add_remove_pins/actuators')">
+
</div>
</div>
</div>
</div>

<div id="loading" ng-class="{'hide': got_data}">
<div id="loading"
ng-hide="s.got_data">
<div id="loading-msg">
waiting for connection
</div>
Expand Down
Loading

0 comments on commit 3be241c

Please sign in to comment.