From c6563a099ce05d9291a0c27fdbab3ffd9efddc48 Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Fri, 10 Mar 2023 12:26:33 +0100
Subject: initial merge of #26

---
 src/stm32/setup.c              | 197 +++++++++++++++++++++++++++++++++++++++++
 src/stm32/setup.h              |  24 +++++
 src/stm32/stm32f0xx_hal_conf.h |  16 ++--
 3 files changed, 230 insertions(+), 7 deletions(-)
 create mode 100644 src/stm32/setup.c
 create mode 100644 src/stm32/setup.h

(limited to 'src/stm32')

diff --git a/src/stm32/setup.c b/src/stm32/setup.c
new file mode 100644
index 0000000..2c3552b
--- /dev/null
+++ b/src/stm32/setup.c
@@ -0,0 +1,197 @@
+#include <stm32f0xx_hal.h>
+#include <stm32f0xx_hal_spi.h>
+#include <stm32f0xx_hal_uart.h>
+#include <stm32f0xx_hal_gpio.h>
+#include <FreeRTOS.h>
+#include <task.h>
+
+#include "main.h"
+#include "setup.h"
+#include "ppu/ppu.h"
+
+UART_HandleTypeDef huart2 = {
+	.Instance = USART2,
+	.Init.BaudRate = 115200,
+	.Init.WordLength = UART_WORDLENGTH_8B,
+	.Init.StopBits = UART_STOPBITS_1,
+	.Init.Parity = UART_PARITY_NONE,
+	.Init.Mode = UART_MODE_TX_RX,
+	.Init.HwFlowCtl = UART_HWCONTROL_NONE,
+	.Init.OverSampling = UART_OVERSAMPLING_16,
+	.Init.OneBitSampling = UART_ONE_BIT_SAMPLE_DISABLE,
+	.AdvancedInit.AdvFeatureInit = UART_ADVFEATURE_NO_INIT,
+};
+
+GPIO_InitTypeDef spi_gpio = {
+	.Pin = HH_IO_SPI_PINS,
+	.Mode = GPIO_MODE_AF_PP,
+	.Pull = GPIO_NOPULL,
+	.Speed = GPIO_SPEED_FREQ_HIGH,
+	.Alternate = GPIO_AF0_SPI1,
+};
+
+SPI_HandleTypeDef hspi1 = {
+	.Instance = SPI1,
+	.Init.Mode = SPI_MODE_MASTER,
+	.Init.Direction = SPI_DIRECTION_1LINE,
+	.Init.DataSize = SPI_DATASIZE_8BIT,
+	.Init.CLKPolarity = SPI_POLARITY_LOW,
+	.Init.CLKPhase = SPI_PHASE_1EDGE,
+	.Init.NSS = SPI_NSS_SOFT,
+	.Init.BaudRatePrescaler = SPI_BAUDRATEPRESCALER_16,
+	.Init.FirstBit = SPI_FIRSTBIT_MSB,
+	.Init.TIMode = SPI_TIMODE_DISABLE,
+	.Init.CRCCalculation = SPI_CRCCALCULATION_DISABLE,
+	.Init.CRCPolynomial = 7,
+	.Init.CRCLength = SPI_CRC_LENGTH_DATASIZE,
+	.Init.NSSPMode = SPI_NSS_PULSE_DISABLE,
+};
+
+TIM_HandleTypeDef htim3 = {
+	.Instance = TIM3,
+	.Init.Prescaler = 7999,
+	.Init.CounterMode = TIM_COUNTERMODE_UP,
+	.Init.Period = 65535,
+	.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1,
+	.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE,
+};
+
+static void hh_io_spi_setup();
+static void hh_io_tim_setup();
+static void hh_io_usart2_setup();
+static void hh_io_gpio_setup();
+static void hh_io_clock_setup();
+static void hh_io_setup_error_handler();
+
+void hh_setup() {
+	HAL_Init();
+
+	hh_io_clock_setup();
+	hh_io_usart2_setup();
+	hh_io_gpio_setup();
+	hh_io_spi_setup();
+	hh_io_tim_setup();
+
+	hh_ppu_init();
+}
+
+void hh_exit() {
+	hh_ppu_deinit();
+
+	HAL_DeInit();
+}
+
+void hh_io_clock_setup() {
+	if (HAL_OK != HAL_RCC_OscConfig(&(RCC_OscInitTypeDef){
+		.OscillatorType = RCC_OSCILLATORTYPE_HSI,
+		.HSIState = RCC_HSI_ON,
+		.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT,
+		.PLL.PLLState = RCC_PLL_ON,
+	})) return hh_io_setup_error_handler();
+
+	// cpu, ahb & apb clocks
+	if (HAL_OK != HAL_RCC_ClockConfig(&(RCC_ClkInitTypeDef){
+		.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK | RCC_CLOCKTYPE_PCLK1,
+		.SYSCLKSource = RCC_SYSCLKSOURCE_HSI,
+		.AHBCLKDivider = RCC_SYSCLK_DIV1,
+		.APB1CLKDivider = RCC_HCLK_DIV1,
+	}, FLASH_LATENCY_1)) return hh_io_setup_error_handler();
+
+	// usart2 clock (usb serial)
+	if (HAL_RCCEx_PeriphCLKConfig(&(RCC_PeriphCLKInitTypeDef){
+		.PeriphClockSelection = RCC_PERIPHCLK_USART2,
+		.Usart2ClockSelection = RCC_USART2CLKSOURCE_PCLK1,
+		.I2c1ClockSelection = RCC_I2C1CLKSOURCE_HSI,
+	}) != HAL_OK) return hh_io_setup_error_handler();
+}
+
+void hh_io_spi_setup() {
+	if (HAL_SPI_Init(&hspi1) != HAL_OK)
+		return hh_io_setup_error_handler();
+}
+
+void hh_io_usart2_setup() {
+	if (HAL_UART_Init(&huart2) != HAL_OK)
+		return hh_io_setup_error_handler();
+}
+
+void hh_io_tim_setup() {
+	if (HAL_TIM_Base_Init(&htim3) != HAL_OK)
+		return hh_io_setup_error_handler();
+
+	if (HAL_TIM_ConfigClockSource(&htim3, &(TIM_ClockConfigTypeDef) {
+		.ClockSource = TIM_CLOCKSOURCE_INTERNAL
+	}) != HAL_OK) return hh_io_setup_error_handler();
+
+	if (HAL_TIMEx_MasterConfigSynchronization(&htim3, &(TIM_MasterConfigTypeDef) {
+		.MasterOutputTrigger = TIM_TRGO_RESET,
+		.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE,
+	}) != HAL_OK) return hh_io_setup_error_handler();
+}
+
+void hh_io_gpio_setup() {
+  __HAL_RCC_GPIOA_CLK_ENABLE();
+  __HAL_RCC_GPIOB_CLK_ENABLE();
+
+  HAL_GPIO_WritePin(GPIOA, GPIO_PIN_9, GPIO_PIN_SET);
+	HAL_GPIO_Init(GPIOA, &(GPIO_InitTypeDef) {
+		.Pin = GPIO_PIN_9,
+		.Mode = GPIO_MODE_OUTPUT_PP,
+		.Pull = GPIO_NOPULL,
+		.Speed = GPIO_SPEED_FREQ_LOW,
+	});
+	HAL_GPIO_Init(GPIOA, &(GPIO_InitTypeDef) {
+		.Pin = GPIO_PIN_4|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_8,
+		.Mode = GPIO_MODE_INPUT,
+		.Pull = GPIO_PULLDOWN,
+	});
+}
+
+void HAL_MspInit() {
+  __HAL_RCC_SYSCFG_CLK_ENABLE();
+  __HAL_RCC_PWR_CLK_ENABLE();
+}
+
+void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi) {
+  if(hspi->Instance != SPI1) return;
+
+	__HAL_RCC_SPI1_CLK_ENABLE();
+	__HAL_RCC_GPIOA_CLK_ENABLE();
+
+	HAL_GPIO_Init(HH_IO_SPI_PORT, &spi_gpio);
+}
+
+void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi) {
+  if(hspi->Instance != SPI1) return;
+
+	__HAL_RCC_SPI1_CLK_DISABLE();
+
+	HAL_GPIO_DeInit(HH_IO_SPI_PORT, HH_IO_SPI_PINS);
+}
+
+void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base) {
+  if(htim_base->Instance != TIM3) return;
+
+	__HAL_RCC_TIM3_CLK_ENABLE();
+}
+
+void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base) {
+  if(htim_base->Instance != TIM3) return;
+
+	__HAL_RCC_TIM3_CLK_DISABLE();
+}
+
+void SysTick_Handler() {
+	HAL_IncTick();
+	if (xTaskGetSchedulerState() != taskSCHEDULER_NOT_STARTED)
+		xPortSysTickHandler();
+}
+
+void HardFault_Handler() {
+	for(;;);
+}
+
+void hh_io_setup_error_handler() {
+	__disable_irq();
+	while (1);
+}
diff --git a/src/stm32/setup.h b/src/stm32/setup.h
new file mode 100644
index 0000000..66d5ff3
--- /dev/null
+++ b/src/stm32/setup.h
@@ -0,0 +1,24 @@
+#pragma once
+
+#include <stm32f0xx_hal_spi.h>
+#include <stm32f0xx_hal_uart.h>
+#include <stm32f0xx_hal_tim.h>
+#include <stm32f0xx_hal_gpio.h>
+
+#define HH_IO_SPI_PINS (GPIO_PIN_5 | GPIO_PIN_7)
+#define HH_IO_SPI_PORT GPIOA
+
+extern UART_HandleTypeDef huart2; // NOLINT
+extern GPIO_InitTypeDef spi_gpio; // NOLINT
+extern SPI_HandleTypeDef hspi1; // NOLINT
+extern TIM_HandleTypeDef htim3; // NOLINT
+
+// required HAL setup functions
+void HAL_MspInit(); // NOLINT
+void HAL_UART_MspInit(UART_HandleTypeDef *huart); // NOLINT
+void HAL_SPI_MspInit(SPI_HandleTypeDef* hspi); // NOLINT
+void HAL_SPI_MspDeInit(SPI_HandleTypeDef* hspi); // NOLINT
+void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* htim_base); // NOLINT
+void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* htim_base); // NOLINT
+void HardFault_Handler(); // NOLINT
+void SysTick_Handler(); // NOLINT
diff --git a/src/stm32/stm32f0xx_hal_conf.h b/src/stm32/stm32f0xx_hal_conf.h
index fc27221..84a3b74 100644
--- a/src/stm32/stm32f0xx_hal_conf.h
+++ b/src/stm32/stm32f0xx_hal_conf.h
@@ -19,16 +19,18 @@
 #define DATA_CACHE_ENABLE 0U
 #define USE_SPI_CRC 0U
 
-#define HAL_RCC_MODULE_ENABLED
 #define HAL_MODULE_ENABLED
-#define HAL_I2C_MODULE_ENABLED
-#define HAL_GPIO_MODULE_ENABLED
-#define HAL_DMA_MODULE_ENABLED
-#define HAL_CORTEX_MODULE_ENABLED
-#define HAL_PWR_MODULE_ENABLED
-#define HAL_FLASH_MODULE_ENABLED
+#define HAL_SPI_MODULE_ENABLED
 #define HAL_TIM_MODULE_ENABLED
 #define HAL_UART_MODULE_ENABLED
+#define HAL_CORTEX_MODULE_ENABLED
+#define HAL_DMA_MODULE_ENABLED
+#define HAL_FLASH_MODULE_ENABLED
+#define HAL_GPIO_MODULE_ENABLED
+#define HAL_EXTI_MODULE_ENABLED
+#define HAL_PWR_MODULE_ENABLED
+#define HAL_RCC_MODULE_ENABLED
+// #define HAL_I2C_MODULE_ENABLED
 
 #ifdef HAL_RCC_MODULE_ENABLED
 #include <stm32f0xx_hal_rcc.h>
-- 
cgit v1.2.3


From bf8c5fdb43ae2446a502227a95f17167c3dcda33 Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Fri, 10 Mar 2023 13:12:02 +0100
Subject: add input emulation to test collision

---
 src/demo.c         | 153 +++++++++++++++++++++++++++++++--
 src/demo.h         |  35 ++++++++
 src/ds.mk          |   4 +-
 src/entity.h       |  15 ++++
 src/input.h        |  22 +++++
 src/main.c         | 248 +----------------------------------------------------
 src/ppusim/input.c |  16 ++++
 src/stm32.mk       |   3 +-
 src/stm32/input.c  |  13 +++
 9 files changed, 256 insertions(+), 253 deletions(-)
 create mode 100644 src/entity.h
 create mode 100644 src/input.h
 create mode 100644 src/ppusim/input.c
 create mode 100644 src/stm32/input.c

(limited to 'src/stm32')

diff --git a/src/demo.c b/src/demo.c
index 019750a..c4e4d7a 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -2,10 +2,36 @@
 
 #include "demo.h"
 #include "ppu/ppu.h"
+#include "input.h"
+#include "entity.h"
 
-#define HH_DEMO_BALL_COUNT 5
+#define HH_DEMO_BALL_COUNT 1
 hh_s_ppu_loc_fam_entry g_hh_demo_balls[HH_DEMO_BALL_COUNT];
 
+hh_s_entity_player g_hh_player_1 = {
+	.pos_x = 31000, //0b0000 0001 0011 0110
+	.pos_y = 21000,
+	.radius = 8,
+	.speed = 1,
+	.direction_x = 1,
+	.rotation = 8,
+	.in_air = false,
+};
+
+void playerMovement();
+
+uint16_t pos_x; //0b0000 0001 0011 0110
+uint16_t pos_y;
+uint8_t left = 0;
+uint8_t right = 0;
+uint8_t up = 0;
+uint8_t down = 0;
+uint8_t pos_x_bit[2];
+uint8_t pos_y_bit[2];
+uint8_t data_send[3];
+int tileX;
+int tileY;
+
 void hh_demo_setup() {
 	// load sprites
 	hh_ppu_update_sprite(0, HH_DBG_SPRITE_BALL);
@@ -39,6 +65,22 @@ void hh_demo_setup() {
 }
 
 void hh_demo_loop(unsigned long frame) {
+	playerMovement();
+
+	//adjust map size
+	pos_x = g_hh_player_1.pos_x / 100;
+	pos_y = g_hh_player_1.pos_y / 100;
+	
+	// input testing (no hitbox stuff)
+	// pos_x += (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right); // -1 = L || 1 == R
+	// pos_y += (-1 * g_hh_controller_p1.dpad_up) + (1 * g_hh_controller_p1.dpad_down); // -1 = D || 1 == U
+
+	// update player sprite on ppu
+	g_hh_demo_balls[0].position_x = pos_x;
+	g_hh_demo_balls[0].position_y = pos_y;
+	hh_ppu_update_foreground(0, g_hh_demo_balls[0]);
+
+
 	// set background pattern position
 	hh_ppu_update_aux((hh_s_ppu_loc_aux) {
 		.bg_shift_x = (frame / 2) % HH_PPU_SPRITE_WIDTH,
@@ -46,10 +88,111 @@ void hh_demo_loop(unsigned long frame) {
 		.fg_fetch = 0,
 		.sysreset = 0,
 	});
+}
+
+// void sendData(uint8_t address, uint16_t data) {
+// 	uint8_t bitData[3];
+// 	bitData[2] = data & 0xff;
+// 	bitData[1] = (data >> 8);
+// 	bitData[0] = address; // first byte is address
+// 
+// 	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_9, GPIO_PIN_RESET);
+// 	HAL_SPI_Transmit(&hspi1, bitData, 3, 100); //2*8 bit data
+// 	HAL_GPIO_WritePin(GPIOA, GPIO_PIN_9, GPIO_PIN_SET);
+// }
+
+void playerMovement() {
+	int8_t directionX = (-1 * g_hh_controller_p1.dpad_left) + (1 * g_hh_controller_p1.dpad_right); // -1 = L || 1 == R
+	int8_t directionY = (-1 * g_hh_controller_p1.dpad_down) + (1 * g_hh_controller_p1.dpad_up); // -1 = D || 1 == U
+
+	uint8_t i,j;
+	uint8_t rotation = 0; // 0-7
+
+	//rotation calc
+	for(i = -1; i < 2;i++)
+	{
+		for(j = -1; j < 2; j++)
+		{
+			if(directionX == i)
+			{
+				if(directionY == j)
+				{
+					if(i != 0 && j != 0) //dont update when player idle
+					{
+						g_hh_player_1.rotation = rotation;
+					}
+				}
+			}
+		rotation++;
+		}
+	}
+	//direction calc
+	if(directionX != 0) //update direction if player is not idle
+	{
+		g_hh_player_1.direction_x = directionX;
+	}
+	//collision map x-axis
+
+	//tile calc including radius and direction for background coliision
+
+	uint16_t tileColX;
+	uint16_t tileColY = ( g_hh_player_1.pos_y / 100) / 16; ;
+
+	// remaining space between grid and exact
+	uint8_t modTileX;
+	uint8_t modTileY;
+
+	if(g_hh_player_1.in_air == false && directionX != 0)
+	{
+		if(directionX == 1)
+		{
+			tileColX = ( ( g_hh_player_1.pos_x / 100) + g_hh_player_1.radius ) / 20;
+			modTileX = ( g_hh_player_1.pos_x + ( 100 * g_hh_player_1.radius ) ) % 2000;
+		}
+		else if(directionX == -1)
+		{
+			tileColX = ( ( g_hh_player_1.pos_x / 100) - g_hh_player_1.radius ) / 20;
+			modTileX = ( g_hh_player_1.pos_x - ( 100 * g_hh_player_1.radius ) ) % 2000;
+		}
+
+			if(HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + directionX] != 1)
+			{
+				g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * g_hh_player_1.speed); // NEW x set
+			}
+
+			else if(HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + directionX] == 1)
+			{
+				if(modTileX < g_hh_player_1.speed)
+				{
+					g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * modTileX); // NEW x set
+				}
+				else
+				{
+					g_hh_player_1.pos_x = g_hh_player_1.pos_x + (directionX * g_hh_player_1.speed); // NEW x set
+				}
+			}
+
+	}
+	else //if in air different all borders have to be checked
+	{
 
-	for (unsigned i = 0; i < HH_DEMO_BALL_COUNT; i++) {
-		g_hh_demo_balls[i].position_x = HH_PPU_SCREEN_WIDTH/2  - HH_PPU_SPRITE_WIDTH/2  + (int)(60 * (double)sin((1*(double)frame / 10) + (double)i * 12));
-		g_hh_demo_balls[i].position_y = HH_PPU_SCREEN_HEIGHT/2 - HH_PPU_SPRITE_HEIGHT/2 + (int)(30 * (double)sin((2*(double)frame / 10) + (double)i * 12));
-		hh_ppu_update_foreground(i, g_hh_demo_balls[i]);
 	}
+
+	//collision map floor (y-axis) (falling)
+	// if falling no jump press (implement)
+	/*
+	tileColY = (( g_hh_player_1.pos_y / 100) + g_hh_player_1.radius) / 16; //bottom of player box
+	modTileY = 1;
+	if(HH_DEMO_HITBOX_TILEMAP[tileColY+1][tileColX] != 1) //rework after jumping
+	{
+		g_hh_player_1.pos_y = g_hh_player_1.pos_y + 5 ;// NEW y set //makew var gravity
+		//playerStat = falling; //for later use of graphics/sound
+	}
+	*/
+	//else if(HH_DEMO_HITBOX_TILEMAP[])
+
+
+
+
+
 }
diff --git a/src/demo.h b/src/demo.h
index 89436b5..ddf8403 100644
--- a/src/demo.h
+++ b/src/demo.h
@@ -42,3 +42,38 @@ static const hh_s_ppu_loc_sprite HH_DBG_SPRITE_CHECKERBOARD = {
 	0, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0,
 	0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0
 };
+
+static const uint8_t HH_DEMO_HITBOX_TILEMAP[30][40] =
+  {
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
+		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 }
+  };
+
diff --git a/src/ds.mk b/src/ds.mk
index b5633b3..57d1776 100644
--- a/src/ds.mk
+++ b/src/ds.mk
@@ -11,5 +11,5 @@ DESKTOP_SRCS += ppusim/sim.c \
 								ppusim/mem.c \
 								ppusim/pixel.c \
 								ppusim/work.c \
-								ds.c
-
+								ds.c \
+						    ppusim/input.c
diff --git a/src/entity.h b/src/entity.h
new file mode 100644
index 0000000..20cbf42
--- /dev/null
+++ b/src/entity.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
+
+typedef struct {
+	uint16_t pos_x;
+	uint16_t pos_y;
+	uint8_t radius;
+	uint8_t rotation; //45 degrees steps 0 == right 2 == down 4 == left 6 == up
+	uint8_t direction_x; //direction where its looking at in case no input;
+	int8_t speed;	//10 default L/R MODifier
+	bool in_air;
+} hh_s_entity_player;
+
diff --git a/src/input.h b/src/input.h
new file mode 100644
index 0000000..adacba2
--- /dev/null
+++ b/src/input.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <stdbool.h>
+
+/** @brief game controller state */
+typedef struct {
+	bool dpad_up;
+	bool dpad_down;
+	bool dpad_left;
+	bool dpad_right;
+	bool button_primary;
+	bool button_secondary;
+} hh_s_gamepad;
+
+/** @brief player 1's controller */
+extern hh_s_gamepad g_hh_controller_p1;
+/** @brief player 2's controller */
+extern hh_s_gamepad g_hh_controller_p2;
+
+/** @brief update g_hh_controller_p1 and 2 by reading buttons */
+void hh_input_read();
+
diff --git a/src/main.c b/src/main.c
index ee6125f..fa63aa2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,97 +2,12 @@
 
 #include "main.h"
 #include "demo.h"
+#include "input.h"
 
 bool g_hh_run = true;
 
-static int8_t buttonDPAD[] = {0,0,0,0}; //1left 2right 3down 4up
-
-struct playerData{
-	uint16_t posX;
-	uint16_t posY;
-	uint8_t radius;
-	uint8_t rotation; //45 degrees steps 0 == right 2 == down 4 == left 6 == up
-	uint8_t directionX; //direction where its looking at in case no input;
-	int8_t speed;	//10 default L/R MODifier
-	bool inAir;
-
-};
-
-struct playerData player1;
-
-uint8_t tileMap[30][40] =
-  {
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,0,0,0,0,0,0,0,0,0,0 ,0,0,0,0,0,0,0,0,0,0 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 },
-		  {1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 ,1,1,1,1,1,1,1,1,1,1 }
-
-
-
-  };
-
-void buttonRead();
-void playerMovement();
-void sendData(uint8_t, uint16_t);
-
-  uint16_t pos_x; //0b0000 0001 0011 0110
-  uint16_t pos_y;
-
-  uint8_t left = 0;
-  uint8_t right = 0;
-  uint8_t up = 0;
-  uint8_t down = 0;
-
-
-
-  uint8_t pos_x_bit[2];
-  uint8_t pos_y_bit[2];
-  uint8_t data_send[3];
-
-  int tileX;
-  int tileY;
-//  struct playerData player1;
- //int buttons[] = {GPIO_PIN_4,GPIO_PIN_5,GPIO_PIN_6,GPIO_PIN_8}; // 1 left // 2 right // 3 up // 4 down
-
-
 int main() {
 	hh_setup();
-
-/// init struct
-  player1.posX = 31000; //0b0000 0001 0011 0110
-  player1.posY = 21000;
-  player1.radius = 8;
-  player1.speed = 1;
-  player1.directionX = 1;
-  player1.rotation = 8;
-  player1.inAir = false;
-
 	hh_loop();
 	hh_exit();
 	return 0;
@@ -100,165 +15,8 @@ int main() {
 
 void hh_ppu_vblank_interrupt() {
 	static unsigned long frame = 0;
+	hh_input_read();
+	hh_demo_loop(frame);
 	frame++;
-
-	buttonRead();
-	playerMovement();
-
-
-	// send data via SPI //adjust map size
-	pos_x = player1.posX / 100;
-	pos_y = player1.posY / 100;
-
-	sendData(0b01000000,pos_x);
-	sendData(0b00000000,pos_y);
-
-	// hh_demo_loop(frame);
 }
 
-void sendData(uint8_t address, uint16_t data)
-{
-			uint8_t bitData[3];
-			bitData[2] = data & 0xff;
-			bitData[1] = (data >> 8);
-			bitData[0] = address; // first byte is address
-
-
-
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_9, GPIO_PIN_RESET);
-			HAL_SPI_Transmit(&hspi1, bitData, 3, 100); //2*8 bit data
-			HAL_GPIO_WritePin(GPIOA, GPIO_PIN_9, GPIO_PIN_SET);
-
-}
-
-void buttonRead()
-{
-	//int buttons[] = {GPIO_PIN_4,GPIO_PIN_5,GPIO_PIN_6,GPIO_PIN_8}; // 1 left // 2 right // 3 down // 4 up  8-6-4-5
-	uint16_t buttons[] = {0x0100U,0x0040U,0x0010U,0x0020U}; // 1 left // 2 right // 3 down // 4 up
-
-	for(int i = 0; i < 4; i++)
-	{
-		if(HAL_GPIO_ReadPin(GPIOB, buttons[i]) == 1)
-		{
-			if((i+2) % 2 == 0)
-			{
-				buttonDPAD[i] = 1;
-			}
-			else
-			{
-				buttonDPAD[i] = -1;
-			}
-		}
-		else
-		{
-			buttonDPAD[i] = 0;
-		}
-	}
-}
-
-void playerMovement()
-{
-
-	int8_t directionX = 0; // -1 = L || 1 == R
-	int8_t directionY = 0; // -1 = D || 1 == U
-
-	uint8_t i,j;
-	uint8_t rotation = 0; // 0-7
-	//temp var for testing
-
-
-
-	// direction calc
-	directionX = buttonDPAD[0] + buttonDPAD[1];
-	directionY = buttonDPAD[2] + buttonDPAD[3];
-
-	//rotation calc
-	for(i = -1; i < 2;i++)
-	{
-		for(j = -1; j < 2; j++)
-		{
-			if(directionX == i)
-			{
-				if(directionY == j)
-				{
-					if(i != 0 && j != 0) //dont update when player idle
-					{
-						player1.rotation = rotation;
-					}
-				}
-			}
-		rotation++;
-		}
-	}
-	//direction calc
-	if(directionX != 0) //update direction if player is not idle
-	{
-		player1.directionX = directionX;
-	}
-	//collision map x-axis
-
-	//tile calc including radius and direction for background coliision
-
-	uint16_t tileColX;
-	uint16_t tileColY = ( player1.posY / 100) / 16; ;
-
-	// remaining space between grid and exact
-	uint8_t modTileX;
-	uint8_t modTileY;
-
-
-
-	if(player1.inAir == false && directionX != 0)
-	{
-		if(directionX == 1)
-		{
-			tileColX = ( ( player1.posX / 100) + player1.radius ) / 20;
-			modTileX = ( player1.posX + ( 100 * player1.radius ) ) % 2000;
-		}
-		else if(directionX == -1)
-		{
-			tileColX = ( ( player1.posX / 100) - player1.radius ) / 20;
-			modTileX = ( player1.posX - ( 100 * player1.radius ) ) % 2000;
-		}
-
-			if(tileMap[tileColY][tileColX + directionX] != 1)
-			{
-				player1.posX = player1.posX + (directionX * player1.speed); // NEW x set
-			}
-
-			else if(tileMap[tileColY][tileColX + directionX] == 1)
-			{
-				if(modTileX < player1.speed)
-				{
-					player1.posX = player1.posX + (directionX * modTileX); // NEW x set
-				}
-				else
-				{
-					player1.posX = player1.posX + (directionX * player1.speed); // NEW x set
-				}
-			}
-
-	}
-	else //if in air different all borders have to be checked
-	{
-
-	}
-
-	//collision map floor (y-axis) (falling)
-	// if falling no jump press (implement)
-	/*
-	tileColY = (( player1.posY / 100) + player1.radius) / 16; //bottom of player box
-	modTileY = 1;
-	if(tileMap[tileColY+1][tileColX] != 1) //rework after jumping
-	{
-		player1.posY = player1.posY + 5 ;// NEW y set //makew var gravity
-		//playerStat = falling; //for later use of graphics/sound
-	}
-	*/
-	//else if(tileMap[])
-
-
-
-
-
-}
diff --git a/src/ppusim/input.c b/src/ppusim/input.c
new file mode 100644
index 0000000..bdb94ac
--- /dev/null
+++ b/src/ppusim/input.c
@@ -0,0 +1,16 @@
+#include <SDL2/SDL.h>
+
+#include "input.h"
+
+hh_s_gamepad g_hh_controller_p1 = { 0 };
+hh_s_gamepad g_hh_controller_p2 = { 0 };
+
+void hh_input_read() {
+	// SDL_PumpEvents();
+	const Uint8* kb = SDL_GetKeyboardState(NULL);
+	g_hh_controller_p1.dpad_up = kb[SDL_SCANCODE_W];
+	g_hh_controller_p1.dpad_down = kb[SDL_SCANCODE_S];
+	g_hh_controller_p1.dpad_left = kb[SDL_SCANCODE_A];
+	g_hh_controller_p1.dpad_right = kb[SDL_SCANCODE_D];
+}
+
diff --git a/src/stm32.mk b/src/stm32.mk
index eab34a4..3b5ccb9 100644
--- a/src/stm32.mk
+++ b/src/stm32.mk
@@ -62,5 +62,6 @@ STM_SRCS += lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal.c \
 STM_SRCS += stm32/idle_task_static_memory.c \
 						stm32/main.c \
 						stm32/setup.c \
-						ppu/stm.c
+						ppu/stm.c \
+						stm32/input.c
 
diff --git a/src/stm32/input.c b/src/stm32/input.c
new file mode 100644
index 0000000..e2d07cb
--- /dev/null
+++ b/src/stm32/input.c
@@ -0,0 +1,13 @@
+#include <stm32f0xx_hal_gpio.h>
+
+#include "input.h"
+
+hh_s_gamepad g_hh_controller_p1 = { 0 };
+hh_s_gamepad g_hh_controller_p2 = { 0 };
+
+void hh_input_read() {
+	g_hh_controller_p1.dpad_left = HAL_GPIO_ReadPin(GPIOB, GPIO_PIN_4);
+	g_hh_controller_p1.dpad_right = HAL_GPIO_ReadPin(GPIOB, GPIO_PIN_5);
+	g_hh_controller_p1.dpad_down = HAL_GPIO_ReadPin(GPIOB, GPIO_PIN_6);
+	g_hh_controller_p1.dpad_up = HAL_GPIO_ReadPin(GPIOB, GPIO_PIN_8);
+}
-- 
cgit v1.2.3