oleksiy/GravityHW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated CV calibration related stuff

Browse Source
This commit is contained in:
Oleksiy
2023-08-26 18:58:36 +03:00
parent 5aaa6e694d
commit 95d07893bc
4 changed files with 72 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Extra/CVTest/CVTest.ino
View File

@ -17,8 +17,8 @@
const byte outsPins[6] = { 7, 8, 10, 6, 9, 11 };
const byte clockOutPin = 3;
int CV1Calibration = 0;
int CV2Calibration = 0;
int CV1Calibration = 512;
int CV2Calibration = 512;
bool rotateScreen = false;
@ -91,7 +91,14 @@ void checkInputs() {
} else {
a1Input = 512;
}
//a2Input = map(analogRead(ANALOGUE_INPUT_2_PIN), 0 - CV2Calibration, 1023 - CV2Calibration, 0, 1023);
if (analogRead(ANALOGUE_INPUT_2_PIN) > (CV1Calibration)) {
a2Input = map(analogRead(ANALOGUE_INPUT_2_PIN), CV1Calibration, 1023, 512, 1023);
} else if (analogRead(ANALOGUE_INPUT_2_PIN) < (CV1Calibration)) {
a2Input = map(analogRead(ANALOGUE_INPUT_2_PIN), 0, CV1Calibration, 0, 512);
} else {
a2Input = 512;
}
}
void updateScreen() {
@ -112,19 +119,26 @@ void updateScreen() {
u8g2.drawStr(86, 8, valueChar);
u8g2.drawStr(10, 16, "MAP:");
valueStr = String(map(a1Input, -1, 1024, -6, 6));
valueStr = String(map(a1Input, 5, 1024, -5, 6));
valueStr.toCharArray(valueChar, 16);
u8g2.drawStr(32, 16, valueChar);
/*
u8g2.drawStr(10, 32, "CV2:");
u8g2.drawStr(10, 40, "CV2:");
valueStr = String(analogRead(ANALOGUE_INPUT_2_PIN));
valueStr.toCharArray(valueChar, 16);
u8g2.drawStr(32, 32, valueChar);
u8g2.drawStr(64, 32, "CAL:");
valueStr = String(analogRead(a2Input));
u8g2.drawStr(32, 40, valueChar);
u8g2.drawStr(64, 40, "CAL:");
valueStr = String(a2Input);
valueStr.toCharArray(valueChar, 16);
u8g2.drawStr(86, 32, valueChar);*/
u8g2.drawStr(86, 40, valueChar);
u8g2.drawStr(10, 48, "MAP:");
valueStr = String(map(a2Input, 5, 1024, -5, 6));
valueStr.toCharArray(valueChar, 16);
u8g2.drawStr(32, 48, valueChar);
if (!digitalRead(SHIFT_BTN_PIN)) {
calibrateCVs();