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

Create a prospective "inaccurate" analogReadAverage method.

This commit is contained in:
Matt McWilliams 2023-10-10 22:29:02 -04:00
parent 24d6685047
commit 382ba56fa7
9 changed files with 21 additions and 9 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.59", "version": "1.8.60",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

2
app/package-lock.json generated
View File

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

2
app/package.json
View File

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

5
data/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.59", "version": "1.8.60",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {
@ -190,7 +190,8 @@
"error": "E", "error": "E",
"camera_exposure": "G", "camera_exposure": "G",
"state": "H", "state": "H",
"home": "I" "home": "I",
"offset": "O"
} }
} }
} }

10
ino/mcopy_projector_firmware/McopyProjector.cpp
View File

@ -303,6 +303,16 @@ long McopyProjector::analogReadAccurateAverage (uint8_t &pin) {
return sum / (double) count; return sum / (double) count;
} }
long McopyProjector::analogReadAverage (uint8_t &pin) {
uint8_t count = 3;
double sum = 0.0;
for (uint8_t i = 0; i < count; i++) {
sum += analogRead(pin);
delay(1);
}
return sum / (double) count;
}
uint16_t McopyProjector::findPeak(long (&arr)[200], uint16_t &steps) { uint16_t McopyProjector::findPeak(long (&arr)[200], uint16_t &steps) {
uint16_t maxI = 0; uint16_t maxI = 0;
long max = 0; long max = 0;

1
ino/mcopy_projector_firmware/McopyProjector.h
View File

@ -69,6 +69,7 @@ class McopyProjector {
long readVcc(); long readVcc();
long analogReadAccurate (uint8_t &pin); long analogReadAccurate (uint8_t &pin);
long analogReadAccurateAverage (uint8_t &pin); long analogReadAccurateAverage (uint8_t &pin);
long analogReadAverage (uint8_t &pin);
uint16_t findPeak(long (&arr)[200], uint16_t &steps); uint16_t findPeak(long (&arr)[200], uint16_t &steps);
void emitters(bool enabled); void emitters(bool enabled);

4
package-lock.json generated
View File

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

2
package.json
View File

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

2
processing/mcopy/cfg.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.59", "version": "1.8.60",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {