Browse Source

Added board revision pins

Per Mårtensson 3 years ago
parent
commit
208595c95f
3 changed files with 14 additions and 5 deletions
  1. 3 0
      sw/src/gpio.cpp
  2. 5 2
      sw/src/main.cpp
  3. 6 3
      sw/variant/blacksasi_f411m/blacksasi_f411m.h

+ 3 - 0
sw/src/gpio.cpp

@@ -13,6 +13,9 @@ bool gpioInit(void){
     pinMode(BOARD_SWITCH2_PIN , INPUT_PULLUP);
     pinMode(BOARD_SWITCH3_PIN , INPUT_PULLUP);
     pinMode(BOARD_SWITCH4_PIN , INPUT_PULLUP);
+    pinMode(BOARD_REV_PIN0, INPUT_PULLDOWN); 
+    pinMode(BOARD_REV_PIN1, INPUT_PULLDOWN);
+    pinMode(BOARD_REV_PIN2, INPUT_PULLDOWN);
     pinMode(BOARD_SCSI_TERM_HIGH, OUTPUT);
     pinMode(BOARD_SCSI_TERM_LOW, OUTPUT);
     pinMode(BOARD_SCSI_TERM_POWER, INPUT); //Check if external termination power is provided

+ 5 - 2
sw/src/main.cpp

@@ -97,7 +97,7 @@ static const uint32_t scsiDbInputOutputPullAnd_PEREG  = 0b0000000000000000010101
 static ArduinoOutStream cout(Serial);
 // HDD image
 uint16_t imageSelect = 0;
-
+uint16_t board_rev = 0;
 HDDIMG  img[NUM_SCSIID][NUM_SCSILUN]; // Maximum number
 
 uint8_t       m_senseKey = 0;         // Sense key
@@ -302,7 +302,9 @@ void setup()
 {
   //Setup GPIO
   gpioInit();
-  
+
+  board_rev = digitalRead(BOARD_REV_PIN0) | digitalRead(BOARD_REV_PIN1) << 1 | digitalRead(BOARD_REV_PIN2) << 2;
+
   SCSI_BUFFERS_IN() ;
 
   SCSI_SET_PULL();
@@ -313,6 +315,7 @@ void setup()
   Serial.begin(19200);
   delay(3000);
   Serial.println("BLACKSASI");
+  Serial.println(board_rev);
   Serial.flush();
 
 #endif

+ 6 - 3
sw/variant/blacksasi_f411m/blacksasi_f411m.h

@@ -43,7 +43,7 @@
 #define BOARD_USB_DP_PIN		PA12
 
 #define BOARD_LED_PIN           PA4
-#define BOARD_LED1_PIN           PA4
+#define BOARD_LED1_PIN          PA4
 #define BOARD_LED2_PIN          PA5
 #define BOARD_LED3_PIN          PA6
 #define BOARD_EXT_LED           PA0
@@ -52,6 +52,9 @@
 #define BOARD_SWITCH2_PIN       PC5
 #define BOARD_SWITCH3_PIN       PC10
 #define BOARD_SWITCH4_PIN       PC11
+#define BOARD_REV_PIN0          PA7
+#define BOARD_REV_PIN1          PA8
+#define BOARD_REV_PIN2          PA9
 #define BOARD_SDCARD_INSERT     PB0
 
 #define BOARD_NR_USARTS         6
@@ -130,8 +133,8 @@
 #define BOARD_NR_PWM_PINS       22
 #define BOARD_NR_ADC_PINS       16
 #define BOARD_NR_USED_PINS      22
-#define BOARD_JTMS_SWDIO_PIN    PA13 //Port2Pin('A',13)
-#define BOARD_JTCK_SWCLK_PIN    PA14 //Port2Pin('A',14)
+#define BOARD_JTMS_SWDIO_PIN    PA13 
+#define BOARD_JTCK_SWCLK_PIN    PA14 
 
 
 /*****************************************************************************/