Skip to content

Commit

Permalink
White-space cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
rasmartins committed Feb 24, 2013
1 parent ef13769 commit ba9cf14
Show file tree
Hide file tree
Showing 24 changed files with 711 additions and 712 deletions.
887 changes: 443 additions & 444 deletions doc/Doxygen/Style.css

Large diffs are not rendered by default.

310 changes: 155 additions & 155 deletions doc/EclipseCodeStyle.xml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion doc/EmacsCodeStyle.el
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
;;
;; (setq auto-mode-alist
;; (append '((".*dune.*/.*\\.cpp$" . dune-c++-mode)
;; (".*dune.*/.*\\.hpp$" . dune-c++-mode))
;; (".*dune.*/.*\\.hpp$" . dune-c++-mode))
;; auto-mode-alist))
;;
;; Good luck!
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/EmergencySMS.tex
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ \subsection{\secnameFlowchart}
% \includegraphics*[viewport= 147 380 409 670, scale=0.8]{figures/servopositionfault.pdf}
% \end{center}
% \caption{Servo position fault detection flowchart.}\label{fig:servoposfault}
% \end{figure}
% \end{figure}
2 changes: 1 addition & 1 deletion doc/manual/MotorCurrentFault.tex
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ \subsection{\secnameFlowchart}
\includegraphics*[viewport= 147 380 409 670, scale=0.8]{figures/motorcurrentfault.pdf}
\end{center}
\caption{Motor current fault detection flowchart.}\label{fig:motorcurrfault}
\end{figure}
\end{figure}
2 changes: 1 addition & 1 deletion doc/manual/ServoCurrentFault.tex
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ \subsection{\secnameFlowchart}
\includegraphics*[viewport= 147 325 533 670, scale=1.0]{figures/servocurrentfault.pdf}
\end{center}
\caption{Servo current fault detection flowchart.}\label{fig:servocurrfault}
\end{figure}
\end{figure}
2 changes: 1 addition & 1 deletion doc/manual/ServoPositionFault.tex
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@ \subsection{\secnameFlowchart}
\includegraphics*[viewport= 147 380 409 670, scale=0.8]{figures/servopositionfault.pdf}
\end{center}
\caption{Servo position fault detection flowchart.}\label{fig:servoposfault}
\end{figure}
\end{figure}
2 changes: 1 addition & 1 deletion doc/manual/doc.tex
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ \chapter{Fault Mechanisms}
% \bibliography{refs}


\end{document}
\end{document}
2 changes: 1 addition & 1 deletion etc/common/narrow-band-transponders.ini
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ benthos1 = 26000, 25000
benthos2 = 26000, 27000
benthos3 = 26000, 28000
benthos4 = 26000, 29000
benthos5 = 26000, 30000
benthos5 = 26000, 30000
2 changes: 1 addition & 1 deletion etc/development/evoroma.ini
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ Vehicle = lauv-seacon-4

[Transports.EvoRoma]
Enabled = Always
Entity Label = EvoRoma Server
Entity Label = EvoRoma Server
2 changes: 1 addition & 1 deletion etc/pilatus-04.ini
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,4 @@ Trace - Outgoing Messages = false
Enabled = Always
Entity Label = Logger
LSF Volume Size = 500
Transports = EulerAngles, RemoteActions
Transports = EulerAngles, RemoteActions
2 changes: 1 addition & 1 deletion src/Autonomy/TREX/Task.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# This task is for Linux and Mac OS X only.
if(NOT DUNE_OS_LINUX AND NOT DUNE_OS_DARWIN)
set(TASK_ENABLED FALSE)
endif(NOT DUNE_OS_LINUX AND NOT DUNE_OS_DARWIN)
endif(NOT DUNE_OS_LINUX AND NOT DUNE_OS_DARWIN)
14 changes: 7 additions & 7 deletions www/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
<td id="MenuBar">
<div id="Menu">
<ul>
<li id="Main" class="First"><a href="javascript:show('Main')">Main</a></li>
<li id="Sensors"><a href="javascript:show('Sensors')">Sensors</a></li>
<!-- <li id="Logs"><a href="javascript:show('Logs')">Logs</a></li> -->
<!-- <li id="Services"><a href="#">Services</a></li> -->
<li id="Power"><a href="javascript:show('Power')">Power</a></li>
<!-- <li id="Help"><a href="#">Help</a></li> -->
<li class="Static"><a href="#"><img id="ConnectionIcon" src="images/normal.png" title="Connected" alt="Connected"/></a></li>
<li id="Main" class="First"><a href="javascript:show('Main')">Main</a></li>
<li id="Sensors"><a href="javascript:show('Sensors')">Sensors</a></li>
<!-- <li id="Logs"><a href="javascript:show('Logs')">Logs</a></li> -->
<!-- <li id="Services"><a href="#">Services</a></li> -->
<li id="Power"><a href="javascript:show('Power')">Power</a></li>
<!-- <li id="Help"><a href="#">Help</a></li> -->
<li class="Static"><a href="#"><img id="ConnectionIcon" src="images/normal.png" title="Connected" alt="Connected"/></a></li>
</ul>
</div>
</td>
Expand Down
6 changes: 3 additions & 3 deletions www/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function setConnected(value)
{
icon.src = g_icons.path('normal');
icon.title = 'Connected';

}
else
{
Expand All @@ -73,7 +73,7 @@ function setConnected(value)
}

function timeoutHandler()
{
{
setConnected(false);
}

Expand Down Expand Up @@ -119,7 +119,7 @@ function handleData(text)
var msg = data.dune_messages[i];
if (msg.abbrev != 'EntityState')
continue;

data.dune_entities[msg.src_ent].state = msg.state;
data.dune_entities[msg.src_ent].description = msg.description;
}
Expand Down
10 changes: 5 additions & 5 deletions www/js/BasicSection.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ BasicSection.prototype.create = function(id, root_id)
this.m_base.id = id;
this.m_base.width = '100%';
this.m_base.className = 'Hidden';

this.m_root_id = root_id;
this.m_root = document.getElementById(root_id);
this.m_root.appendChild(this.m_base);
Expand All @@ -51,7 +51,7 @@ BasicSection.prototype.createHeader = function(label)

BasicSection.prototype.element = function()
{
return this.m_base;
return this.m_base;
};

BasicSection.prototype.resolveEntity = function(id)
Expand Down Expand Up @@ -81,7 +81,7 @@ BasicSection.prototype.getEntityStateDesc = function(msg, defval)
if ('desc' in g_data.dune_entities[msg.src_ent])
return g_data.dune_entities[msg.src_ent].desc;
}

return defval;
};

Expand All @@ -94,7 +94,7 @@ BasicSection.prototype.findMessage = function(abbrev)
if (msg.abbrev == abbrev)
return msg;
}

return null;
};

Expand All @@ -118,7 +118,7 @@ BasicSection.prototype.getEntityStateIcon = function(state)
case 5:
return g_icons.path('fatal');
}

return g_icons.path('unknown');
};

Expand Down
4 changes: 2 additions & 2 deletions www/js/Gauge.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ Gauge.prototype.create = function(root)

td.appendChild(this.m_img);
tr.appendChild(td);

this.m_value = document.createElement('td');
this.m_value.appendChild(document.createTextNode(''));
tr.appendChild(this.m_value);

var table = document.createElement('table');
table.appendChild(tr);
this.m_root.appendChild(table);
Expand Down
52 changes: 26 additions & 26 deletions www/js/HTTP.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,89 +27,89 @@

HTTP = new Object();

HTTP.m_factories =
HTTP.m_factories =
[
function()
{
return new XMLHttpRequest();
return new XMLHttpRequest();
},
function()

function()
{
return new ActiveXObject("Msxml2.XMLHTTP");
return new ActiveXObject("Msxml2.XMLHTTP");
},
function()

function()
{
return new ActiveXObject("Microsoft.XMLHTTP");
return new ActiveXObject("Microsoft.XMLHTTP");
}
];

HTTP.m_factory = null;

HTTP.newRequest = function()
HTTP.newRequest = function()
{
if (HTTP.m_factory != null)
return HTTP.m_factory();
for (var i = 0; i < HTTP.m_factories.length; i++)

for (var i = 0; i < HTTP.m_factories.length; i++)
{
try
try
{
var factory = HTTP.m_factories[i];
var request = factory();
if (request != null)
if (request != null)
{
HTTP.m_factory = factory;
return request;
}
}
catch(e)
catch(e)
{
continue;
}
}

HTTP.m_factory = function()
HTTP.m_factory = function()
{
throw new Error("XMLHttpRequest not supported");
};

HTTP.m_factory();
};

HTTP._getResponse = function(request)
HTTP._getResponse = function(request)
{
return request.responseText;
};

HTTP.get = function(url, callback, options)
HTTP.get = function(url, callback, options)
{
var request = HTTP.newRequest();
var n = 0;
var timer;
if (options.timeout)
timer = setTimeout(
function()
function()
{
request.abort();
if (options.timeoutHandler)
options.timeoutHandler(url);
},
options.timeout);

request.onreadystatechange = function()
request.onreadystatechange = function()
{
if (request.readyState == 4)
if (request.readyState == 4)
{
if (timer)
clearTimeout(timer);
if (request.status == 200)

if (request.status == 200)
{
callback(HTTP._getResponse(request), options.callback_data);
}
else
else
{
try
{
Expand All @@ -122,16 +122,16 @@ HTTP.get = function(url, callback, options)
{
if (options.errorHandler)
options.errorHandler('', '');

}
}
}
else if (options.progressHandler)
else if (options.progressHandler)
{
options.progressHandler(++n);
}
};

var target = url;
if (options.parameters)
target += "?" + HTTP.encodeFormData(options.parameters);
Expand Down
2 changes: 1 addition & 1 deletion www/js/Icons.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ Icons.prototype.load = function(label, path)

Icons.prototype.path = function(label)
{
return this.m_icons[label].src;
return this.m_icons[label].src;
};
4 changes: 2 additions & 2 deletions www/js/Logs.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Logs.prototype.createFolder = function(root, tree)
// {
// var e = this.createFile(tree[i].file);
// }

var tr = document.createElement('tr');
tr.appendChild(td);

Expand All @@ -107,7 +107,7 @@ Logs.prototype.createFolder = function(root, tree)

Logs.prototype.createFile = function(root)
{
var li = document.createElement('li');
var li = document.createElement('li');
li.appendChild(document.createTextNode(i));
ul.appendChild(li);
};
Loading

0 comments on commit ba9cf14

Please sign in to comment.