Merge branch 'tmp_1' of https://github.com/RobertThz/freeboard into RobertThz-tmp_1

bug/112
Nathaniel Rowland 2015-06-02 22:46:44 -05:00
commit 1eae464258
2 changed files with 22 additions and 22 deletions

View File

@ -5,8 +5,8 @@
{
"title" : "Tilt",
"width" : 1,
"row" : "1",
"col" : "1",
"row" : { "3": 1 },
"col" : { "3": 1 },
"widgets": [
{
"type" : "pointer",
@ -43,8 +43,8 @@
{
"title" : "Buttons",
"width" : 1,
"row" : "5",
"col" : "3",
"row" : { "3": 5 },
"col" : { "3": 3 },
"widgets": [
{
"type" : "indicator",
@ -75,8 +75,8 @@
{
"title" : "Temperature",
"width" : 1,
"row" : "1",
"col" : "2",
"row" : { "3": 1 },
"col" : { "3": 2 },
"widgets": [
{
"type" : "text_widget",
@ -104,8 +104,8 @@
{
"title" : "Potentiometer",
"width" : 1,
"row" : "1",
"col" : "3",
"row" : { "3": 1 },
"col" : { "3": 3 },
"widgets": [
{
"type" : "gauge",
@ -122,8 +122,8 @@
{
"title" : "Miscellaneous",
"width" : 1,
"row" : "6",
"col" : "2",
"row" : { "3": 6 },
"col" : { "3": 2 },
"widgets": [
{
"type" : "text_widget",

View File

@ -5,8 +5,8 @@
{
"title" : "Wind",
"width" : 1,
"row" : "1",
"col" : "2",
"row" : { "3" :1 },
"col" : { "3": 2 },
"widgets": [
{
"type" : "pointer",
@ -29,8 +29,8 @@
},
{
"width" : 1,
"row" : "5",
"col" : "3",
"row" : { "3": 5},
"col" : { "3": 3},
"widgets": [
{
"type" : "text_widget",
@ -55,8 +55,8 @@
{
"title" : "Temperature",
"width" : 1,
"row" : "4",
"col" : "1",
"row" : { "3": 4 },
"col" : { "3": 1 },
"widgets": [
{
"type" : "text_widget",
@ -93,8 +93,8 @@
{
"title" : "Info",
"width" : 1,
"row" : "1",
"col" : "1",
"row" : { "3": 1 },
"col" : { "3": 1 },
"widgets": [
{
"type" : "text_widget",
@ -119,8 +119,8 @@
{
"title" : "Humidity",
"width" : 1,
"row" : "1",
"col" : "3",
"row" : { "3": 1 },
"col" : { "3": 3 },
"widgets": [
{
"type" : "gauge",
@ -136,8 +136,8 @@
{
"title" : "Pressure",
"width" : 1,
"row" : "7",
"col" : "2",
"row" : { "3": 7 },
"col" : { "3": 2 },
"widgets": [
{
"type" : "text_widget",