16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

List of devices looks strange on laptop. Attempt at fix here

This commit is contained in:
Matt McWilliams 2024-04-06 20:10:14 -04:00
parent da735779b4
commit 2779258111
10 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/data/cfg.json
View File

@ -1,5 +1,5 @@
{
"version": "1.8.98",
"version": "1.8.99",
"ext_port": 1111,
"profiles": {
"mcopy": {

5
app/lib/ui/devices.js
View File

@ -38,8 +38,8 @@ class Devices {
$('#cam_time').removeAttr('readonly');
}
for (let i in arg) {
devs.push(arg[i].arduino);
if (arg[i].arduino && arg[i].arduino !== '/dev/fake') {
if (typeof arg[i].arduino !== 'undefined' && arg[i].arduino !== '/dev/fake') {
devs.push(arg[i].arduino);
if (notify === 'Connected to ') {
notify += arg[i].arduino + ' ';
}
@ -86,6 +86,7 @@ class Devices {
//add capper features to grid
capper.enable();
}
log.info("Before stats");
seq.set(0, cfg.cmd.camera_forward);
seq.set(1, cfg.cmd.projector_forward);
grid.state(0);

2
app/lib/ui/devices.js.map
View File

File diff suppressed because one or more lines are too long

2
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.8.98",
"version": "1.8.99",
"lockfileVersion": 2,
"requires": true,
"packages": {

2
app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.8.98",
"version": "1.8.99",
"description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js",
"scripts": {

6
app/src/lib/ui/devices.ts
View File

@ -35,8 +35,8 @@ class Devices {
}
for (let i in arg) {
devs.push(arg[i].arduino);
if (arg[i].arduino && arg[i].arduino !== '/dev/fake') {
if (typeof arg[i].arduino !== 'undefined' && arg[i].arduino !== '/dev/fake') {
devs.push(arg[i].arduino);
if (notify === 'Connected to ') {
notify += arg[i].arduino + ' ';
} else {
@ -86,7 +86,7 @@ class Devices {
//add capper features to grid
capper.enable();
}
log.info("Before stats");
seq.set(0, cfg.cmd.camera_forward);
seq.set(1, cfg.cmd.projector_forward);
grid.state(0);

2
data/cfg.json
View File

@ -1,5 +1,5 @@
{
"version": "1.8.98",
"version": "1.8.99",
"ext_port": 1111,
"profiles": {
"mcopy": {

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "mcopy",
"version": "1.8.98",
"version": "1.8.99",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "mcopy",
"version": "1.8.98",
"version": "1.8.99",
"license": "MIT",
"dependencies": {
"alert": "file:app/lib/alert",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "mcopy",
"version": "1.8.98",
"version": "1.8.99",
"description": "Small gauge film optical printer platform",
"main": "build.js",
"directories": {

2
processing/mcopy/cfg.json
View File

@ -1,5 +1,5 @@
{
"version": "1.8.98",
"version": "1.8.99",
"ext_port": 1111,
"profiles": {
"mcopy": {