Compare commits
No commits in common. "382ba56fa7d5f81466beb2c99e8e2546da3689d0" and "565d2ecceb57b50e10c39d078fc2c58e14190613" have entirely different histories.
382ba56fa7
...
565d2ecceb
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "1.8.60",
|
"version": "1.8.58",
|
||||||
"ext_port": 1111,
|
"ext_port": 1111,
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"mcopy": {
|
"mcopy": {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "mcopy-app",
|
"name": "mcopy-app",
|
||||||
"version": "1.8.60",
|
"version": "1.8.58",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "mcopy-app",
|
"name": "mcopy-app",
|
||||||
"version": "1.8.60",
|
"version": "1.8.58",
|
||||||
"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": {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "1.8.60",
|
"version": "1.8.58",
|
||||||
"ext_port": 1111,
|
"ext_port": 1111,
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"mcopy": {
|
"mcopy": {
|
||||||
|
@ -190,8 +190,7 @@
|
||||||
"error": "E",
|
"error": "E",
|
||||||
"camera_exposure": "G",
|
"camera_exposure": "G",
|
||||||
"state": "H",
|
"state": "H",
|
||||||
"home": "I",
|
"home": "I"
|
||||||
"offset": "O"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -303,16 +303,6 @@ 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;
|
||||||
|
|
|
@ -69,7 +69,6 @@ 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);
|
||||||
|
|
||||||
|
|
|
@ -78,6 +78,8 @@ void setup () {
|
||||||
delay(42);
|
delay(42);
|
||||||
digitalWrite(LED_FWD, LOW);
|
digitalWrite(LED_FWD, LOW);
|
||||||
digitalWrite(LED_BWD, LOW);
|
digitalWrite(LED_BWD, LOW);
|
||||||
|
|
||||||
|
//projector.home();
|
||||||
}
|
}
|
||||||
|
|
||||||
void loop () {
|
void loop () {
|
||||||
|
@ -108,8 +110,6 @@ void cmd (char val) {
|
||||||
projector_frame();
|
projector_frame();
|
||||||
} else if (val == mcopy.STATE) {
|
} else if (val == mcopy.STATE) {
|
||||||
state();
|
state();
|
||||||
} else if (val == mcopy.HOME) {
|
|
||||||
projector.home();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{
|
{
|
||||||
"name": "mcopy",
|
"name": "mcopy",
|
||||||
"version": "1.8.60",
|
"version": "1.8.58",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "mcopy",
|
"name": "mcopy",
|
||||||
"version": "1.8.60",
|
"version": "1.8.58",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"arduino": "file:app/lib/arduino",
|
"arduino": "file:app/lib/arduino",
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "mcopy",
|
"name": "mcopy",
|
||||||
"version": "1.8.60",
|
"version": "1.8.58",
|
||||||
"description": "Small gauge film optical printer platform",
|
"description": "Small gauge film optical printer platform",
|
||||||
"main": "build.js",
|
"main": "build.js",
|
||||||
"directories": {
|
"directories": {
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"version": "1.8.60",
|
"version": "1.8.58",
|
||||||
"ext_port": 1111,
|
"ext_port": 1111,
|
||||||
"profiles": {
|
"profiles": {
|
||||||
"mcopy": {
|
"mcopy": {
|
||||||
|
|
Loading…
Reference in New Issue