Compare commits

..

No commits in common. "382ba56fa7d5f81466beb2c99e8e2546da3689d0" and "565d2ecceb57b50e10c39d078fc2c58e14190613" have entirely different histories.

10 changed files with 11 additions and 23 deletions

View File

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

2
app/package-lock.json generated
View File

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

View File

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

View File

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

View File

@ -303,16 +303,6 @@ long McopyProjector::analogReadAccurateAverage (uint8_t &pin) {
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 maxI = 0;
long max = 0;

View File

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

View File

@ -78,6 +78,8 @@ void setup () {
delay(42);
digitalWrite(LED_FWD, LOW);
digitalWrite(LED_BWD, LOW);
//projector.home();
}
void loop () {
@ -108,8 +110,6 @@ void cmd (char val) {
projector_frame();
} else if (val == mcopy.STATE) {
state();
} else if (val == mcopy.HOME) {
projector.home();
}
}

4
package-lock.json generated
View File

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

View File

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

View File

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