diff --git a/doc/source/Ohmpi_V2_00/step_n_3/a/MUX_07.jpg b/doc/source/Ohmpi_V2_00/step_n_3/a/MUX_07.jpg
index 1086d5ab36c451047701fb728d9e5f1fc37f7af8..d09ee226f2097e9dd81b9975e997b09a5a53f466 100644
Binary files a/doc/source/Ohmpi_V2_00/step_n_3/a/MUX_07.jpg and b/doc/source/Ohmpi_V2_00/step_n_3/a/MUX_07.jpg differ
diff --git a/index.html b/index.html
index 423e5591797f17d7fd9895a803029bce00cddc1d..fbed636efdff767adcc25909a358a0758b4f2af9 100644
--- a/index.html
+++ b/index.html
@@ -1,549 +1,587 @@
-<!DOCTYPE html>
-<html>
-<head>
- <meta charset="utf8"/>
- <title>OhmPi Acquisition Board</title>
- <link rel="shortcut icon" type="image/jpg" href="logo_ohmpi.jpg"/>
-
- <!-- dependencies (need to be local as no internet in AP mode)-->
- <script src="js/plotly-basic-2.8.3.min.js"></script>
- <script src="js/jquery-3.4.1.min.js"></script>
- <link type="text/css" href="css/bootstrap.min.css" rel="stylesheet">
- <!-- <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script> -->
- <!-- <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" crossorigin="anonymous"> -->
- <!-- <script src="js/danfojs/bundle.min.js"></script> -->
-</head>
-<body>
- <div class='container'>
- <h1>OhmPi Acquisition Board</h1>
- <!-- nb stacks, on-time -->
- <button id="setConfigBtn" type="button" class="btn btn-secondary" data-toggle="modal" data-target="#exampleModal">Settings</button>
- <button id='startBtn' type="button" class="btn btn-primary">Start</button>
- <button id='stopBtn' type="button" class="btn btn-warning">Stop</button>
- <!-- upload button for csv which display the table ABMN -->
- <button id="removeDataBtn" type="button" class="btn btn-danger">Clear data</button>
- <button id="getDataBtn" type="button" class="btn btn-info">Get data</button>
- <div class="form-check">
- <input id="dataRetrievalCheck" class="form-check-input" type="checkbox" value="">
- <label class="form-check-label" for="dataRetrievalCheck">
- Automaticaly get data every 1 second
- </label>
- </div>
- <div id='output'>Status: idle</div>
-
- <!-- Pseudo section -->
- <select id='surveySelect' class='custom-select'>
- </select>
- <input id="cmin" type="number" value="0"/>
- <input id="cmax" type="number" value="150"/>
- <button id="capplyBtn" type="button" class="btn btn-info">Apply</button>
- <div id="gd"></div>
- <div class="mb3 row">
- <label for="quadSelect">Quadrupole:</label>
- <div class="col-sm-10">
- <select id='quadSelect' class='custom-select'></select>
- </div>
- </div>
-
- <!-- trace figure -->
- <button id="addTraceBtn" type="button" class="btn btn-info">Add trace</button>
- <button id="removeTracesBtn" type="button" class="btn btn-info">Remove all traces</button>
- <div id="ts"></div>
-
- <!-- RS check -->
- <button id="rsBtn" type="button" class="btn btn-info">Check contact resistance</button>
- <button id="rsClearBtn" type="button" class="btn btn-info">Clear plot</button>
- <div id="rs"></div>
-
- <!-- Additional buttons -->
- <button id="downloadBtn" type="button" class="btn btn-primary">Download data</button>
- <!-- <button id="invertBtn" type="button" class="btn btn-primary">Invert</button> -->
- <a id="download"></a>
-
- <!-- Modal for configuration -->
- <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
- <div class="modal-dialog" role="document">
- <div class="modal-content">
- <div class="modal-header">
- <h5 class="modal-title" id="exampleModalLabel">OhmPi configuration</h5>
- <button type="button" class="close" data-dismiss="modal" aria-label="Close">
- <span aria-hidden="true">×</span>
- </button>
- </div>
- <div class="modal-body">
- <form>
- <div class="form-group row">
- <label for="nbElectrodes" class="col-sm-2 col-form-label">Nb electrodes</label>
- <div class="col-sm-10">
- <input type="number" class="form-control-number" id="nbElectrodes" value="64">
- </div>
- </div>
- <div class="form-group row">
- <label for="injectionDuration" class="col-sm-2 col-form-label">Injection duration [s]</label>
- <div class="col-sm-10">
- <input type="number" class="form-control-number" id="injectionDuration" value="0.2">
- </div>
- </div>
- <div class="form-group row">
- <label for="nbMeasurements" class="col-sm-2 col-form-label">Nb Measurements</label>
- <div class="col-sm-10">
- <input type="number" class="form-control-number" id="nbMeasurements" value="1">
- </div>
- </div>
- <div class="form-group row">
- <label for="sequenceDelay" class="col-sm-2 col-form-label">Sequence delay [s]</label>
- <div class="col-sm-10">
- <input type="number" class="form-control-number" id="sequenceDelay" value="100">
- </div>
- </div>
- <div class="form-group row">
- <label for="nbStack" class="col-sm-2 col-form-label">Nb stack</label>
- <div class="col-sm-10">
- <input type="number" class="form-control-number" id="nbStack" value="1">
- </div>
- </div>
- <div class="form-group row">
- <label for="sequence" class="col-sm-2 col-form-label">Sequence</label>
- <div class="col-sm-10">
- <input type="file" class="form-control" id="sequence">
- </div>
- </div>
- </form>
- </div>
- <div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
- <button id="saveConfigBtn" type="button" data-dismiss="modal" class="btn btn-primary">Save</button>
- </div>
- </div>
- </div>
- </div>
- <button id="restartBtn" type="button" class="btn btn-danger">Restart</button>
- <button id="shutdownBtn" type="button" class="btn btn-danger">Shutdown</button>
- <footer>v0.2.0</footer>
- </div>
-
- <script type="text/javascript">
- //let serverUrl = 'http://10.3.141.1:8080'
- //let serverUrl = 'http://0.0.0.0:8080'
- //let serverUrl = 'http://localhost:8080'
- let serverUrl = 'http://' + window.location.host
- console.log('serverUrl =', serverUrl)
- let output = document.getElementById('output')
- let data = {} // hold data of all surveys
- let interv = null // hold interval for automatic data retrieval
- let quads = [] // available quadrupoles for time-serie figure
- let squads = [] // selected quadrupoles for time-serie figure
-
- // useful functions
- function sendCommand(query, callback=null) {
- // dic in the form: {'command': X, ...} as JSON
- if (callback == null) {
- function callback(x) {
- console.log('default callback:', x)
- }
- }
- let xhr = new XMLHttpRequest();
- xhr.onreadystatechange = function() {
- if (this.readyState == 4) {
- if (xhr.status == 200) {
- callback(JSON.parse(xhr.response))
- }
- }
- }
- xhr.open('POST', serverUrl)
- xhr.setRequestHeader('Content-Type', 'application/json')
- xhr.send(query)
- }
-
- // start button
- function startBtnFunc() {
- sendCommand('{"command": "start"}', function(x) {
- console.log(x['status'])
- if (x['status'] == 'running') {
- output.innerHTML = 'Status: measuring...'
- }
- })
- }
- let startBtn = document.getElementById('startBtn')
- startBtn.addEventListener('click', startBtnFunc)
-
- // stop button
- function stopBtnFunc() {
- sendCommand('{"command": "stop"}', function(x) {
- output.innerHTML = 'Status: ' + x['status']
- clearInterval(interv)
- getData()
- })
- }
- let stopBtn = document.getElementById('stopBtn')
- stopBtn.addEventListener('click', stopBtnFunc)
-
- // set configuration
- function saveConfigBtnFunc() {
- // collect values from modal
- let formVals = {}
- for (let field of ['nbElectrodes', 'injectionDuration',
- 'nbMeasurements', 'sequenceDelay', 'nbStack']) {
- formVals[field] = document.getElementById(field).value
- }
- console.log(formVals)
-
- // define callback to send settigs to Pi
- function configCallback() {
- sendCommand(JSON.stringify({
- 'command': 'setConfig',
- 'config': formVals
- }), function(x) {
- console.log('setconfig:', x)
- })
- }
-
- // deal with the potential file containing the sequence
- // https://stackoverflow.com/questions/19038919/is-it-possible-to-upload-a-text-file-to-input-in-html-js
- if (!window.FileReader) {
- alert('Your browser is not supported');
- return false;
- }
- let input = document.getElementById('sequence')
- if (input.files.length) {
- const reader = new FileReader()
- reader.readAsText(input.files[0])
- reader.addEventListener('load', () => {
- formVals['sequence'] = reader.result
- console.log('file==', reader.result)
- configCallback()
- }, false)
- } else {
- console.log('no sequence uploaded')
- formVals['sequence'] = ''
- configCallback()
- }
-
-
- }
- let saveConfigBtn = document.getElementById('saveConfigBtn')
- saveConfigBtn.addEventListener('click', saveConfigBtnFunc)
-
- // make pseudo plot
- var trace = {
- x: [],
- y: [],
- mode: 'markers',
- marker: {
- size: 40,
- color: [],
- colorbar: {
- title: 'App. res. [Ohm.m]',
- cmin: 0,
- cmax: 100,
- }
- }
- }
- let layout = {
- title: 'Pseudo-section',
- yaxis: {
- title: 'Pseudo-depth',
- autorange: 'reversed'
- },
- xaxis: {
- title: 'X'
- }
-
- }
- Plotly.newPlot('gd', [trace], layout)
-
- // make time-serie plot
- let tdata = []
- let layout2 = {
- title: 'Time-serie',
- yaxis: {
- title: 'App. res. [Ohm.m]'
- },
- xaxis: {
- title: 'Sampling time'
- }
- }
- Plotly.newPlot('ts', tdata, layout2)
-
- // add trace to time-serie plot
- function addTraceBtnFunc() {
- let val = document.getElementById('quadSelect').value
- squads.push(val.split(', '))
- tdata.push({
- x: [],
- y: [],
- name: val,
- type: 'scatter'
- })
- Plotly.newPlot('ts', tdata, layout2)
- getData()
- }
- let addTraceBtn = document.getElementById('addTraceBtn')
- addTraceBtn.addEventListener('click', addTraceBtnFunc)
-
- // remove all traces from time-serie plot
- function removeTracesBtnFunc() {
- squads = []
- tdata = []
- Plotly.newPlot('ts', tdata, layout2)
- }
- let removeTracesBtn = document.getElementById('removeTracesBtn')
- removeTracesBtn.addEventListener('click', removeTracesBtnFunc)
-
- // callback function to draw the plot
- function surveySelectFunc(el) {
- let surveyName = el['target'].value
- let df = data[surveyName]
- if (df != undefined) {
- let a = df['a']
- let b = df['b']
- let m = df['m']
- let n = df['n']
- // let's assume electrodes are 1 m distance
- // compute pseudo-depth (assume no topo)
- // compute app res (assumping flat, line survey)
- let xpos = []
- let ypos = []
- let app = []
- for (let i = 0; i < a.length; i++) {
- let ab = (a[i] + b[i])/2
- let mn = (m[i] + n[i])/2
- let dist = Math.abs(ab - mn)
- xpos.push(Math.min(ab, mn) + dist/2)
- ypos.push(Math.sqrt(2)/2*dist)
- let am = Math.abs(a[i] - m[i])
- let bm = Math.abs(b[i] - m[i])
- let an = Math.abs(a[i] - n[i])
- let bn = Math.abs(a[i] - n[i])
- let K = (2*Math.PI)/((1/am)-(1/an)-(1/an)+(1/bn))
- app.push(df['rho'][i]*-K)
- }
- console.log(app)
- // update the trace and redraw the figure
- trace['x'] = xpos
- trace['y'] = ypos
- trace['marker']['color'] = app
- trace['marker']['cmax'] = document.getElementById('cmax').value
- trace['marker']['cmin'] = document.getElementById('cmin').value
- Plotly.redraw('gd')
- }
- }
- let surveySelect = document.getElementById('surveySelect')
-
- // bar chart for contact resistance
- let rsdata = []
- let rslayout = {
- title: 'Contact resistances',
- yaxis: {
- title: 'Resistance [kOhm]'
- },
- xaxis: {
- title: 'Consecutive electrodes'
- }
- }
- Plotly.newPlot('rs', rsdata, rslayout)
-
- // run RS check
- function rsBtnFunc() {
- sendCommand('{"command": "rsCheck"}', function (res) {
- // update the bar plot
- rsdata.push({
- x: res['data']['AB'],
- y: res['data']['res'],
- name: 'RS',
- type: 'bar'
- })
- Plotly.redraw('rs')
- })
- }
- let rsBtn = document.getElementById('rsBtn')
- rsBtn.addEventListener('click', rsBtnFunc)
-
- // clear RS graph
- function rsClearBtnFunc() {
- rsdata = []
- Plotly.newPlot('rs', rsdata, rslayout)
- }
- let rsClearBtn = document.getElementById('rsClearBtn')
- rsClearBtn.addEventListener('click', rsClearBtnFunc)
-
- // getData
- function getData() {
- sendCommand(JSON.stringify({
- 'command': 'getData',
- 'surveyNames': Object.keys(data).slice(0, -1)
- // last survey is often partial so we download it again
- }), function(ddic) {
- // update status
- output.innerHTML = 'Status: ' + ddic['status']
-
- // update data dic with new data
- data = { // destructuring assignement (magic! :o)
- ...data,
- ...ddic['data'] // value from second dic are preferred
- }
-
- // dropdown with number of surveys and +++
- let surveyNames = Object.keys(data).sort()
-
- // remove listener as we will replace the choices
- surveySelect.removeEventListener('change', surveySelectFunc)
- surveySelect.innerHTML = '' // clearing all child nodes
-
- // add choices again
- for (let surveyName of surveyNames) {
- let option = document.createElement('option')
- option.innerText = surveyName
- option.value = surveyName
- surveySelect.appendChild(option)
- }
-
- // listener again
- surveySelect.addEventListener('change', surveySelectFunc)
-
- // plot last one by default
- surveySelect.value = surveyNames[surveyNames.length - 1]
-
- // call the function directly
- // (as progammatically chaging the value does not trigger the event)
- surveySelectFunc({'target': surveySelect})
-
- // update list of quadrupoles if any
- if (quads.length == 0) {
- console.log('updating list of quadrupoles')
- let df = data[surveyNames[0]]
- let quadSelect = document.getElementById('quadSelect')
- quadSelect.innerHTML = ''
- for (let i = 0; i < df['a'].length; i++) {
- quad = [df['a'][i], df['b'][i], df['m'][i], df['n'][i]]
- quads.push(quad)
- let option = document.createElement('option')
- option.value = quad.join(', ')
- option.innerText = quad.join(', ')
- quadSelect.appendChild(option)
- }
- console.log('quads=', quads)
- }
-
- // update time-serie figure
- if (squads.length > 0) {
-
- // transform all surveyNames to datetime
- let xt = []
- for (surveyName of surveyNames) {
- let a = surveyName.split('_').slice(-1)[0]
- xt.push(a.slice(0, 4) + '-'
- + a.slice(4, 6) + '-'
- + a.slice(6, 8) + ' '
- + a.slice(9, 11) + ':'
- + a.slice(11, 13) + ':'
- + a.slice(13, 15))
- }
- //console.log(xt)
-
- // create one new trace per selected quadrupole
- for (let k = 0; k < squads.length; k++) {
- squad = squads[k]
- let x = []
- let y = []
- for (let i = 0; i < surveyNames.length; i++) {
- df = data[surveyNames[i]]
- for (let j = 0; j < df['a'].length; j++) {
- if (df['a'][j] == squad[0]
- && df['b'][j] == squad[1]
- && df['m'][j] == squad[2]
- && df['n'][j] == squad[3]) {
- y.push(df['rho'][j])
- x.push(xt[i])
- break
- }
- }
- }
-
- // update trace dictionnary
- tdata[k]['x'] = x
- tdata[k]['y'] = y
- }
- //console.log(tdata)
- Plotly.redraw('ts')
- }
- })
- }
- let getDataBtn = document.getElementById('getDataBtn')
- getDataBtn.addEventListener('click', getData)
-
- // apply new colorscale
- let capplyBtn = document.getElementById('capplyBtn')
- capplyBtn.addEventListener('click', function() {
- surveySelectFunc({'target': surveySelect})
- })
-
- // checkbox interaction for data download
- function dataRetrievalCheckFunc(x) {
- if (x['target'].checked == true) {
- interv = setInterval(getData, 1000) // every 5s
- } else {
- clearInterval(interv)
- }
- }
- let dataRetrievalCheck = document.getElementById('dataRetrievalCheck')
- dataRetrievalCheck.addEventListener('change', dataRetrievalCheckFunc)
-
- // remove data
- function removeDataBtnFunc() {
- sendCommand('{"command": "removeData"}',function(x) {
- data = {}
- output.innerHTML = 'Status: ' + x['status'] + ' (all data cleared)'
- console.log('all data removed')
- })
- }
- let removeDataBtn = document.getElementById('removeDataBtn')
- removeDataBtn.addEventListener('click', removeDataBtnFunc)
-
- // shutdown Pi
- function shutdownBtnFunc() {
- sendCommand('{"command": "shutdown"}', function(x) {
- console.log('shuting down...')
- })
- }
- let shutdownBtn = document.getElementById('shutdownBtn')
- shutdownBtn.addEventListener('click', shutdownBtnFunc)
-
- // restart Pi
- function restartBtnFunc() {
- sendCommand('{"command": "restart"}', function(x) {
- console.log('rebooting...')
- })
- }
- let restartBtn = document.getElementById('restartBtn')
- restartBtn.addEventListener('click', restartBtnFunc)
-
- // invert data
- // function invertBtnFunc() {
- // sendCommand('{"command": "invert"}', function(x) {
- // console.log('inversion results', x)
- // })
- // }
- // let invertBtn = document.getElementById('invertBtn')
- // invertBtn.addEventListener('click', invertBtnFunc)
-
- // download data
- function downloadBtnFunc() {
- sendCommand('{"command": "download"}', function(x) {
- let dwl = document.getElementById('download')
- dwl.setAttribute('href', serverUrl + '/data.zip')
- dwl.setAttribute('download', 'data.zip')
- dwl.click()
- })
- }
- let downloadBtn = document.getElementById('downloadBtn')
- downloadBtn.addEventListener('click', downloadBtnFunc)
-
-
- </script>
-
- <!-- Boostrap scripts (at the end of the page for faster loading time)-->
- <script src="js/bootstrap.bundle.min.js"></script>
- <!-- <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.bundle.min.js" integrity="sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf" crossorigin="anonymous"></script> -->
-</body>
-</html>
+<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf8"/>
+ <title>OhmPi Acquisition Board</title>
+ <link rel="shortcut icon" type="image/jpg" href="logo_ohmpi.jpg"/>
+
+ <!-- dependencies (need to be local as no internet in AP mode)-->
+ <script src="js/plotly-basic-2.8.3.min.js"></script>
+ <script src="js/jquery-3.4.1.min.js"></script>
+ <link type="text/css" href="css/bootstrap.min.css" rel="stylesheet">
+ <!-- <script src="https://code.jquery.com/jquery-3.4.1.min.js"></script> -->
+ <!-- <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-eOJMYsd53ii+scO/bJGFsiCZc+5NDVN2yr8+0RDqr0Ql0h+rP48ckxlpbzKgwra6" crossorigin="anonymous"> -->
+ <!-- <script src="js/danfojs/bundle.min.js"></script> -->
+</head>
+<body>
+ <div class='container'>
+ <h1>OhmPi Acquisition Board</h1>
+ <!-- nb stacks, on-time -->
+ <button id="setConfigBtn" type="button" class="btn btn-secondary" data-toggle="modal" data-target="#exampleModal">Settings</button>
+ <button id='startBtn' type="button" class="btn btn-primary">Start</button>
+ <button id='stopBtn' type="button" class="btn btn-warning">Stop</button>
+ <!-- upload button for csv which display the table ABMN -->
+ <button id="removeDataBtn" type="button" class="btn btn-danger">Clear data</button>
+ <button id="getDataBtn" type="button" class="btn btn-info">Get data</button>
+ <div class="form-check">
+ <input id="dataRetrievalCheck" class="form-check-input" type="checkbox" value="">
+ <label class="form-check-label" for="dataRetrievalCheck">
+ Automaticaly get data every 1 second
+ </label>
+ </div>
+ <div id='output'>Status: idle</div>
+
+ <!-- Pseudo section -->
+ <select id='surveySelect' class='custom-select'>
+ </select>
+ <input id="cmin" type="number" value="0"/>
+ <input id="cmax" type="number" value="150"/>
+ <button id="capplyBtn" type="button" class="btn btn-info">Apply</button>
+ <div id="gd"></div>
+ <div class="mb3 row">
+ <label for="quadSelect">Quadrupole:</label>
+ <div class="col-sm-10">
+ <select id='quadSelect' class='custom-select'></select>
+ </div>
+ </div>
+
+ <!-- trace figure -->
+ <button id="addTraceBtn" type="button" class="btn btn-info">Add trace</button>
+ <button id="removeTracesBtn" type="button" class="btn btn-info">Remove all traces</button>
+ <div id="ts"></div>
+
+ <!-- RS check -->
+ <button id="rsBtn" type="button" class="btn btn-info">Check contact resistance</button>
+ <button id="rsClearBtn" type="button" class="btn btn-info">Clear plot</button>
+ <div id="rs"></div>
+
+ <!-- Additional buttons -->
+ <button id="downloadBtn" type="button" class="btn btn-primary">Download data</button>
+ <!-- <button id="invertBtn" type="button" class="btn btn-primary">Invert</button> -->
+ <a id="download"></a>
+
+ <!-- Modal for configuration -->
+ <div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+ <div class="modal-dialog" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <h5 class="modal-title" id="exampleModalLabel">OhmPi configuration</h5>
+ <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+ <span aria-hidden="true">×</span>
+ </button>
+ </div>
+ <div class="modal-body">
+ <form>
+ <div class="form-group row">
+ <label for="nbElectrodes" class="col-sm-2 col-form-label">Nb electrodes</label>
+ <div class="col-sm-10">
+ <input type="number" class="form-control-number" id="nbElectrodes" value="64">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label for="injectionDuration" class="col-sm-2 col-form-label">Injection duration [s]</label>
+ <div class="col-sm-10">
+ <input type="number" class="form-control-number" id="injectionDuration" value="0.2">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label for="nbMeasurements" class="col-sm-2 col-form-label">Nb Measurements</label>
+ <div class="col-sm-10">
+ <input type="number" class="form-control-number" id="nbMeasurements" value="1">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label for="sequenceDelay" class="col-sm-2 col-form-label">Sequence delay [s]</label>
+ <div class="col-sm-10">
+ <input type="number" class="form-control-number" id="sequenceDelay" value="100">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label for="nbStack" class="col-sm-2 col-form-label">Nb stack</label>
+ <div class="col-sm-10">
+ <input type="number" class="form-control-number" id="nbStack" value="1">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label for="sequence" class="col-sm-2 col-form-label">Sequence</label>
+ <div class="col-sm-10">
+ <input type="file" class="form-control" id="sequence">
+ </div>
+ </div>
+ <div class="form-group row">
+ <label for="elecSpacing" class="col-sm-2 col-form-label">Electrode spacing [m]</label>
+ <div class="col-sm-10">
+ <input type="number" class="form-control" id="elecSpacing", value="1">
+ </div>
+ </div>
+ </form>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-secondary" data-dismiss="modal">Cancel</button>
+ <button id="saveConfigBtn" type="button" data-dismiss="modal" class="btn btn-primary">Save</button>
+ </div>
+ </div>
+ </div>
+ </div>
+ <button id="restartBtn" type="button" class="btn btn-danger">Restart</button>
+ <button id="shutdownBtn" type="button" class="btn btn-danger">Shutdown</button>
+ <footer>v0.2.0</footer>
+ </div>
+
+ <script type="text/javascript">
+ //let serverUrl = 'http://10.3.141.1:8080'
+ //let serverUrl = 'http://0.0.0.0:8080'
+ //let serverUrl = 'http://localhost:8080'
+ let serverUrl = 'http://' + window.location.host
+ console.log('serverUrl =', serverUrl)
+ let output = document.getElementById('output')
+ let data = {} // hold data of all surveys
+ let interv = null // hold interval for automatic data retrieval
+ let quads = [] // available quadrupoles for time-serie figure
+ let squads = [] // selected quadrupoles for time-serie figure
+ let elecSpacing = 1 // m
+
+ // useful functions
+ function sendCommand(query, callback=null) {
+ // dic in the form: {'command': X, ...} as JSON
+ if (callback == null) {
+ function callback(x) {
+ console.log('default callback:', x)
+ }
+ }
+ let xhr = new XMLHttpRequest();
+ xhr.onreadystatechange = function() {
+ if (this.readyState == 4) {
+ if (xhr.status == 200) {
+ callback(JSON.parse(xhr.response))
+ }
+ }
+ }
+ xhr.open('POST', serverUrl)
+ xhr.setRequestHeader('Content-Type', 'application/json')
+ xhr.send(query)
+ console.log('sendCommand:', query)
+ }
+
+ // start button
+ function startBtnFunc() {
+ sendCommand('{"command": "start"}', function(x) {
+ console.log(x['status'])
+ if (x['status'] == 'running') {
+ output.innerHTML = 'Status: measuring...'
+ }
+ })
+ }
+ let startBtn = document.getElementById('startBtn')
+ startBtn.addEventListener('click', startBtnFunc)
+
+ // stop button
+ function stopBtnFunc() {
+ sendCommand('{"command": "stop"}', function(x) {
+ output.innerHTML = 'Status: ' + x['status']
+ clearInterval(interv)
+ document.getElementById('dataRetrievalCheck').checked = false
+ getData()
+ })
+ }
+ let stopBtn = document.getElementById('stopBtn')
+ stopBtn.addEventListener('click', stopBtnFunc)
+
+ // set configuration
+ function saveConfigBtnFunc() {
+ // collect values from modal
+ let formVals = {}
+ for (let field of ['nbElectrodes', 'injectionDuration',
+ 'nbMeasurements', 'sequenceDelay', 'nbStack', 'elecSpacing']) {
+ formVals[field] = document.getElementById(field).value
+ }
+ console.log(formVals)
+ elecSpacing = formVals['elecSpacing']
+
+ // define callback to send settigs to Pi
+ function configCallback() {
+ sendCommand(JSON.stringify({
+ 'command': 'setConfig',
+ 'config': formVals
+ }), function(x) {
+ console.log('setconfig:', x)
+ })
+ }
+
+ // deal with the potential file containing the sequence
+ // https://stackoverflow.com/questions/19038919/is-it-possible-to-upload-a-text-file-to-input-in-html-js
+ if (!window.FileReader) {
+ alert('Your browser is not supported');
+ return false;
+ }
+ let input = document.getElementById('sequence')
+ if (input.files.length) {
+ const reader = new FileReader()
+ reader.readAsText(input.files[0])
+ reader.addEventListener('load', () => {
+ formVals['sequence'] = reader.result
+ console.log('file==', reader.result)
+ configCallback()
+ }, false)
+ } else {
+ console.log('no sequence uploaded')
+ formVals['sequence'] = ''
+ configCallback()
+ }
+
+
+ }
+ let saveConfigBtn = document.getElementById('saveConfigBtn')
+ saveConfigBtn.addEventListener('click', saveConfigBtnFunc)
+
+ // make pseudo plot
+ var trace = {}
+ let layout = {}
+ let tdata = []
+ let layout2 = {}
+ let rsdata = []
+ let rslayout = {}
+
+ // initialize all plots
+ function initPlots() {
+ trace = {
+ x: [],
+ y: [],
+ mode: 'markers',
+ marker: {
+ size: 40,
+ color: [],
+ colorbar: {
+ title: 'App. res. [Ohm.m]',
+ cmin: 0,
+ cmax: 100,
+ }
+ }
+ }
+ layout = {
+ title: 'Pseudo-section',
+ yaxis: {
+ title: 'Pseudo-depth',
+ autorange: 'reversed'
+ },
+ xaxis: {
+ title: 'X'
+ }
+
+ }
+ Plotly.newPlot('gd', [trace], layout)
+
+ // make time-serie plot
+ tdata = []
+ layout2 = {
+ title: 'Time-serie',
+ yaxis: {
+ title: 'App. res. [Ohm.m]'
+ },
+ xaxis: {
+ title: 'Sampling time'
+ }
+ }
+ Plotly.newPlot('ts', tdata, layout2)
+
+ // bar chart for contact resistance
+ rsdata = []
+ rslayout = {
+ title: 'Contact resistances',
+ yaxis: {
+ title: 'Resistance [kOhm]'
+ },
+ xaxis: {
+ title: 'Consecutive electrodes'
+ }
+ }
+ Plotly.newPlot('rs', rsdata, rslayout)
+ }
+ initPlots()
+
+ // add trace to time-serie plot
+ function addTraceBtnFunc() {
+ let val = document.getElementById('quadSelect').value
+ squads.push(val.split(', '))
+ tdata.push({
+ x: [],
+ y: [],
+ name: val,
+ type: 'scatter'
+ })
+ Plotly.newPlot('ts', tdata, layout2)
+ getData()
+ }
+ let addTraceBtn = document.getElementById('addTraceBtn')
+ addTraceBtn.addEventListener('click', addTraceBtnFunc)
+
+ // remove all traces from time-serie plot
+ function removeTracesBtnFunc() {
+ squads = []
+ tdata = []
+ Plotly.newPlot('ts', tdata, layout2)
+ }
+ let removeTracesBtn = document.getElementById('removeTracesBtn')
+ removeTracesBtn.addEventListener('click', removeTracesBtnFunc)
+
+ // callback function to draw the plot
+ function surveySelectFunc(el) {
+ let surveyName = el['target'].value
+ let df = data[surveyName]
+ if (df != undefined) {
+ // let's assume electrodes are 1 m distance
+ // compute pseudo-depth (assume no topo)
+ // compute app res (assumping flat, line survey)
+ let xpos = []
+ let ypos = []
+ let app = []
+ for (let i = 0; i < df['a'].length; i++) {
+ let a = df['a'][i]
+ let b = df['b'][i]
+ let m = df['m'][i]
+ let n = df['n'][i]
+ // let's sort the electrodes AB are the two left, MN, the two right
+ // TODO not sure this is correct, resipy code is much more complex here
+ let abmn = [a, b, m, n]
+ abmn = abmn.sort((a, b) => a - b)
+ a = abmn[0]
+ b = abmn[1]
+ m = abmn[2]
+ n = abmn[3]
+ let ab = (a + b)/2
+ let mn = (m + n)/2
+ let dist = Math.abs(ab - mn)
+ xpos.push((Math.min(ab, mn) + dist/2)*elecSpacing)
+ ypos.push((Math.sqrt(2)/2*dist)*elecSpacing)
+ let am = Math.abs(a - m)*elecSpacing
+ let bm = Math.abs(b - m)*elecSpacing
+ let an = Math.abs(a - n)*elecSpacing
+ let bn = Math.abs(a - n)*elecSpacing
+ let K = (2*Math.PI)/((1/am)-(1/an)-(1/an)+(1/bn))
+ app.push(df['rho'][i]*K)
+ }
+ console.log(app)
+ // update the trace and redraw the figure
+ trace['x'] = xpos
+ trace['y'] = ypos
+ trace['marker']['color'] = app
+ trace['marker']['cmax'] = document.getElementById('cmax').value
+ trace['marker']['cmin'] = document.getElementById('cmin').value
+ Plotly.redraw('gd')
+ }
+ }
+ let surveySelect = document.getElementById('surveySelect')
+
+
+ // run RS check
+ function rsBtnFunc() {
+ sendCommand('{"command": "rsCheck"}', function (res) {
+ // update the bar plot
+ rsdata.push({
+ x: res['data']['AB'],
+ y: res['data']['res'],
+ name: 'RS',
+ type: 'bar'
+ })
+ Plotly.redraw('rs')
+ })
+ }
+ let rsBtn = document.getElementById('rsBtn')
+ rsBtn.addEventListener('click', rsBtnFunc)
+
+ // clear RS graph
+ function rsClearBtnFunc() {
+ rsdata = []
+ Plotly.newPlot('rs', rsdata, rslayout)
+ }
+ let rsClearBtn = document.getElementById('rsClearBtn')
+ rsClearBtn.addEventListener('click', rsClearBtnFunc)
+
+ // getData
+ function getData() {
+ sendCommand(JSON.stringify({
+ 'command': 'getData',
+ 'surveyNames': Object.keys(data).slice(0, -1)
+ // last survey is often partial so we download it again
+ }), function(ddic) {
+ // update status
+ output.innerHTML = 'Status: ' + ddic['status']
+
+ // update data dic with new data
+ data = { // destructuring assignement (magic! :o)
+ ...data,
+ ...ddic['data'] // value from second dic are preferred
+ }
+
+ // dropdown with number of surveys and +++
+ let surveyNames = Object.keys(data).sort()
+
+ // remove listener as we will replace the choices
+ surveySelect.removeEventListener('change', surveySelectFunc)
+ surveySelect.innerHTML = '' // clearing all child nodes
+
+ // add choices again
+ for (let surveyName of surveyNames) {
+ let option = document.createElement('option')
+ option.innerText = surveyName
+ option.value = surveyName
+ surveySelect.appendChild(option)
+ }
+
+ // listener again
+ surveySelect.addEventListener('change', surveySelectFunc)
+
+ // plot last one by default
+ surveySelect.value = surveyNames[surveyNames.length - 1]
+
+ // call the function directly
+ // (as progammatically chaging the value does not trigger the event)
+ surveySelectFunc({'target': surveySelect})
+
+ // update list of quadrupoles if any
+ let idiff = false
+ if (data[surveyNames[0]] != undefined) {
+ idiff = quads.length != data[surveyNames[0]]['a'].length
+ }
+ //console.log('idiff=', idiff, quads.length, data[surveyNames[0]]['a'].length)
+ if (((quads.length == 0) | idiff) & (data[surveyNames[0]] != undefined)){
+ console.log('updating list of quadrupoles')
+ quads = []
+ let df = data[surveyNames[0]]
+ let quadSelect = document.getElementById('quadSelect')
+ quadSelect.innerHTML = ''
+ for (let i = 0; i < df['a'].length; i++) {
+ quad = [df['a'][i], df['b'][i], df['m'][i], df['n'][i]]
+ quads.push(quad)
+ let option = document.createElement('option')
+ option.value = quad.join(', ')
+ option.innerText = quad.join(', ')
+ quadSelect.appendChild(option)
+ }
+ console.log('quads=', quads)
+ }
+
+ // update time-serie figure
+ if (squads.length > 0) {
+
+ // transform all surveyNames to datetime
+ let xt = []
+ for (surveyName of surveyNames) {
+ let a = surveyName.split('_').slice(-1)[0]
+ xt.push(a.slice(0, 4) + '-'
+ + a.slice(4, 6) + '-'
+ + a.slice(6, 8) + ' '
+ + a.slice(9, 11) + ':'
+ + a.slice(11, 13) + ':'
+ + a.slice(13, 15))
+ }
+ //console.log(xt)
+
+ // create one new trace per selected quadrupole
+ for (let k = 0; k < squads.length; k++) {
+ squad = squads[k]
+ let x = []
+ let y = []
+ for (let i = 0; i < surveyNames.length; i++) {
+ df = data[surveyNames[i]]
+ for (let j = 0; j < df['a'].length; j++) {
+ if (df['a'][j] == squad[0]
+ && df['b'][j] == squad[1]
+ && df['m'][j] == squad[2]
+ && df['n'][j] == squad[3]) {
+ y.push(df['rho'][j])
+ x.push(xt[i])
+ break
+ }
+ }
+ }
+
+ // update trace dictionnary
+ tdata[k]['x'] = x
+ tdata[k]['y'] = y
+ }
+ //console.log(tdata)
+ Plotly.redraw('ts')
+ }
+ })
+ }
+ let getDataBtn = document.getElementById('getDataBtn')
+ getDataBtn.addEventListener('click', getData)
+
+ // apply new colorscale
+ let capplyBtn = document.getElementById('capplyBtn')
+ capplyBtn.addEventListener('click', function() {
+ surveySelectFunc({'target': surveySelect})
+ })
+
+ // checkbox interaction for data download
+ function dataRetrievalCheckFunc(x) {
+ if (x['target'].checked == true) {
+ interv = setInterval(getData, 1000) // every 1s
+ } else {
+ clearInterval(interv)
+ }
+ }
+ let dataRetrievalCheck = document.getElementById('dataRetrievalCheck')
+ dataRetrievalCheck.addEventListener('change', dataRetrievalCheckFunc)
+
+
+ // remove data
+ function removeDataBtnFunc() {
+ sendCommand('{"command": "removeData"}',function(x) {
+ data = {}
+ output.innerHTML = 'Status: ' + x['status'] + ' (all data cleared)'
+ console.log('all data removed')
+ initPlots() // reset all plots
+ })
+ }
+ let removeDataBtn = document.getElementById('removeDataBtn')
+ removeDataBtn.addEventListener('click', removeDataBtnFunc)
+
+ // shutdown Pi
+ function shutdownBtnFunc() {
+ sendCommand('{"command": "shutdown"}', function(x) {
+ console.log('shuting down...')
+ })
+ }
+ let shutdownBtn = document.getElementById('shutdownBtn')
+ shutdownBtn.addEventListener('click', shutdownBtnFunc)
+
+ // restart Pi
+ function restartBtnFunc() {
+ sendCommand('{"command": "restart"}', function(x) {
+ console.log('rebooting...')
+ })
+ }
+ let restartBtn = document.getElementById('restartBtn')
+ restartBtn.addEventListener('click', restartBtnFunc)
+
+ // invert data
+ // function invertBtnFunc() {
+ // sendCommand('{"command": "invert"}', function(x) {
+ // console.log('inversion results', x)
+ // })
+ // }
+ // let invertBtn = document.getElementById('invertBtn')
+ // invertBtn.addEventListener('click', invertBtnFunc)
+
+ // download data
+ function downloadBtnFunc() {
+ sendCommand('{"command": "download"}', function(x) {
+ let dwl = document.getElementById('download')
+ dwl.setAttribute('href', serverUrl + '/data.zip')
+ dwl.setAttribute('download', 'data.zip')
+ dwl.click()
+ })
+ }
+ let downloadBtn = document.getElementById('downloadBtn')
+ downloadBtn.addEventListener('click', downloadBtnFunc)
+
+
+ </script>
+
+ <!-- Boostrap scripts (at the end of the page for faster loading time)-->
+ <script src="js/bootstrap.bundle.min.js"></script>
+ <!-- <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.0.0-beta3/dist/js/bootstrap.bundle.min.js" integrity="sha384-JEW9xMcG8R+pH31jmWH6WWP0WintQrMb4s7ZOdauHnUtxwoG2vI5DkLtS3qm9Ekf" crossorigin="anonymous"></script> -->
+</body>
+</html>
diff --git a/ohmpi.py b/ohmpi.py
index cbbb3fcd3fe3e3326a9a241fcf6c451ce3a1e63d..5046ccd69a1f5ab26de74f9637aae1fd500c4f9b 100644
--- a/ohmpi.py
+++ b/ohmpi.py
@@ -54,7 +54,7 @@ class OhmPi(object):
sequence: 1, 2, 3, 4 is used.
"""
- def __init__(self, config=None, sequence=None, mqtt=True, on_pi=None):
+ def __init__(self, config=None, sequence=None, mqtt=False, on_pi=None):
# flags and attributes
if on_pi is None:
_, on_pi = OhmPi.get_platform()
@@ -562,12 +562,14 @@ class OhmPi(object):
current = AnalogIn(self.ads_current, ads.P0).voltage / (50 * self.r_shunt)
voltage = -AnalogIn(self.ads_voltage, ads.P0, ads.P1).voltage * 2.5
resistance = voltage / current
+ print('I: {:>10.3f} mA, V: {:>10.3f} mV, R: {:>10.3f} Ohm'.format(
+ current*1000, voltage*1000, resistance))
# compute resistance measured (= contact resistance)
resist = abs(resistance / 1000)
msg = 'Contact resistance {:s}: {:.3f} kOhm'.format(
str(quad), resist)
- print(msg)
+ #print(msg)
self.exec_logger.debug(msg)
@@ -729,6 +731,9 @@ print(current_time.strftime("%Y-%m-%d %H:%M:%S"))
# for testing
if __name__ == "__main__":
ohmpi = OhmPi(config='ohmpi_param.json')
+ #ohmpi.measure()
+ ohmpi.read_quad('breadboard.txt')
+ ohmpi.rs_check()
ohmpi.measure()
time.sleep(4)
ohmpi.stop()
diff --git a/run.sh b/run.sh
index 76b58dca433be66edff7bd1c39cb4323939ede9a..f0886f0aa8512771cecf32c7a5c4667f05e0e75c 100755
--- a/run.sh
+++ b/run.sh
@@ -1,2 +1,4 @@
+#!bin/bash
+
source ./ohmpy/bin/activate
python webserver.py
diff --git a/runOnStart.sh b/runOnStart.sh
deleted file mode 100755
index 801ecbaa9986b26597ce0e4facb98326cf3e5225..0000000000000000000000000000000000000000
--- a/runOnStart.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "# start OhmPi web interface" >> $HOME/.bashrc
-echo "(cd $HOME/OhmPi; ./run.sh)" >> $HOME/.bashrc
diff --git a/runOnStart.txt b/runOnStart.txt
new file mode 100755
index 0000000000000000000000000000000000000000..7485654252054b9fbff35fa403af4b7f4b494e98
--- /dev/null
+++ b/runOnStart.txt
@@ -0,0 +1,6 @@
+# to automatically start the webserver on start, you need to place the
+# following line just before the line with 'exit 0' in the /etc/rc.local.
+
+(cd /home/jkl/OhmPi; bash run.sh > startup.log) &
+
+
diff --git a/webserver.py b/webserver.py
index 8171a5a93a08b45a3b265488e4c334778d0cc98b..e573c07c884501cab945992b6c7a44f9a50961af 100644
--- a/webserver.py
+++ b/webserver.py
@@ -7,9 +7,9 @@ import threading
import pandas as pd
import shutil
-hostName = "raspberrypi.local" # works for AP-STA
+#hostName = "raspberrypi.local" # works for AP-STA
#hostName = "192.168.50.1" # fixed IP in AP-STA mode
-#hostName = "0.0.0.0" # for AP mode (not AP-STA)
+hostName = "0.0.0.0" # for AP mode (not AP-STA)
serverPort = 8080
# https://gist.github.com/MichaelCurrie/19394abc19abd0de4473b595c0e37a3a
@@ -17,7 +17,7 @@ serverPort = 8080
with open('ohmpi_param.json') as json_file:
pardict = json.load(json_file)
-ohmpi = OhmPi(pardict, sequence='breadboard.txt')
+ohmpi = OhmPi(pardict, sequence='dd.txt')
#ohmpi = OhmPi(pardict, sequence='dd16s0no8.txt')