ezri/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

lotus: Fix non-pico build and GPIOs

Browse Source 
Signed-off-by: Daniel Schaefer <git@danielschaefer.me>
This commit is contained in:
Daniel Schaefer
2023-01-07 17:01:33 +08:00
parent 877e2f9ace
commit e1997affa0
1 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
keyboards/lotus/matrix.c
View File

@@ -23,10 +23,10 @@ static bool new_sample = false;
const float CONV_FACTOR = 3.3f / (1<<12); const float CONV_FACTOR = 3.3f / (1<<12);
// Mux GPIOs // Mux GPIOs
#define MUX_A 1 #define MUX_A GP1
#define MUX_B 2 #define MUX_B GP2
#define MUX_C 3 #define MUX_C GP3
#define MUX_ENABLE 4 #define MUX_ENABLE GP4
#define ADC_CH0_PIN GP26 #define ADC_CH0_PIN GP26
#define ADC_CH1_PIN GP27 #define ADC_CH1_PIN GP27
@@ -57,7 +57,7 @@ float average_samples(adcsample_t s[], int channel) {
} }
void print_samples(adcsample_t s[]) { void print_samples(adcsample_t s[]) {
// Samples go from 0 to 4096 // Samples go from 0 to 4095
uprintf("Raw ADC samples: %d, %d, %d, %d\n", s[0], s[1], s[2], s[3]); uprintf("Raw ADC samples: %d, %d, %d, %d\n", s[0], s[1], s[2], s[3]);
float adv_avg = average_samples(s, 0); float adv_avg = average_samples(s, 0);
@@ -162,7 +162,6 @@ static void mux_select_row(int row) {
writePin(MUX_B, bits[1]); writePin(MUX_B, bits[1]);
writePin(MUX_C, bits[2]); writePin(MUX_C, bits[2]);
} }
static uint16_t adc_read(void) { return 0; }
/** /**
* Based on the adc value, update the matrix for this column * Based on the adc value, update the matrix for this column
@@ -194,46 +193,46 @@ void drive_col(int col, bool high) {
int gpio = 0; int gpio = 0;
switch (col) { switch (col) {
case 0: case 0:
gpio = 8; gpio = GP8;
break; break;
case 1: case 1:
gpio = 9; gpio = GP9;
break; break;
case 2: case 2:
gpio = 10; gpio = GP10;
break; break;
case 3: case 3:
gpio = 11; gpio = GP11;
break; break;
case 4: case 4:
gpio = 12; gpio = GP12;
break; break;
case 5: case 5:
gpio = 13; gpio = GP13;
break; break;
case 6: case 6:
gpio = 14; gpio = GP14;
break; break;
case 7: case 7:
gpio = 15; gpio = GP15;
break; break;
case 8: case 8:
gpio = 21; gpio = GP21;
break; break;
case 9: case 9:
gpio = 20; gpio = GP20;
break; break;
case 10: case 10:
gpio = 19; gpio = GP19;
break; break;
case 11: case 11:
gpio = 18; gpio = GP18;
break; break;
case 12: case 12:
gpio = 17; gpio = GP17;
break; break;
case 13: case 13:
gpio = 16; gpio = GP16;
break; break;
default: default:
// Not supposed to happen // Not supposed to happen