ocogeclub/ocoge
1
0
Fork 0
mirror of https://github.com/ocogeclub/ocoge.git synced 2024-11-21 15:19:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[fix] 動作しなくなっていたブロックを修正

Browse Source
This commit is contained in:
ocogeclub 2022-01-13 20:04:21 +09:00
parent a91f8f1168
commit d0552778d4
5 changed files with 916 additions and 2086 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index_elutil.js
View File

@ -166,7 +166,7 @@ class elUtil {
} else { } else {
let dirname = this.path.dirname(this.saveFilepath); let dirname = this.path.dirname(this.saveFilepath);
let basename = this.path.basename(this.saveFilepath, '.xml'); let basename = this.path.basename(this.saveFilepath, '.xml');
defName = path.join(dirname, basename) + '.' + ext; defName = this.path.join(dirname, basename) + '.' + ext;
} }
} else { } else {
filter = { name: 'text file', extensions: ['txt'] }; filter = { name: 'text file', extensions: ['txt'] };

6
local_modules/@ocogeclub/pigpio/index.js
View File

@ -61,7 +61,8 @@ module.exports.serial_write = async data => {
if (ser_hand >= 0) return await module.exports._serial_write(pi, ser_hand, Buffer.from(data)); if (ser_hand >= 0) return await module.exports._serial_write(pi, ser_hand, Buffer.from(data));
} }
module.exports.serial_read = async count => { module.exports.serial_read = async count => {
if (ser_hand >= 0) return await module.exports._serial_read(pi, ser_hand, count).toString('utf8'); if (ser_hand >= 0) return new TextDecoder().decode(await module.exports._serial_read(pi, ser_hand, count));
// if (ser_hand >= 0) return await module.exports._serial_read(pi, ser_hand, count);//.toString('utf8');
} }
module.exports.i2c_open = async (i2c_bus, i2c_address) => { module.exports.i2c_open = async (i2c_bus, i2c_address) => {
if (i2c_hand >= 0) await module.exports._i2c_close(pi, i2c_hand); // 勝手に閉じる if (i2c_hand >= 0) await module.exports._i2c_close(pi, i2c_hand); // 勝手に閉じる
@ -85,7 +86,8 @@ module.exports.i2c_read_word_data = async reg => {
if (i2c_hand >= 0) return await module.exports._i2c_read_word_data(pi, i2c_hand, reg); if (i2c_hand >= 0) return await module.exports._i2c_read_word_data(pi, i2c_hand, reg);
} }
module.exports.i2c_read_device = async count => { module.exports.i2c_read_device = async count => {
if (i2c_hand >= 0) return await module.exports._i2c_read_device(pi, i2c_hand, count).toString('utf8'); if (i2c_hand >= 0) return new TextDecoder().decode(await module.exports._i2c_read_device(pi, i2c_hand, count));
// if (i2c_hand >= 0) return await module.exports._i2c_read_device(pi, i2c_hand, count).toString('utf8');
} }
module.exports.i2c_write_device = async data => { module.exports.i2c_write_device = async data => {
if (i2c_hand >= 0) return await module.exports._i2c_write_device(pi, i2c_hand, Buffer.from(data)); if (i2c_hand >= 0) return await module.exports._i2c_write_device(pi, i2c_hand, Buffer.from(data));

2962
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "ocoge", "name": "ocoge",
"version": "0.1.3", "version": "0.1.4",
"description": "ブロックベースビジュアルプログラム開発・実行環境", "description": "ブロックベースビジュアルプログラム開発・実行環境",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
@ -23,13 +23,13 @@
}, },
"homepage": "https://github.com/ocogeclub/ocoge#readme", "homepage": "https://github.com/ocogeclub/ocoge#readme",
"devDependencies": { "devDependencies": {
"@electron-forge/cli": "^6.0.0-beta.61", "@electron-forge/cli": "^6.0.0-beta.63",
"@electron-forge/maker-deb": "^6.0.0-beta.61", "@electron-forge/maker-deb": "^6.0.0-beta.63",
"@electron-forge/maker-rpm": "^6.0.0-beta.61", "@electron-forge/maker-rpm": "^6.0.0-beta.63",
"@electron-forge/maker-squirrel": "6.0.0-beta.33", "@electron-forge/maker-squirrel": "6.0.0-beta.63",
"@electron-forge/maker-zip": "^6.0.0-beta.61", "@electron-forge/maker-zip": "^6.0.0-beta.63",
"electron": "^16.0.5", "electron": "^16.0.7",
"electron-rebuild": "^3.2.5" "electron-rebuild": "^3.2.7"
}, },
"dependencies": { "dependencies": {
"@ocogeclub/amg8833": "file:local_modules/@ocogeclub/amg8833", "@ocogeclub/amg8833": "file:local_modules/@ocogeclub/amg8833",
@ -38,10 +38,10 @@
"@ocogeclub/pigpio": "file:local_modules/@ocogeclub/pigpio", "@ocogeclub/pigpio": "file:local_modules/@ocogeclub/pigpio",
"@tensorflow-models/knn-classifier": "^1.2.2", "@tensorflow-models/knn-classifier": "^1.2.2",
"@tensorflow-models/mobilenet": "^2.1.0", "@tensorflow-models/mobilenet": "^2.1.0",
"@tensorflow/tfjs-converter": "^3.12.0", "@tensorflow/tfjs-converter": "^3.13.0",
"@tensorflow/tfjs-core": "^3.12.0", "@tensorflow/tfjs-core": "^3.13.0",
"@tensorflow/tfjs-node": "^3.12.0", "@tensorflow/tfjs-node": "^3.13.0",
"@vladmandic/face-api": "^1.6.1", "@vladmandic/face-api": "^1.6.3",
"axios": "^0.24.0", "axios": "^0.24.0",
"electron-squirrel-startup": "^1.0.0", "electron-squirrel-startup": "^1.0.0",
"nodemailer": "^6.7.2", "nodemailer": "^6.7.2",
@ -78,4 +78,4 @@
] ]
} }
} }
} }

6
ugj_blocks.js
View File

@ -474,15 +474,15 @@ var ugjGpioSetInputDefinition = {
"options": [ "options": [
[ [
"%{BKY_GPIO_SET_INPUT_PULLUP}", "%{BKY_GPIO_SET_INPUT_PULLUP}",
"pi.PULL_UP" "_pi.PULL_UP"
], ],
[ [
"%{BKY_GPIO_SET_INPUT_PULLDOWN}", "%{BKY_GPIO_SET_INPUT_PULLDOWN}",
"pi.PULL_DOWN" "_pi.PULL_DOWN"
], ],
[ [
"%{BKY_GPIO_SET_INPUT_PULLNONE}", "%{BKY_GPIO_SET_INPUT_PULLNONE}",
"pi.PULL_NONE" "_pi.PULL_NONE"
] ]
] ]
} }