diff --git a/ADIS_tinyK22_RpiHat/source/application.c b/ADIS_tinyK22_RpiHat/source/application.c
index c106b8d..2afcb2f 100644
--- a/ADIS_tinyK22_RpiHat/source/application.c
+++ b/ADIS_tinyK22_RpiHat/source/application.c
@@ -11,6 +11,7 @@
 #include "McuWait.h"
 #include "McuLED.h"
 #include "McuLog.h"
+#include "debounce.h"
 
 #define APP_DEBUG
 
@@ -43,10 +44,9 @@ void App_Init(void){
 	/* configure gpio raspi power disable */
 	McuGPIO_Config_t config_gpio;
 	McuGPIO_GetDefaultConfig(&config_gpio);
-	config.isOnInit = true;
-	config.hw.gpio = GPIOD;
-	config.hw.port = PORTD;
-	config.hw.pin = 6U;
+	config_gpio.hw.gpio = GPIOD;
+	config_gpio.hw.port = PORTD;
+	config_gpio.hw.pin = 6U;
 	GPIO_PowerRaspi = McuGPIO_InitGPIO(&config_gpio);
 
 	// get the event queue handle from debounce
diff --git a/ADIS_tinyK22_RpiHat/source/platform.c b/ADIS_tinyK22_RpiHat/source/platform.c
index 4eed0c2..189ee96 100644
--- a/ADIS_tinyK22_RpiHat/source/platform.c
+++ b/ADIS_tinyK22_RpiHat/source/platform.c
@@ -16,6 +16,8 @@
 #include "shell.h"
 #include "McuShellUart.h"
 #include "McuLog.h"
+#include "debounce.h"
+#include "buttons.h"
 
 void PL_Init(void){
 
@@ -23,29 +25,34 @@ void PL_Init(void){
     CLOCK_EnableClock(kCLOCK_PortA);
     CLOCK_EnableClock(kCLOCK_PortB);
     CLOCK_EnableClock(kCLOCK_PortC);
+    CLOCK_EnableClock(kCLOCK_PortD);
 
 	McuLib_Init();
 	McuRTOS_Init();
 	McuWait_Init();
 	McuGPIO_Init();
 	McuLED_Init();
+	McuRTOS_Init();
+	BTN_Init();
+	Debounce_Init();
 	McuRTT_Init();
 	McuShell_Init();
 	McuShellUart_Init();
 	McuLog_Init();
 	McuLog_set_console(McuRTT_GetStdio(), 0);
 	SHELL_Init();
-	McuRTOS_Init();
 }
 
 
 void PL_Deinit(void){
-	McuRTOS_Deinit();
 	SHELL_Deinit();
 	McuLog_Deinit();
 	McuShellUart_Deinit();
 	McuShell_Deinit();
 	McuRTT_Deinit();
+	Debounce_Deinit();
+	BTN_Deinit();
+	McuRTOS_Deinit();
 	McuLED_Deinit();
 	McuGPIO_Deinit();
 	McuWait_Deinit();
diff --git a/ADIS_tinyK22_RpiHat/source/platform.h b/ADIS_tinyK22_RpiHat/source/platform.h
index 8ee8b19..03d32dc 100644
--- a/ADIS_tinyK22_RpiHat/source/platform.h
+++ b/ADIS_tinyK22_RpiHat/source/platform.h
@@ -8,6 +8,19 @@
 #ifndef PLATFORM_H_
 #define PLATFORM_H_
 
+#include "McuLib.h"
+
+#define PL_CONFIG_BOARD_ID_TINYK22_SHIFTER_V1_0  (0)
+#define PL_CONFIG_BOARD_ID_LPC845_BRK            (1)
+#define PL_CONFIG_BOARD_ID_TINYK22_APROG_HAT_V3  (2) /* not working yet, need to use I2C bit banging */
+#define PL_CONFIG_BOARD_ID_TINYK22_APROG_HAT_V4  (3)
+#define PL_CONFIG_BOARD_ID_TINYK22_APROG_HAT_V5  (4)
+#define PL_CONFIG_BOARD_ID_TINYK22_APROG_HAT_V6  (5)
+#define PL_CONFIG_BOARD_ID_TINYK22_APROG_HAT_V7  (6)
+
+#define PL_CONFIG_BOARD_ID          PL_CONFIG_BOARD_ID_TINYK22_APROG_HAT_V6
+
+
 /* Platform initialization */
 void PL_Init(void);