Convert to use pinout

This commit is contained in:
rhgndf 2023-11-05 13:43:47 +08:00
parent f5c05e463d
commit c7b7f06f10

View File

@ -852,12 +852,12 @@ static void setVPP(char on) {
static void setSTB(char on) { static void setSTB(char on) {
if (varVppExists) { if (varVppExists) {
const unsigned short b = galinfo[gal].cfgbase; const PINOUT p = galinfo[gal].pinout;
uint8_t pin = PIN_ZIF13; uint8_t pin = PIN_ZIF13;
if (b == CFG_BASE_16) { if (p == PINOUT_16V8) {
pin = PIN_ZIF15; pin = PIN_ZIF15;
} else } else
if (b == CFG_BASE_18) { if (p == PINOUT_18V10) {
pin = PIN_ZIF8; pin = PIN_ZIF8;
} }
digitalWrite(pin, on ? 1:0); digitalWrite(pin, on ? 1:0);
@ -885,8 +885,8 @@ static void setPV(char on) {
static void setSDIN(char on) { static void setSDIN(char on) {
if (varVppExists) { if (varVppExists) {
const unsigned short b = galinfo[gal].cfgbase; const PINOUT p = galinfo[gal].pinout;
if (b == CFG_BASE_18) { if (p == PINOUT_18V10) {
if (on) { if (on) {
lastShiftRegVal |= PIN_ZIF7; lastShiftRegVal |= PIN_ZIF7;
} else { } else {
@ -894,7 +894,7 @@ static void setSDIN(char on) {
} }
setShiftReg(lastShiftRegVal); setShiftReg(lastShiftRegVal);
} else { } else {
const uint8_t pin = (b == CFG_BASE_16) ? PIN_ZIF9 : PIN_ZIF11; const uint8_t pin = (p == PINOUT_16V8) ? PIN_ZIF9 : PIN_ZIF11;
digitalWrite(pin, on ? 1:0); digitalWrite(pin, on ? 1:0);
} }
} else { } else {
@ -904,8 +904,8 @@ static void setSDIN(char on) {
static void setSCLK(char on){ static void setSCLK(char on){
if (varVppExists) { if (varVppExists) {
const unsigned short b = galinfo[gal].cfgbase; const PINOUT p = galinfo[gal].pinout;
if (b == CFG_BASE_18) { if (p == PINOUT_18V10) {
if (on) { if (on) {
lastShiftRegVal |= PIN_ZIF6; lastShiftRegVal |= PIN_ZIF6;
} else { } else {
@ -913,7 +913,7 @@ static void setSCLK(char on){
} }
setShiftReg(lastShiftRegVal); setShiftReg(lastShiftRegVal);
} else { } else {
uint8_t pin = (b == CFG_BASE_16) ? PIN_ZIF8 : PIN_ZIF10; uint8_t pin = (p == PINOUT_16V8) ? PIN_ZIF8 : PIN_ZIF10;
digitalWrite(pin, on ? 1:0); digitalWrite(pin, on ? 1:0);
} }
} else { } else {
@ -982,7 +982,7 @@ static char getSDOUT(void)
if (p == PINOUT_20V8) { if (p == PINOUT_20V8) {
pin = PIN_ZIF15; pin = PIN_ZIF15;
} else } else
if (b == CFG_BASE_18) { if (p == PINOUT_18V10) {
pin = PIN_ZIF9; pin = PIN_ZIF9;
} }
return digitalRead(pin) != 0; return digitalRead(pin) != 0;