From 82ca461580a39abb65d76fe6d3745a0776f465fd Mon Sep 17 00:00:00 2001
From: CrazyRedMachine <36906596+CrazyRedMachine@users.noreply.github.com>
Date: Wed, 3 Nov 2021 08:47:18 +0100
Subject: [PATCH] fix PS1 compatibility (fixed by Zoids)

---
 README.md                         |  2 +-
 popnController/popnController.ino | 45 ++++++++++++++++---------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 0a076ce..d967ba8 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ The keypad code uses the Keypad library by Mark Stanley and Alexander Brevig.
 
 Switch debouncing is done with Bounce2 library by Thomas O Fredericks.
 
-PSX Controller code is based on busslave's PSX_RECEIVER.cpp
+PSX Controller code is based on busslave's PSX_RECEIVER.cpp, with PS1 compatibility fixes by [veroxzik](https://github.com/veroxzik)
 
 # Supported devices and requirements
 
diff --git a/popnController/popnController.ino b/popnController/popnController.ino
index fbd1768..9d38eec 100644
--- a/popnController/popnController.ino
+++ b/popnController/popnController.ino
@@ -156,17 +156,21 @@ void convertPopn(uint32_t buttons){
 ISR(SPI_STC_vect) {  
   uint8_t inbyte=SPDR;
 
-  if (inbyte==command_buff[curr_byte]) {    
+  if (inbyte==command_buff[curr_byte]) {   
+    
+    SPI_DDR |= (1<<DATA_PIN);//output
+   
     SPDR = data_buff[curr_byte];
     curr_byte++;
     if (curr_byte<DATA_LEN) {//ACK low.
+       _delay_us(8); // Necessary delay for PS1 (not needed for PS2)
       //SPI_PORT &= ~(1<<ACK_PIN);
       PORTD &= ~(1<<5);//set HIGH
     // simulate open drain
     //  SPI_DDR |= (1<<ACK_PIN);//output
     //  SPI_PORT &= ~(1<<ACK_PIN);//set low (simulate open collector LOW)
 
-      _delay_us(5);
+      _delay_us(1);
     //SPI_PORT |= (1<<ACK_PIN);
      PORTD |= (1<<5);//set HIGH
 
@@ -231,28 +235,19 @@ void setup() {
  // DDRD |= (1<<5);//output
   PORTD |= (1<<5);//set HIGH
 
-  SPI_DDR |= (1<<DATA_PIN);//output
+  SPI_DDR &= ~(1 << DATA_PIN); //input
   SPI_PORT |= (1<<DATA_PIN);//set HIGH  
 
-  SPI_DDR |= (1<<ATT_PIN);//out
-  delay(500);
-  SPI_PORT |= (1<<ATT_PIN);//set HIGH  
-  delay(5000);
-  SPI_PORT |= (1<<ATT_PIN);//set HIGH  
-
-  //SPI setup.
-//  PRR &= ~(1<<PRSPI);//Set to 0 to ensure power to SPI module.
-  //SPSR|=(1<<SPI2X);//Fosc/32. @16MHz==500KHz.
-  SPCR|=(1<<SPR1);//Fosc/64. @16MHz==250KHz.
-  SPCR|=(1<<CPHA);//Setup @ leading edge, sample @ falling edge.
-  SPCR|=(1<<CPOL);//Leading edge is falling edge, trailing edge is rising edge.
-  SPCR &= ~(1<<MSTR);//MSTR bit is zero, SPI is slave.
-  SPCR|=(1<<DORD);//Byte is transmitted LSB first, MSB last.
-  SPCR|=(1<<SPE);//Enable SPI.
-  SPCR|=(1<<SPIE);//Enable Serial Transfer Complete (STC) interrupt.
-  SPDR=0xFF;
-
-  sei();//Enable global interrupts.
+    //SPI setup
+  SPCR |= (1 << SPR1);  // Fosc/64. @16MHz==250KHz.
+  SPCR |= (1 << CPHA);  // Setup @ leading edge, sample @ falling edge.
+  SPCR |= (1 << CPOL);  // Leading edge is falling edge, trailing edge is rising edge.
+  SPCR &= ~(1 << MSTR); // MSTR bit is zero, SPI is slave.
+  SPCR |= (1 << DORD);  // Byte is transmitted LSB first, MSB last.
+  SPCR |= (1 << SPE);   // Enable SPI.
+  SPCR |= (1 << SPIE);  // Enable Serial Transfer Complete (STC) interrupt.
+  SPDR = 0xFF;
+  sei();  // Enable global interrupts
   /* /PSX setup */
 #endif
   //boot animation
@@ -283,6 +278,12 @@ void loop() {
 #if defined(ARDUINO_ARCH_AVR) 
   /* PSX convert */
   convertPopn(buttonsState);
+
+  if ((SPI_PORT & (1 << ATT_PIN) > 0)) {
+    SPI_DDR &= ~(1 << DATA_PIN); // input
+    SPI_PORT &= ~(1 << DATA_PIN); // ensure pullup is off
+  }
+  
 #endif
   /* USB DATA */
   if ( ( (micros() - lastReport) >= REPORT_DELAY) )