diff --git a/.gitignore b/.gitignore index 631db64..ed8ebf5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -__pycache__ -node_modules/ +__pycache__ \ No newline at end of file diff --git a/config.json b/config.json deleted file mode 100644 index 077404a..0000000 --- a/config.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} \ No newline at end of file diff --git a/index.js b/index.js index 211c872..c32423e 100644 --- a/index.js +++ b/index.js @@ -1,15 +1,11 @@ import * as server from './server.js'; -import * as lights from './lights.js'; -const cfg = require('./config.json'); - -global.cfg = cfg; - -server.recv( - (res) => { - lights.parse_pattern(JSON.parse(res)); - }, - (res) => { - console.log(`error callback: ${res}`); - } +console.log(server) +server.default( + (res) => { + console.log(`callback: ${res}`); + }, + (res) => { + console.log(`error callback: ${res}`); + } ); diff --git a/lights.js b/lights.js deleted file mode 100644 index 52389cb..0000000 --- a/lights.js +++ /dev/null @@ -1,7 +0,0 @@ -import * from 'rpi-ws281x-native' - -const fade_ticks = 10; - -export function parse_pattern(pattern) { - console.log(pattern) -} \ No newline at end of file diff --git a/package.json b/package.json index dc0441d..2d193ee 100644 --- a/package.json +++ b/package.json @@ -13,8 +13,5 @@ "url": "git@ssh.gitdab.com:jane/leds" }, "author": "jane@j4.pm", - "license": "UNLICENSED", - "dependencies": { - "rpi-ws281x-native": "^1.0.3" - } + "license": "UNLICENSED" } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml deleted file mode 100644 index a4b18ca..0000000 --- a/pnpm-lock.yaml +++ /dev/null @@ -1,41 +0,0 @@ -dependencies: - eris: 0.15.1 -lockfileVersion: 5.2 -packages: - /eris/0.15.1: - dependencies: - ws: 7.4.6 - dev: false - engines: - node: '>=10.4.0' - optionalDependencies: - opusscript: 0.0.8 - tweetnacl: 1.0.3 - resolution: - integrity: sha512-IQ3BPW6OjgFoqjdh+irPOa1jFlkotk+WNu2GQQ7QAQfbzQEPZgn+F+hpOxfMUXPHOZMX4sPKLkVDkMHAssBYhw== - /opusscript/0.0.8: - dev: false - optional: true - resolution: - integrity: sha512-VSTi1aWFuCkRCVq+tx/BQ5q9fMnQ9pVZ3JU4UHKqTkf0ED3fKEPdr+gKAAl3IA2hj9rrP6iyq3hlcJq3HELtNQ== - /tweetnacl/1.0.3: - dev: false - optional: true - resolution: - integrity: sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== - /ws/7.4.6: - dev: false - engines: - node: '>=8.3.0' - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - resolution: - integrity: sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A== -specifiers: - eris: ^0.15.1 diff --git a/run.sh b/run.sh index d0c7b85..5da169d 100644 --- a/run.sh +++ b/run.sh @@ -1,2 +1,2 @@ git pull -node index.js \ No newline at end of file +python ./leds.py \ No newline at end of file diff --git a/server.js b/server.js index 6ff566b..2c50bd7 100644 --- a/server.js +++ b/server.js @@ -1,36 +1,21 @@ import * as net from 'net'; const hostname = '0.0.0.0'; -const port = 29999; +const port = 29997; -export function recv(callback, errorCallback) { - let server = new net.Server(); - server.listen(port, hostname, () => { - server.on('connection', (con) => { - console.log('connection recieved: ' + - con.remoteAddress + ":" + con.remotePort); - con.on('data', (data) => { - callback(data); - }); - con.on('close', () => { - console.log('recieved close for ' + - con.remoteAddress + ":" + con.remotePort); - con.destroy(); - }); - - server.getConnections((err, cons) => { - if (err) { - console.error(err); - } - else { - console.log(`connections: ${cons}`); - } - }) +export default function recv(callback, errorCallback) { + let server = new net.Server(); + server.listen(port, hostname, () => { + server.on('connect', ()=>{ + console.log('connection recieved') }) + server.on('data', (data) => { + callback(data) + }) + }); - server.on('error', (e) => { - server.close(); - errorCallback(e); - }); - }); + server.on('error', (e) => { + server.close(); + errorCallback(e); + }); }