matei/zeroone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UPD: Rename nanodevices API to nanoSerialApi

Browse Source
This commit is contained in:
Robert Kossessa
2024-03-11 21:32:42 +01:00
parent 67636955ac
commit 0c117e2c76
8 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/index.ts
View File

@@ -2,7 +2,7 @@ import { app, shell, BrowserWindow, ipcMain, Menu, MenuItem } from 'electron'
import { join } from 'path'
import { electronApp, optimizer, is } from '@electron-toolkit/utils'
import icon from '../../resources/icon.png?asset'
import nanodevices from './backend/nanodevices'
import nanoSerialApi from './nanoSerialApi'
const zoomFactor = 1
const windowWidth = 1111
@@ -95,10 +95,10 @@ app.whenReady().then(() => {
optimizer.watchWindowShortcuts(window)
})
ipcMain.handle('nanodevices:list_devices', () => nanodevices.list_devices())
ipcMain.handle('nanodevices:connect', (event, deviceid) => nanodevices.connect(deviceid))
ipcMain.handle('nanodevices:disconnect', () => nanodevices.disconnect)
ipcMain.handle('nanodevices:send', (event, ...data) => nanodevices.send(data[0], data[1]))
ipcMain.handle('nanoSerialApi:list_devices', () => nanoSerialApi.list_devices())
ipcMain.handle('nanoSerialApi:connect', (event, deviceid) => nanoSerialApi.connect(deviceid))
ipcMain.handle('nanoSerialApi:disconnect', () => nanoSerialApi.disconnect)
ipcMain.handle('nanoSerialApi:send', (event, ...data) => nanoSerialApi.send(data[0], data[1]))
const mainWindow = createMainWindow()
ipcMain.on('electron:minimizeWindow', () => mainWindow.minimize())
ipcMain.on('electron:toggleMaximizeWindow', () => {
@@ -112,29 +112,29 @@ app.whenReady().then(() => {
ipcMain.on('electron:openExternal', (_event, url) => shell.openExternal(url))
ipcMain.on('electron:openDevTools', () => mainWindow.webContents.toggleDevTools())
ipcMain.on('electron:reload', () => mainWindow.webContents.reloadIgnoringCache())
nanodevices.on('nanodevices:device-attached', (deviceid, ...data) => {
nanoSerialApi.on('nanoSerialApi:device-attached', (deviceid, ...data) => {
console.log('Attached event', deviceid, data)
mainWindow.webContents.send('nanodevices:event', 'device-attached', deviceid, ...data)
mainWindow.webContents.send('nanoSerialApi:event', 'device-attached', deviceid, ...data)
})
nanodevices.on('nanodevices:device-detached', (deviceid, ...data) => {
nanoSerialApi.on('nanoSerialApi:device-detached', (deviceid, ...data) => {
console.log('Detached event', deviceid, data)
mainWindow.webContents.send('nanodevices:event', 'device-detached', deviceid, ...data)
mainWindow.webContents.send('nanoSerialApi:event', 'device-detached', deviceid, ...data)
})
nanodevices.on('nanodevices:device-error', (deviceid, ...data) => {
nanoSerialApi.on('nanoSerialApi:device-error', (deviceid, ...data) => {
console.log('Error event', deviceid, data)
mainWindow.webContents.send('nanodevices:event', 'device-error', deviceid, ...data)
mainWindow.webContents.send('nanoSerialApi:event', 'device-error', deviceid, ...data)
})
nanodevices.on('nanodevices:connected', (deviceid, ...data) => {
nanoSerialApi.on('nanoSerialApi:connected', (deviceid, ...data) => {
console.log('Connected event', deviceid, data)
mainWindow.webContents.send('nanodevices:event', 'connected', deviceid, ...data)
mainWindow.webContents.send('nanoSerialApi:event', 'connected', deviceid, ...data)
})
nanodevices.on('nanodevices:disconnected', (deviceid, ...data) => {
nanoSerialApi.on('nanoSerialApi:disconnected', (deviceid, ...data) => {
console.log('Disconnected event', deviceid, data)
mainWindow.webContents.send('nanodevices:event', 'disconnected', deviceid, ...data)
mainWindow.webContents.send('nanoSerialApi:event', 'disconnected', deviceid, ...data)
})
nanodevices.on('nanodevices:update', (deviceid, ...data) => {
nanoSerialApi.on('nanoSerialApi:update', (deviceid, ...data) => {
console.log('Update event', deviceid, data)
mainWindow.webContents.send('nanodevices:event', 'update', deviceid, ...data)
mainWindow.webContents.send('nanoSerialApi:event', 'update', deviceid, ...data)
})
const menu = new Menu()
for (const menuItem of Object.values(appMenu)) {
@@ -172,7 +172,7 @@ app.whenReady().then(() => {
Menu.setApplicationMenu(menu)
//mainWindow.webContents.openDevTools()
setInterval(() => nanodevices._list(), 1000)
setInterval(() => nanoSerialApi._list(), 1000)
app.on('activate', function () {
// On macOS it's common to re-create a window in the app when the

18
src/main/backend/nanodevices.ts → src/main/nanoSerialApi.ts
View File

@@ -7,7 +7,7 @@ const NANO_PRODUCT_ID = '1001'
const NANO_VENDOR_ID = '303A'
const NANO_BAUD_RATE = 115200
class NanoDevices extends EventEmitter {
class NanoSerialApi extends EventEmitter {
all_nano_devices: { [key: string]: PortInfo } = {}
connected_nano_devices: { [key: string]: { port: SerialPort } } = {}
@@ -25,7 +25,7 @@ class NanoDevices extends EventEmitter {
found_nano_devices.push(port.serialNumber)
if (this.all_nano_devices[port.serialNumber] === undefined) {
this.all_nano_devices[port.serialNumber] = port
this.emit('nanodevices:device-attached', port.serialNumber)
this.emit('nanoSerialApi:device-attached', port.serialNumber)
console.log('attached', port.serialNumber)
}
}
@@ -34,7 +34,7 @@ class NanoDevices extends EventEmitter {
for (const serialNumber in this.all_nano_devices) {
if (found_nano_devices.indexOf(serialNumber) === -1) {
delete this.all_nano_devices[serialNumber]
this.emit('nanodevices:device-detached', serialNumber)
this.emit('nanoSerialApi:device-detached', serialNumber)
console.log('detached', serialNumber)
}
}
@@ -53,7 +53,7 @@ class NanoDevices extends EventEmitter {
if (lines[i].length > 0) {
if (lines[i].startsWith('{'))
// if its a json object
this.emit('nanodevices:update', serialNumber, lines[i])
this.emit('nanoSerialApi:update', serialNumber, lines[i])
else console.log('Device: ' + lines[i]) // otherwise just log it
}
}
@@ -94,18 +94,18 @@ class NanoDevices extends EventEmitter {
})
port.on('error', (err) => {
// forward error to FE
this.emit('nanodevices:error', nano_device.serialNumber, err)
this.emit('nanoSerialApi:error', nano_device.serialNumber, err)
})
port.on('close', (err) => {
if (err && err.disconnected) {
// forward close to FE
this.emit('nanodevices:disconnected', nano_device.serialNumber)
this.emit('nanoSerialApi:disconnected', nano_device.serialNumber)
}
delete this.connected_nano_devices[nano_device.serialNumber!]
})
port.on('open', () => {
this.connected_nano_devices[nano_device.serialNumber!] = { port: port }
this.emit('nanodevices:connected', nano_device.serialNumber)
this.emit('nanoSerialApi:connected', nano_device.serialNumber)
resolve(nano_device.serialNumber)
})
port.on('data', (data) => {
@@ -138,6 +138,6 @@ class NanoDevices extends EventEmitter {
}
}
const nanodevices = new NanoDevices()
const nanoSerialApi = new NanoSerialApi()
export default nanodevices
export default nanoSerialApi