Skip to content

Commit d825218

Browse files
committed
Init GPIO feeds as needed
since pins aren't persisted
1 parent 56605dc commit d825218

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -270,3 +270,4 @@ data/
270270
# ignore dist, it is for production files created by npm scripts
271271
dist/
272272
uploads/
273+
.DS_Store

boards/Controller.ts

+10-6
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ export class Gpio extends ConfigItem {
936936
let pinId = (typeof data.pinId !== 'undefined') ? parseInt(data.pinId, 10) : undefined;
937937
let dev = this.pins.getItemById(pinId);
938938
await dev.setDeviceFeed(data);
939-
dev.initFeeds();
939+
// dev.initFeeds();
940940
return Promise.resolve(dev.feeds);
941941
}
942942
catch (err) { return Promise.reject(err); }
@@ -948,7 +948,7 @@ export class Gpio extends ConfigItem {
948948
let devId = (typeof data.pinId !== 'undefined') ? parseInt(data.pinId, 10) : undefined;
949949
let dev = this.pins.getItemById(devId);
950950
await dev.deleteDeviceFeed(data);
951-
dev.initFeeds();
951+
// dev.initFeeds();
952952
return Promise.resolve(dev.feeds);
953953
}
954954
catch (err) { return Promise.reject(err); }
@@ -1082,19 +1082,23 @@ export class GpioPin extends ConfigItem {
10821082
resolve(this);
10831083
})
10841084
}
1085-
public _feeds: Feed[] = [];
1085+
/* public _feeds: Feed[] = [];
10861086
public initFeeds() {
10871087
this._feeds = [];
10881088
for (let i = 0; i < this.feeds.length; i++) {
10891089
let f = this.feeds.getItemByIndex(i);
10901090
this._feeds.push(new Feed(f));
10911091
}
1092-
}
1092+
} */
10931093
public async emitFeeds() {
10941094
try {
1095-
for (let i = 0; i < this._feeds.length; i++) {
1096-
await this._feeds[i].send(this);
1095+
for (let i = 0; i < this.feeds.length; i++) {
1096+
let feed = new Feed(this.feeds.getItemByIndex(i));
1097+
await feed.send(this);
10971098
}
1099+
// for (let i = 0; i < this._feeds.length; i++) {
1100+
// await this._feeds[i].send(this);
1101+
// }
10981102
} catch (err) { logger.error(err); }
10991103
}
11001104
public getExtended() {

gpio/Gpio-Controller.ts

+1
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ export class GpioController {
113113
});
114114
});
115115
}
116+
cont.gpio.emitFeeds(pin.pinId, pin.headerId);
116117
pin.initialized = true;
117118
}
118119
}

0 commit comments

Comments
 (0)