Skip to content
Snippets Groups Projects
Commit 3e5fc2c3 authored by Neil Gershenfeld's avatar Neil Gershenfeld
Browse files

add py serial module, ready for testing

parent 23f85f19
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
files.html
+ 3
− 0
View file @ 3e5fc2c3
......@@ -186,6 +186,7 @@
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./modules/socket/server/echo'>echo</a><br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./modules/socket/server/print'>print</a><br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./modules/socket/server/serial'>serial</a><br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./modules/socket/server/serialpy'>serialpy</a><br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./modules/socket/server/udp'>udp</a><br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./modules/socket/websocket'>websocket</a><br>
<i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;string</i><br>
......@@ -262,6 +263,8 @@
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./programs/processes/mill/raster/2D'>2D</a><br>
<i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;variable</i><br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./programs/variable/text%20variables'>text variables</a><br>
<i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;py</i><br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./py/serialserver.py'>serialserver.py</a><br>
<i>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;scripts</i><br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./scripts/start%20mods%20server'>start mods server</a><br>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href='./scripts/stop%20mods%20server'>stop mods server</a><br>
......
modules/index.js
+ 1
− 0
View file @ 3e5fc2c3
......@@ -155,6 +155,7 @@ module_menu('      device','modules/socket/server/device')
module_menu(' echo','modules/socket/server/echo')
module_menu(' print','modules/socket/server/print')
module_menu(' serial','modules/socket/server/serial')
module_menu(' serialpy','modules/socket/server/serialpy')
module_menu(' udp','modules/socket/server/udp')
module_menu(' websocket','modules/socket/websocket')
module_label('string')
......
modules/socket/server/serialpy 0 → 100644
+ 318
− 0
View file @ 3e5fc2c3
//
// Python serial server module
//
// Neil Gershenfeld
// 1/17/20
//
// This work may be reproduced, modified, distributed, performed, and
// displayed for any purpose, but must acknowledge the mods
// project. Copyright is retained and must be preserved. The work is
// provided as is; no warranty is provided, and users accept all
// liability.
//
// closure
//
(function(){
//
// module globals
//
var mod = {}
//
// name
//
var name = 'WebSocket Python serial'
//
// initialization
//
var init = function() {
mod.address.value = '127.0.0.1'
mod.port.value = 1234
mod.device.value = '/dev/ttyUSB0'
mod.baud.value = 115200
mod.flow_dsrdtr.checked = true
mod.socket = null
socket_open()
}
//
// inputs
//
var inputs = {
transmit:{type:'string',
event:function(evt){
serial_send_string(evt.detail)
}
},
file:{type:'object',
event:function(evt){
if (evt.detail.type == 'command') {
mod.command = evt.detail
socket_send(JSON.stringify(mod.command))
}
else if (evt.detail.type == 'file') {
mod.job = evt.detail
mod.job.type = 'file'
mod.label.nodeValue = 'send file'
mod.labelspan.style.fontWeight = 'bold'
}
}}}
//
// outputs
//
var outputs = {
receive:{type:'character',
event:function(str){
mods.output(mod,'receive',str)}}}
//
//
// interface
//
var interface = function(div){
mod.div = div
//
// server
//
var a = document.createElement('a')
a.href = './py/serialserver.py'
a.innerHTML = 'serialserver.py:'
a.target = '_blank'
div.appendChild(a)
div.appendChild(document.createElement('br'))
//
// open/close
//
var btn = document.createElement('button')
btn.style.margin = 1
btn.appendChild(document.createTextNode('open'))
btn.addEventListener('click',function() {
socket_open()
})
div.appendChild(btn)
var btn = document.createElement('button')
btn.style.margin = 1
btn.appendChild(document.createTextNode('close'))
btn.addEventListener('click',function() {
socket_close()
})
div.appendChild(btn)
div.appendChild(document.createElement('br'))
//
// address
//
div.appendChild(document.createTextNode('address: '))
input = document.createElement('input')
input.type = 'text'
input.size = 10
div.appendChild(input)
mod.address = input
div.appendChild(document.createElement('br'))
//
// port
//
div.appendChild(document.createTextNode('\u00a0\u00a0\u00a0\u00a0\u00a0port: '))
var input = document.createElement('input')
input.type = 'text'
input.size = 10
div.appendChild(input)
mod.port = input
div.appendChild(document.createElement('br'))
//
// status
//
div.appendChild(document.createTextNode('\u00a0\u00a0status: '))
var input = document.createElement('input')
input.type = 'text'
input.size = 10
div.appendChild(input)
mod.status = input
div.appendChild(document.createElement('br'))
//
// serial
//
div.appendChild(document.createTextNode('serial device:'))
div.appendChild(document.createElement('br'))
//
// open/close
//
var btn = document.createElement('button')
btn.style.margin = 1
btn.appendChild(document.createTextNode('open'))
btn.addEventListener('click',function() {
serial_open()
})
div.appendChild(btn)
var btn = document.createElement('button')
btn.style.margin = 1
btn.appendChild(document.createTextNode('close'))
btn.addEventListener('click',function() {
serial_close()
})
div.appendChild(btn)
div.appendChild(document.createElement('br'))
//
// device
//
var input = document.createElement('input')
input.type = 'text'
input.size = 10
div.appendChild(input)
mod.device = input
div.appendChild(document.createElement('br'))
//
// baud rate
//
div.appendChild(document.createTextNode('baud rate:'))
div.appendChild(document.createElement('br'))
var input = document.createElement('input')
input.type = 'text'
input.size = 10
div.appendChild(input)
mod.baud = input
div.appendChild(document.createElement('br'))
//
// flow control
//
div.appendChild(document.createTextNode('flow control:'))
div.appendChild(document.createElement('br'))
var input = document.createElement('input')
input.type = 'radio'
input.name = mod.div.id+'flow'
input.id = mod.div.id+'flow_none'
div.appendChild(input)
mod.flow_none = input
div.appendChild(document.createTextNode('none\u00A0\u00A0\u00A0\u00A0'))
div.appendChild(document.createElement('br'))
var input = document.createElement('input')
input.type = 'radio'
input.name = mod.div.id+'flow'
input.id = mod.div.id+'flow_rtscts'
div.appendChild(input)
mod.flow_rtscts = input
div.appendChild(document.createTextNode('RTSCTS'))
div.appendChild(document.createElement('br'))
var input = document.createElement('input')
input.type = 'radio'
input.name = mod.div.id+'flow'
input.id = mod.div.id+'flow_dsrdtr'
div.appendChild(input)
mod.flow_dsrdtr = input
div.appendChild(document.createTextNode('DSRDTR'))
div.appendChild(document.createElement('br'))
//
// file button
//
var btn = document.createElement('button')
btn.style.padding = mods.ui.padding
btn.style.margin = 1
var span = document.createElement('span')
var text = document.createTextNode('waiting for file')
mod.label = text
span.appendChild(text)
mod.labelspan = span
btn.appendChild(span)
btn.addEventListener('click',function(){
if (mod.socket == null) {
mod.status.value = "can't send, not open"
}
else if (mod.label.nodeValue == 'send file') {
socket_send(JSON.stringify(mod.job))
mod.label.nodeValue = 'cancel'
}
else if (mod.label.nodeValue == 'cancel') {
mod.command = {}
mod.command.type = 'cancel'
socket_send(JSON.stringify(mod.command))
}
})
div.appendChild(btn)
}
//
// local functions
//
function socket_open() {
var url = "ws://"+mod.address.value+':'+mod.port.value
mod.socket = new WebSocket(url)
mod.socket.onopen = function(event) {
mod.status.value = "socket opened"
serial_open()
}
mod.socket.onerror = function(event) {
mod.status.value = "can not open"
mod.socket = null
}
mod.socket.onmessage = function(event) {
mod.status.value = event.data
outputs.receive.event(event.data)
if ((event.data == 'done') || (event.data == 'cancel') || (event.data.slice(0,5) == 'error')) {
mod.label.nodeValue = 'waiting for file'
mod.labelspan.style.fontWeight = 'normal'
}
}
}
function socket_close() {
mod.socket.close()
mod.status.value = "socket closed"
mod.socket = null
}
function socket_send(msg) {
if (mod.socket != null) {
mod.status.value = "send"
mod.socket.send(msg)
}
else {
mod.status.value = "can't send, not open"
}
}
function serial_open() {
if (mod.socket == null) {
mod.status.value = "socket not open"
}
else {
var msg = {}
msg.type = 'open'
msg.device = mod.device.value
msg.baud = mod.baud.value
if (mod.flow_none.checked)
msg.flow = 'none'
else if (mod.flow_rtscts.checked)
msg.flow = 'rtscts'
else if (mod.flow_dsrdtr.checked)
msg.flow = 'dsrdtr'
mod.socket.send(JSON.stringify(msg))
}
}
function serial_close() {
if (mod.socket == null) {
mod.status.value = "socket not open"
}
else {
var msg = {}
msg.type = 'close'
msg.device = mod.device.value
mod.socket.send(JSON.stringify(msg))
}
}
function serial_send_string(str) {
if (mod.socket == null) {
mod.status.value = "socket not open"
}
else {
var msg = {}
msg.type = 'string'
msg.string = str
mod.socket.send(JSON.stringify(msg))
mod.status.value = 'transmit'
}
}
//
// return values
//
return ({
mod:mod,
name:name,
init:init,
inputs:inputs,
outputs:outputs,
interface:interface
})
}())
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment