Skip to content
This repository has been archived by the owner on Feb 8, 2019. It is now read-only.

Commit

Permalink
Merge pull request #149 from gmfc/v1-1-0
Browse files Browse the repository at this point in the history
V1 1 0
  • Loading branch information
gmfc committed Mar 3, 2017
2 parents 935ad22 + 32493bd commit bbd3d17
Show file tree
Hide file tree
Showing 25 changed files with 310 additions and 136 deletions.
42 changes: 42 additions & 0 deletions HELP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Manual

1) Utilização da plataforma
2) Medições
3) Resolução de erros

## Utilização da plataforma
A plataforma de força se comunica com o software via USB. Para estabelecer uma conexão basta conectar o cabo USB na plataforma e no computador com o software instalado. Note que para que o computador possa reconhecer a plataforma, os drivers devem estar instalados.

Para obter medições válidas, a plataforma deve estar devidamente nivelada, o que pode ser feito com a ajuda de sua base ajustável. Basta rosquear os pés da plataforma até que a mesma esteja completamente em contato com o chão e devidamente nivelada.

## Medições

O software fornece dois modos de medição.
### Visualização em tempo real
É usado para visualizar o centro de pressão em tempo real. Este modo não gravará dados, nem fará medidas, somente mostrara o centro de pressão e sua trajetória.

Para usa-lo:
1) Selecione o modo no menu do software.
2) Com a plataforma conectada ao computador, clique no botão conectar.
3) A plataforma começara a transmitir os dados e estará pronta para uso.

É importante que não se suba na plataforma enquanto a mesma não estiver conectada ao software (Botão de conexão ficará verde quando a plataforma estiver pronta)

### Relatório
É usado para se obter um relatório completo com uma análise detalhada do centro de pressão e sua trajetória em função do tempo.

Para usa-lo:
1) Selecione o modo no menu do software.
2) Com a plataforma conectada ao computador, clique no botão conectar.
3) Especifique o tempo de medição (em segundos) desejado.
4) A plataforma estará pronta para o uso. Aperte a seta verde para iniciar a medição.
5) Após o término da medição, o relatório sera mostrado na tela.
6) Para salvar os dados, selecione a opção de gravação desejada, e o local e nome do arquivo a ser gravado.

É importante que não se suba na plataforma enquanto a mesma não estiver conectada ao software (Botão de conexão ficará verde quando a plataforma estiver pronta)

## Resolução de erros

Caso aja algum erro com durante o uso da plataforma, o software irá diagnostica-lo. Siga as instruções dadas pelo botão de conexão.

Se o erro persistir, reconecte a plataforma e refaça a medição. Caso o erro ainda persisti, desconecte a plataforma e reinicie o software.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[![Build Status](https://travis-ci.org/gmfc/pfnw.svg?branch=master)](https://travis-ci.org/gmfc/pfnw) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/2ca31189b4db4851afb4b411783272d3)](https://www.codacy.com/app/gabriel-mfcorreia/pfnw?utm_source=github.com&utm_medium=referral&utm_content=gmfc/pfnw&utm_campaign=Badge_Grade) [![Dependencies](https://david-dm.org/gmfc/pfnw.svg)](https://david-dm.org)
[![Build Status](https://travis-ci.org/gmfc/pfnw.svg?branch=master)](https://travis-ci.org/gmfc/pfnw) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/2ca31189b4db4851afb4b411783272d3)](https://www.codacy.com/app/gabriel-mfcorreia/pfnw?utm_source=github.com&utm_medium=referral&utm_content=gmfc/pfnw&utm_campaign=Badge_Grade) [![Dependencies](https://david-dm.org/gmfc/pfnw.svg)](https://david-dm.org/gmfc/pfnw)

# pfnw

Expand Down
8 changes: 4 additions & 4 deletions docs/PlatData.html
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ <h4 class="name" id="PlatData"><span class="type-signature"></span>new PlatData(

<div class="description">
<p>Classe responsável por administrar e receber os dados da plataforma.
Faz todos os cálculos com os dados da plataforma e gera os e o relatorio</p>
Faz todos os cálculos com os dados da plataforma e gera relatórios.</p>
</div>


Expand Down Expand Up @@ -3793,7 +3793,7 @@ <h4 class="name" id="splitData"><span class="type-signature"></span>splitData(da


<div class="description">
<p>Recebe uma string formatada e splita a mesma em parametros.
<p>Recebe uma string formatada e separa a mesma em parametros.
Aplica os filtros.</p>
</div>

Expand Down Expand Up @@ -4009,9 +4009,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:27 pm
on March 3rd 2017, 10:47:22 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/SerialPort.html
Original file line number Diff line number Diff line change
Expand Up @@ -252,9 +252,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:27 pm
on March 3rd 2017, 10:47:22 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/classes.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:21 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/external-browser-serialport.html
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:21 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/external-jQuery.html
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:21 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/external-simple-statistics.html
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:21 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/externals.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:21 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/global.html
Original file line number Diff line number Diff line change
Expand Up @@ -278,9 +278,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:21 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
6 changes: 3 additions & 3 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@


<section class="readme-section">
<article><p><a href="https://travis-ci.org/gmfc/pfnw"><img src="https://travis-ci.org/gmfc/pfnw.svg?branch=master" alt="Build Status"></a> <a href="https://www.codacy.com/app/gabriel-mfcorreia/pfnw?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=gmfc/pfnw&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/2ca31189b4db4851afb4b411783272d3" alt="Codacy Badge"></a> <a href="https://david-dm.org"><img src="https://david-dm.org/gmfc/pfnw.svg" alt="Dependencies"></a></p>
<article><p><a href="https://travis-ci.org/gmfc/pfnw"><img src="https://travis-ci.org/gmfc/pfnw.svg?branch=master" alt="Build Status"></a> <a href="https://www.codacy.com/app/gabriel-mfcorreia/pfnw?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=gmfc/pfnw&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/2ca31189b4db4851afb4b411783272d3" alt="Codacy Badge"></a> <a href="https://david-dm.org/gmfc/pfnw"><img src="https://david-dm.org/gmfc/pfnw.svg" alt="Dependencies"></a></p>
<h1>pfnw</h1><p>Plataforma de Força NW, é um projeto desenvolvido pela Fábrica de Software Mackenzie com o objetivo de criar uma solução para medição e análise ortopédica baseada em Centro de Pressão. O Projeto consiste de um Software controlador feito em NODE e NW (antigo Node Webkit), e uma plataforma física controlada por um Arduino.</p>
<p>Neste repositório encontraras o código do software controlador, e o código do Arduino.</p>
<p><img src="https://gmfc.github.io/pfnw/screens/1.png" alt="img1"></p>
Expand Down Expand Up @@ -177,9 +177,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:21 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
7 changes: 4 additions & 3 deletions docs/module-DebugController.html
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,8 @@ <h4 class="name" id="~findPlat"><span class="type-signature">&lt;inner> </span>f


<div class="description">
<p>Reseta, e procura pela plataforma</p>
<p>Reseta, e procura pela plataforma
Mostra portas encontradas, criando uma lista</p>
</div>


Expand Down Expand Up @@ -1291,9 +1292,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:21 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/module-RealTimeController.html
Original file line number Diff line number Diff line change
Expand Up @@ -1338,9 +1338,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:21 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
6 changes: 3 additions & 3 deletions docs/module-ReportController.html
Original file line number Diff line number Diff line change
Expand Up @@ -800,7 +800,7 @@ <h4 id="~SerialPort"><span class="type-signature">&lt;inner> </span>SerialPort<s
<dd>

<div class="description">
<p>Referência estática ao construtor SerialPort</p>
<p>Refêrencia estática ao construtor SerialPort</p>
</div>


Expand Down Expand Up @@ -2587,9 +2587,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:22 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
4 changes: 2 additions & 2 deletions docs/modules.list.html
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ <h4 class="modal-title">Search results</h4>


<span class="jsdoc-message">
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.2</a>
Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>

on January 10th 2017, 3:30:26 pm
on March 3rd 2017, 10:47:21 am

using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/quicksearch.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pfnwj5",
"version": "1.0.5",
"version": "1.1.0",
"description": "plataforma de força.",
"main": "./ui/index.html",
"scripts": {
Expand Down
19 changes: 10 additions & 9 deletions src/DebugController.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ function connect(name) {

/**
* Reseta, e procura pela plataforma
* Mostra portas encontradas, criando uma lista
* @returns {void}
*/
function findPlat() {
Expand All @@ -160,19 +161,19 @@ function findPlat() {
$('#ports').empty();
ports.forEach(function(port) {
counter++;
$('#ports').append('<div class="ui divider"></div>');
$('#ports').append('<p>comName: ' + port.comName + ' </p>');
$('#ports').append('<p>manufacturer: ' + port.manufacturer + ' </p>');
$('#ports').append('<p>serialNumber: ' + port.serialNumber + ' </p>');
$('#ports').append('<p>pnpId: ' + port.pnpId + ' </p>');
$('#ports').append('<p>locationId: ' + port.locationId + ' </p>');
$('#ports').append('<p>vendorId: ' + port.vendorId + ' </p>');
$('#ports').append('<p>productId: ' + port.productId + ' </p>');

$('#ports').append('<div class="eight wide column"><div class="ui raised segments" id="portN' + counter + '"></div></div>');
$('#portN' + counter).append('<div class="ui segment" id="namePortN' + counter + '"><p>manufacturer: ' + port.manufacturer + ' </p></div>');
$('#portN' + counter).append('<div class="ui blue secondary segment"><p>comName: ' + port.comName + ' </p></div>');
$('#portN' + counter).append('<div class="ui secondary segment"><p>serialNumber: ' + port.serialNumber + ' </p></div>');
$('#portN' + counter).append('<div class="ui secondary segment"><p>pnpId: ' + port.pnpId + ' </p></div>');
$('#portN' + counter).append('<div class="ui secondary segment"><p>locationId: ' + port.locationId + ' </p></div>');
$('#portN' + counter).append('<div class="ui secondary segment"><p>vendorId: ' + port.vendorId + ' </p></div>');
$('#portN' + counter).append('<div class="ui secondary segment"><p>productId: ' + port.productId + ' </p></div>');

if (port.manufacturer.indexOf('Arduino') !== -1 && !found) {
connect(port.comName);
found = true;
$('#namePortN' + counter).addClass("blue message");
}
if (counter === ports.length && !found) {
btERR('Porta não encontrada!');
Expand Down
36 changes: 21 additions & 15 deletions ui/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@
margin-right: 1.5em;
}

.ui.menu {
border-radius: 0;
}

.main.container {
margin-top: 7em;
margin-top: 20px;
}

.ui.menu .item {
Expand All @@ -27,27 +31,29 @@
</head>

<body>

<!-- MENU -->
<div class="ui inverted menu">
<div class="ui container">
<a href="./index.html" class="header item">
<img src="./img/logo.svg" style="margin-right: 42px;" alt="" /> Menu
</a>
<div class="ui simple dropdown item">
Medições <i class="dropdown icon"></i>
<div class="menu">
<a class="item" href="./realtime.html"><i class="refresh icon"></i>Visualização em tempo real</a>
<a class="item" href="./medicao.html"><i class="file text outline icon"></i> Gerar Relatório</a>
<div class="divider"></div>
<div class="header">Plataforma</div>
<a class="item" href="debug.html"><i class="usb icon"></i>Teste de conexão</a>
<a class="item" href="./medicao.html"><i class="file text outline icon"></i>Gerar relatório</a>
<a class="item" href="./realtime.html"><i class="unhide icon"></i>Visualização em tempo real</a>

<div class="right menu">
<div class="ui simple dropdown item">
Informações <i class="dropdown icon"></i>
<div class="menu">
<a href="./about.html" class="active item"><i class="info icon"></i>Sobre</a>
<a href="./help.html" class="item"><i class="help icon"></i>Ajuda</a>
<a class="item" href="debug.html"><i class="usb icon"></i>Teste de conexão</a>
</div>
</div>
</div>
<a href="./about.html" class="item"><i class="info icon"></i>Sobre</a>
</div>
</div>

<div class="ui main container">
<h1>Sobre o programa</h1>
<div class="ui segment green">
<h4>Versão do programa: <span id="appver">??</span></h4>
<hr />
Expand All @@ -58,9 +64,9 @@ <h4>Versão chromium: <span id="chromiumver">??</span></h4>
</div>
<div class="ui container" style="padding-bottom:25px;">
<p>
<a href="https://travis-ci.org/gmfc/pfnw"><img src="https://travis-ci.org/gmfc/pfnw.svg?branch=master" alt="Build Status" /></a>
<a href="https://www.codacy.com/app/gabriel-mfcorreia/pfnw?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=gmfc/pfnw&amp;utm_campaign=Badge_Grade"><img src="https://api.codacy.com/project/badge/Grade/2ca31189b4db4851afb4b411783272d3" alt="Codacy Badge" /></a>
<a href="https://david-dm.org"><img src="https://david-dm.org/gmfc/pfnw.svg" alt="Dependencies" /></a>
<a href="#"><img src="https://travis-ci.org/gmfc/pfnw.svg?branch=master" alt="Build Status" /></a>
<a href="#"><img src="https://api.codacy.com/project/badge/Grade/2ca31189b4db4851afb4b411783272d3" alt="Codacy Badge" /></a>
<a href="#"><img src="https://david-dm.org/gmfc/pfnw.svg" alt="Dependencies" /></a>
</p>
<h1 id="pfnw">pfnw</h1>
<p>Plataforma de Força NW, é um projeto desenvolvido pela Fábrica de Software Mackenzie com o objetivo de criar uma solução para medição e análise ortopédica baseada em Centro de Pressão. O Projeto consiste de um Software controlador feito em
Expand Down

0 comments on commit bbd3d17

Please sign in to comment.