To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 28eb559b authored by Reto Da Forno's avatar Reto Da Forno

minor adjustments (references to 20x observers removed, email template for new users updated

parent bb4cf06e
......@@ -26,8 +26,4 @@ sensornodes=[
{node_id: 31 , x:221 , y:218},
{node_id: 32 , x:194 , y:191},
{node_id: 33 , x:71 , y:192},
{node_id: 200 , x:242 , y:532},
{node_id: 201 , x:157 , y:775},
{node_id: 202 , x:220 , y:640},
{node_id: 204 , x:144 , y:543},
];
\ No newline at end of file
];
......@@ -5,13 +5,13 @@ https://user.flocklab.ethz.ch
We strongly recommend you to walk through the tutorials that explain
how FlockLab can be used:
http://www.flocklab.ethz.ch/wiki/wiki/Public/Man/GetStarted
https://gitlab.ethz.ch/tec/public/flocklab/wikis/Index
If you have questions, please use the according Google Group:
https://groups.google.com/forum/#!forum/flocklab-users
Please do not forget to cite our papers when writing publications with
the help of FlockLab:
https://www.flocklab.ethz.ch/wiki/wiki/Public/Publications
https://dl.acm.org/citation.cfm?id=2461402
Best regards from the FlockLab team!
......@@ -103,9 +103,9 @@ $javascript = '<link rel="stylesheet" href="css/ui-lightness/jquery-ui-1.8.20.cu
<li><a href="#tabs-3">3D - Plan</a></li>
</ul>
<div id="tabs-1" style="background-color:white">
<div style="position:relative;margin-left:60px;padding:0;width:776px;height:900px;background-color:#fff">
<div id="graph-bg" style="width:776px;height:900px;z-index:1;position:absolute;background:url(pics/floormap_etz_etf.png);opacity:0.6;filter:alpha(opacity=60);"></div>
<div id="graph" style="width:776px;height:900px;z-index:2;position:absolute"></div>
<div style="position:relative;margin-left:60px;padding:0;width:776px;height:419px;background-color:#fff">
<div id="graph-bg" style="width:776px;height:419px;z-index:1;position:absolute;background:url(pics/floormap_etz_etf.png);opacity:0.6;filter:alpha(opacity=60);"></div>
<div id="graph" style="width:776px;height:419px;z-index:2;position:absolute"></div>
</div>
</div>
<div id="tabs-2" style="padding-left:10px">
......@@ -126,7 +126,7 @@ $javascript = '<link rel="stylesheet" href="css/ui-lightness/jquery-ui-1.8.20.cu
LEFT JOIN `flocklab`.`tbl_serv_tg_adapt_types` AS slot3 ON c.tg_adapt_types_fk = slot3.serv_tg_adapt_types_key
LEFT JOIN `flocklab`.`tbl_serv_tg_adapt_list` AS d ON obs.slot_4_tg_adapt_list_fk = d.serv_tg_adapt_list_key
LEFT JOIN `flocklab`.`tbl_serv_tg_adapt_types` AS slot4 ON d.tg_adapt_types_fk = slot4.serv_tg_adapt_types_key
WHERE obs.status!='disabled'
WHERE obs.status!='disabled' AND obs.status!='develop'
ORDER BY obs.observer_id
;";
$rs = mysql_query($sql) or flocklab_die('Cannot get observer information from database because: ' . mysql_error());
......
......@@ -12,13 +12,13 @@
</generalConf>
<targetConf>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033 200 201 202 204</obsIds>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033</obsIds>
<voltage>3.3</voltage>
<dbImageId>CHANGEME</dbImageId>
</targetConf>
<serialConf>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033 200 201 202 204</obsIds>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033</obsIds>
<baudrate>115200</baudrate>
<mode>ascii</mode>
</serialConf>
......
......@@ -31,22 +31,22 @@
<!-- Target configuration -->
<targetConf>
<obsIds>016 018 027 200 201 202 204</obsIds>
<targetIds>0 1 2 3 4 5 6</targetIds>
<obsIds>016 018 027</obsIds>
<targetIds>0 1 2</targetIds>
<voltage>3.3</voltage>
<embeddedImageId>ClockDrift</embeddedImageId>
</targetConf>
<!-- Serial Service configuration -->
<serialConf>
<obsIds>016 018 027 200 201 202 204</obsIds>
<obsIds>016 018 027</obsIds>
<baudrate>115200</baudrate>
<mode>pck</mode>
</serialConf>
<!-- GPIO Monitoring Service configuration -->
<gpioTracingConf>
<obsIds>016 018 027 200 201 202 204</obsIds>
<obsIds>016 018 027</obsIds>
<pinConf>
<pin>LED1</pin>
<edge>both</edge>
......
......@@ -22,8 +22,8 @@
<!-- Target configuration -->
<targetConf>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033 200 201 202 204</obsIds>
<targetIds>1 2 3 4 0 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30</targetIds>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033</obsIds>
<targetIds>1 2 3 4 0 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26</targetIds>
<voltage>3.3</voltage>
<embeddedImageId>ctp</embeddedImageId>
</targetConf>
......@@ -37,7 +37,7 @@
<!-- GPIO Monitoring Service configuration -->
<gpioTracingConf>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033 200 201 202 204</obsIds>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033</obsIds>
<pinConf>
<pin>INT1</pin>
<edge>both</edge>
......
......@@ -20,8 +20,8 @@
<!-- Target configuration -->
<targetConf>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033 200 201 202 204</obsIds>
<targetIds>1 2 3 4 0 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30</targetIds>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033</obsIds>
<targetIds>1 2 3 4 0 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26</targetIds>
<voltage>3.3</voltage>
<embeddedImageId>ctp</embeddedImageId>
</targetConf>
......@@ -36,7 +36,7 @@
<!-- GPIO Monitoring Service configuration -->
<gpioTracingConf>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033 200 201 202 204</obsIds>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033</obsIds>
<pinConf>
<pin>INT1</pin>
<edge>both</edge>
......@@ -51,7 +51,7 @@
<!-- Power Profiling Service configuration -->
<powerProfilingConf>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033 200 201 202 204</obsIds>
<obsIds>001 002 004 006 007 008 010 011 013 014 015 016 017 018 019 020 022 023 024 025 026 027 028 031 032 033</obsIds>
<profConf>
<durationMillisecs>600000</durationMillisecs>
<relativeTime>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment