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/ds.c                       |  15 +++
 src/ds.mk                      |   3 +-
 src/main.c                     | 247 +++++++++++++++++++++++++++++++++++++++--
 src/ppu/stm.c                  |   4 +
 src/stm32.mk                   |  30 ++---
 src/stm32/setup.c              | 197 ++++++++++++++++++++++++++++++++
 src/stm32/setup.h              |  24 ++++
 src/stm32/stm32f0xx_hal_conf.h |  16 +--
 8 files changed, 506 insertions(+), 30 deletions(-)
 create mode 100644 src/ds.c
 create mode 100644 src/ppu/stm.c
 create mode 100644 src/stm32/setup.c
 create mode 100644 src/stm32/setup.h

(limited to 'src')

diff --git a/src/ds.c b/src/ds.c
new file mode 100644
index 0000000..d6d4357
--- /dev/null
+++ b/src/ds.c
@@ -0,0 +1,15 @@
+#include "main.h"
+#include "ppu/ppu.h"
+#include "demo.h"
+
+void hh_setup() {
+	hh_ppu_init();
+
+	hh_demo_setup();
+}
+
+void hh_exit() {
+	g_hh_run = false;
+
+	hh_ppu_deinit();
+}
diff --git a/src/ds.mk b/src/ds.mk
index d4354a2..b5633b3 100644
--- a/src/ds.mk
+++ b/src/ds.mk
@@ -10,5 +10,6 @@ endif
 DESKTOP_SRCS += ppusim/sim.c \
 								ppusim/mem.c \
 								ppusim/pixel.c \
-								ppusim/work.c
+								ppusim/work.c \
+								ds.c
 
diff --git a/src/main.c b/src/main.c
index f4de225..ee6125f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,13 +1,98 @@
 #include <stdlib.h>
 
 #include "main.h"
-#include "ppu/ppu.h"
 #include "demo.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;
@@ -17,17 +102,163 @@ void hh_ppu_vblank_interrupt() {
 	static unsigned long frame = 0;
 	frame++;
 
-	hh_demo_loop(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 hh_setup() {
-	hh_ppu_init();
+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);
 
-	hh_demo_setup();
 }
 
-void hh_exit() {
-	g_hh_run = false;
+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[])
+
+
+
+
 
-	hh_ppu_deinit();
 }
diff --git a/src/ppu/stm.c b/src/ppu/stm.c
new file mode 100644
index 0000000..fd4a18c
--- /dev/null
+++ b/src/ppu/stm.c
@@ -0,0 +1,4 @@
+#include "ppu/ppu.h"
+
+void hh_ppu_init() {}
+void hh_ppu_deinit() {}
diff --git a/src/stm32.mk b/src/stm32.mk
index 6926dea..eab34a4 100644
--- a/src/stm32.mk
+++ b/src/stm32.mk
@@ -43,22 +43,24 @@ STM_SRCS += lib/FreeRTOS-Kernel/croutine.c \
             lib/FreeRTOS-Kernel/timers.c \
             lib/FreeRTOS-Kernel/portable/GCC/ARM_CM0/port.c \
             lib/FreeRTOS-Kernel/portable/MemMang/heap_4.c
-STM_SRCS += lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_rcc.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_rcc_ex.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_i2c.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_i2c_ex.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_gpio.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_dma.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_cortex.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_pwr.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_pwr_ex.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_flash.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_flash_ex.c \
+STM_SRCS += lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_spi.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_spi_ex.c \
             lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_tim.c \
             lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_tim_ex.c \
             lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_uart.c \
-            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_uart_ex.c
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_uart_ex.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_cortex.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_dma.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_flash.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_flash_ex.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_gpio.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_pwr.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_pwr_ex.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_rcc.c \
+            lib/STM32-base-STM32Cube/HAL/STM32F0xx/src/stm32f0xx_hal_rcc_ex.c
 STM_SRCS += stm32/idle_task_static_memory.c \
-						stm32/main.c
+						stm32/main.c \
+						stm32/setup.c \
+						ppu/stm.c
 
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')

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


From c37397234534e9888dfeed9b1728c46646c33b58 Mon Sep 17 00:00:00 2001
From: lonkaars <loek@pipeframe.xyz>
Date: Fri, 10 Mar 2023 13:16:16 +0100
Subject: `clang-format`

---
 src/demo.c          | 182 +++++++++++++++++++++++-----------------------------
 src/ds.c            |   2 +-
 src/main.c          |   3 +-
 src/makefile        |   4 +-
 src/ppu/internals.c |  75 +++++++---------------
 src/ppu/ppu.c       |  22 +++----
 src/ppusim/input.c  |  13 ++--
 src/ppusim/mem.c    |   4 +-
 src/ppusim/pixel.c  |  77 +++++++++++-----------
 src/ppusim/sim.c    |  16 +++--
 src/ppusim/work.c   |  35 +++++-----
 11 files changed, 186 insertions(+), 247 deletions(-)

(limited to 'src')

diff --git a/src/demo.c b/src/demo.c
index c4e4d7a..b9bba17 100644
--- a/src/demo.c
+++ b/src/demo.c
@@ -1,36 +1,36 @@
 #include <math.h>
 
 #include "demo.h"
-#include "ppu/ppu.h"
-#include "input.h"
 #include "entity.h"
+#include "input.h"
+#include "ppu/ppu.h"
 
 #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,
+	.pos_x		 = 31000, // 0b0000 0001 0011 0110
+	.pos_y		 = 21000,
+	.radius		 = 8,
+	.speed		 = 1,
 	.direction_x = 1,
-	.rotation = 8,
-	.in_air = false,
+	.rotation	 = 8,
+	.in_air		 = false,
 };
 
-void playerMovement();
+void hh_player_movement();
 
-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;
+uint16_t g_hh_pos_x; // 0b0000 0001 0011 0110
+uint16_t g_hh_pos_y;
+uint8_t g_hh_left  = 0;
+uint8_t g_hh_right = 0;
+uint8_t g_hh_up	  = 0;
+uint8_t g_hh_down  = 0;
+uint8_t g_hh_pos_x_bit[2];
+uint8_t g_hh_pos_y_bit[2];
+uint8_t g_hh_data_send[3];
+int g_hh_tile_x;
+int g_hh_tile_y;
 
 void hh_demo_setup() {
 	// load sprites
@@ -38,55 +38,54 @@ void hh_demo_setup() {
 	hh_ppu_update_sprite(1, HH_DBG_SPRITE_CHECKERBOARD);
 
 	// background pattern
-	hh_ppu_update_color(0, 1, (hh_ppu_rgb_color_t) {0x4, 0x4, 0x4});
+	hh_ppu_update_color(0, 1, (hh_ppu_rgb_color_t){0x4, 0x4, 0x4});
 	for (unsigned i = 0; i < HH_PPU_BG_CANVAS_TILES_H * HH_PPU_BG_CANVAS_TILES_V; i++) {
-		hh_ppu_update_background(i, (hh_s_ppu_loc_bam_entry) {
-			.horizontal_flip = false,
-			.vertical_flip = false,
-			.palette_index = 0,
-			.tilemap_index = 1,
-		});
+		hh_ppu_update_background(i, (hh_s_ppu_loc_bam_entry){
+										.horizontal_flip = false,
+										.vertical_flip	 = false,
+										.palette_index	 = 0,
+										.tilemap_index	 = 1,
+									});
 	}
 
 	// cool colors
-	hh_ppu_update_color(1, 1, (hh_ppu_rgb_color_t) {0xf, 0x0, 0xf});
-	hh_ppu_update_color(2, 1, (hh_ppu_rgb_color_t) {0xf, 0xf, 0xf});
-	hh_ppu_update_color(3, 1, (hh_ppu_rgb_color_t) {0xf, 0x0, 0x0});
-	hh_ppu_update_color(4, 1, (hh_ppu_rgb_color_t) {0x0, 0xf, 0xf});
-	hh_ppu_update_color(5, 1, (hh_ppu_rgb_color_t) {0x0, 0x0, 0xf});
+	hh_ppu_update_color(1, 1, (hh_ppu_rgb_color_t){0xf, 0x0, 0xf});
+	hh_ppu_update_color(2, 1, (hh_ppu_rgb_color_t){0xf, 0xf, 0xf});
+	hh_ppu_update_color(3, 1, (hh_ppu_rgb_color_t){0xf, 0x0, 0x0});
+	hh_ppu_update_color(4, 1, (hh_ppu_rgb_color_t){0x0, 0xf, 0xf});
+	hh_ppu_update_color(5, 1, (hh_ppu_rgb_color_t){0x0, 0x0, 0xf});
 
 	// balls
 	for (unsigned i = 0; i < HH_DEMO_BALL_COUNT; i++) {
 		g_hh_demo_balls[i].horizontal_flip = false;
-		g_hh_demo_balls[i].vertical_flip = false;
-		g_hh_demo_balls[i].palette_index = i+1;
-		g_hh_demo_balls[i].tilemap_index = 0;
+		g_hh_demo_balls[i].vertical_flip   = false;
+		g_hh_demo_balls[i].palette_index   = i + 1;
+		g_hh_demo_balls[i].tilemap_index   = 0;
 	}
 }
 
 void hh_demo_loop(unsigned long frame) {
-	playerMovement();
+	hh_player_movement();
+
+	// adjust map size
+	g_hh_pos_x = g_hh_player_1.pos_x / 100;
+	g_hh_pos_y = g_hh_player_1.pos_y / 100;
 
-	//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;
+	g_hh_demo_balls[0].position_x = g_hh_pos_x;
+	g_hh_demo_balls[0].position_y = g_hh_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) {
+	hh_ppu_update_aux((hh_s_ppu_loc_aux){
 		.bg_shift_x = (frame / 2) % HH_PPU_SPRITE_WIDTH,
 		.bg_shift_y = (frame / 8) % HH_PPU_SPRITE_HEIGHT,
-		.fg_fetch = 0,
-		.sysreset = 0,
+		.fg_fetch	= 0,
+		.sysreset	= 0,
 	});
 }
 
@@ -95,91 +94,77 @@ void hh_demo_loop(unsigned long frame) {
 // 	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() {
+void hh_player_movement() {
 	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
+	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 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
+	// 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++;
+			rotation++;
 		}
 	}
-	//direction calc
-	if(directionX != 0) //update direction if player is not idle
+	// direction calc
+	if (directionX != 0) // update direction if player is not idle
 	{
 		g_hh_player_1.direction_x = directionX;
 	}
-	//collision map x-axis
+	// collision map x-axis
 
-	//tile calc including radius and direction for background coliision
+	// tile calc including radius and direction for background coliision
 
 	uint16_t tileColX;
-	uint16_t tileColY = ( g_hh_player_1.pos_y / 100) / 16; ;
+	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;
+	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;
 		}
-		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
 		}
 
-			if(HH_DEMO_HITBOX_TILEMAP[tileColY][tileColX + directionX] != 1)
-			{
+		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(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
+	} else // if in air different all borders have to be checked
 	{
-
 	}
 
-	//collision map floor (y-axis) (falling)
-	// if falling no jump press (implement)
+	// 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;
@@ -189,10 +174,5 @@ void playerMovement() {
 		//playerStat = falling; //for later use of graphics/sound
 	}
 	*/
-	//else if(HH_DEMO_HITBOX_TILEMAP[])
-
-
-
-
-
+	// else if(HH_DEMO_HITBOX_TILEMAP[])
 }
diff --git a/src/ds.c b/src/ds.c
index d6d4357..24ef58f 100644
--- a/src/ds.c
+++ b/src/ds.c
@@ -1,6 +1,6 @@
+#include "demo.h"
 #include "main.h"
 #include "ppu/ppu.h"
-#include "demo.h"
 
 void hh_setup() {
 	hh_ppu_init();
diff --git a/src/main.c b/src/main.c
index fa63aa2..191d5d9 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 
-#include "main.h"
 #include "demo.h"
 #include "input.h"
+#include "main.h"
 
 bool g_hh_run = true;
 
@@ -19,4 +19,3 @@ void hh_ppu_vblank_interrupt() {
 	hh_demo_loop(frame);
 	frame++;
 }
-
diff --git a/src/makefile b/src/makefile
index 1115874..c69bfb5 100644
--- a/src/makefile
+++ b/src/makefile
@@ -81,8 +81,8 @@ compile_commands.json: makefile stm32.mk ds.mk
 
 PHONY += format
 format:
-	clang-format -i $(LOCAL_SRCS)
-	clang-tidy --fix-errors $(LOCAL_SRCS)
+	clang-format -i $(LOCAL_SRCS) $(DESKTOP_SRCS)
+	clang-tidy --fix-errors $(LOCAL_SRCS) $(DESKTOP_SRCS)
 
 PHONY += clean
 clean:
diff --git a/src/ppu/internals.c b/src/ppu/internals.c
index 650ba3e..b8d3e27 100644
--- a/src/ppu/internals.c
+++ b/src/ppu/internals.c
@@ -1,8 +1,8 @@
 #include <stdlib.h>
 
-#include "ppu/types.h"
-#include "ppu/internals.h"
 #include "ppu/consts.h"
+#include "ppu/internals.h"
+#include "ppu/types.h"
 
 bool hh_ppu_vram_valid_address(hh_ppu_addr_t addr) {
 #pragma GCC diagnostic push
@@ -17,88 +17,59 @@ bool hh_ppu_vram_valid_address(hh_ppu_addr_t addr) {
 }
 
 void hh_ppu_vram_write(hh_s_ppu_vram_data data) {
-	for (unsigned i = 0; i < data.size; i++)
-		hh_ppu_vram_dwrite(data.offset + i, data.data[i]);
+	for (unsigned i = 0; i < data.size; i++) hh_ppu_vram_dwrite(data.offset + i, data.data[i]);
 }
 
 hh_s_ppu_vram_data hh_ppu_2nat_bam(hh_s_ppu_loc_bam_entry e) {
-	hh_ppu_data_t* data = malloc(sizeof(hh_ppu_data_t) * HH_PPU_VRAM_BAM_ENTRY_SIZE);
+	hh_ppu_data_t *data = malloc(sizeof(hh_ppu_data_t) * HH_PPU_VRAM_BAM_ENTRY_SIZE);
 
-	data[0] = HH_RESIZE(e.tilemap_index, 9, 0) << 0 |
-	          HH_RESIZE(e.palette_index, 2, 0) << 10 |
-	          e.vertical_flip << 13 |
-	          e.horizontal_flip << 14;
+	data[0] = HH_RESIZE(e.tilemap_index, 9, 0) << 0 | HH_RESIZE(e.palette_index, 2, 0) << 10 | e.vertical_flip << 13 | e.horizontal_flip << 14;
 
-	hh_s_ppu_vram_data out = {
-		.data = data,
-		.size = HH_PPU_VRAM_FAM_ENTRY_SIZE
-	};
+	hh_s_ppu_vram_data out = {.data = data, .size = HH_PPU_VRAM_FAM_ENTRY_SIZE};
 	return out;
 }
 
 hh_s_ppu_vram_data hh_ppu_2nat_fam(hh_s_ppu_loc_fam_entry e) {
-	hh_ppu_data_t* data = malloc(sizeof(hh_ppu_data_t) * HH_PPU_VRAM_FAM_ENTRY_SIZE);
+	hh_ppu_data_t *data = malloc(sizeof(hh_ppu_data_t) * HH_PPU_VRAM_FAM_ENTRY_SIZE);
 
 	e.position_x += 16;
 	e.position_y += 16;
-	data[0] = HH_RESIZE(e.tilemap_index, 9, 0) << 0 |
-	          HH_RESIZE(e.palette_index, 2, 0) << 10 |
-	          HH_RESIZE(e.position_y, 2, 0) << 13;
-	data[1] = HH_RESIZE(e.position_y, 7, 3) << 0 |
-	          HH_RESIZE(e.position_x, 8, 0) << 5 |
-	          e.vertical_flip << 14 |
-	          e.horizontal_flip << 15;
-
-	hh_s_ppu_vram_data out = {
-		.data = data,
-		.size = HH_PPU_VRAM_FAM_ENTRY_SIZE
-	};
+	data[0] = HH_RESIZE(e.tilemap_index, 9, 0) << 0 | HH_RESIZE(e.palette_index, 2, 0) << 10 | HH_RESIZE(e.position_y, 2, 0) << 13;
+	data[1] = HH_RESIZE(e.position_y, 7, 3) << 0 | HH_RESIZE(e.position_x, 8, 0) << 5 | e.vertical_flip << 14 | e.horizontal_flip << 15;
+
+	hh_s_ppu_vram_data out = {.data = data, .size = HH_PPU_VRAM_FAM_ENTRY_SIZE};
 	return out;
 }
 
 hh_s_ppu_vram_data hh_ppu_2nat_aux(hh_s_ppu_loc_aux aux) {
-	hh_ppu_data_t* data = malloc(sizeof(hh_ppu_data_t) * HH_PPU_VRAM_AUX_SIZE);
-
-	data[0] = HH_RESIZE(aux.bg_shift_y, 7, 0) << 0 |
-	          HH_RESIZE(aux.bg_shift_x, 7, 0) << 8;
-	data[1] = HH_RESIZE(aux.bg_shift_x, 8, 8) << 0 |
-	          aux.fg_fetch << 1 |
-	          aux.sysreset << 2;
-
-	hh_s_ppu_vram_data out = {
-		.data = data,
-		.size = HH_PPU_VRAM_AUX_SIZE
-	};
+	hh_ppu_data_t *data = malloc(sizeof(hh_ppu_data_t) * HH_PPU_VRAM_AUX_SIZE);
+
+	data[0] = HH_RESIZE(aux.bg_shift_y, 7, 0) << 0 | HH_RESIZE(aux.bg_shift_x, 7, 0) << 8;
+	data[1] = HH_RESIZE(aux.bg_shift_x, 8, 8) << 0 | aux.fg_fetch << 1 | aux.sysreset << 2;
+
+	hh_s_ppu_vram_data out = {.data = data, .size = HH_PPU_VRAM_AUX_SIZE};
 	return out;
 }
 
 hh_s_ppu_vram_data hh_ppu_2nat_sprite(const hh_ppu_loc_sprite_data_t sprite_data) {
-	hh_ppu_data_t* data = malloc(sizeof(hh_ppu_data_t) * HH_PPU_VRAM_TMM_SPRITE_SIZE);
+	hh_ppu_data_t *data = malloc(sizeof(hh_ppu_data_t) * HH_PPU_VRAM_TMM_SPRITE_SIZE);
 
 	for (unsigned i = 0; i < HH_PPU_SPRITE_WIDTH * HH_PPU_SPRITE_HEIGHT; i++) {
-		unsigned word = i / 5;
+		unsigned word  = i / 5;
 		unsigned pixel = i % 5;
 		if (pixel == 0) data[word] = 0;
 		data[word] |= HH_RESIZE(sprite_data[i], 2, 0) << pixel * 3;
 	}
 
-	hh_s_ppu_vram_data out = {
-		.data = data,
-		.size = HH_PPU_VRAM_TMM_SPRITE_SIZE
-	};
+	hh_s_ppu_vram_data out = {.data = data, .size = HH_PPU_VRAM_TMM_SPRITE_SIZE};
 	return out;
 }
 
 hh_s_ppu_vram_data hh_ppu_2nat_color(hh_ppu_rgb_color_t rgb) {
-	hh_ppu_data_t* data = malloc(sizeof(hh_ppu_data_t) * HH_PPU_VRAM_PAL_ENTRY_SIZE);
+	hh_ppu_data_t *data = malloc(sizeof(hh_ppu_data_t) * HH_PPU_VRAM_PAL_ENTRY_SIZE);
 
-	data[0] = HH_RESIZE(rgb[0], 3, 0) << 8 |
-	          HH_RESIZE(rgb[1], 3, 0) << 4 |
-	          HH_RESIZE(rgb[2], 3, 0) << 0;
+	data[0] = HH_RESIZE(rgb[0], 3, 0) << 8 | HH_RESIZE(rgb[1], 3, 0) << 4 | HH_RESIZE(rgb[2], 3, 0) << 0;
 
-	hh_s_ppu_vram_data out = {
-		.data = data,
-		.size = HH_PPU_VRAM_PAL_ENTRY_SIZE
-	};
+	hh_s_ppu_vram_data out = {.data = data, .size = HH_PPU_VRAM_PAL_ENTRY_SIZE};
 	return out;
 }
diff --git a/src/ppu/ppu.c b/src/ppu/ppu.c
index 5f33c55..df14b9f 100644
--- a/src/ppu/ppu.c
+++ b/src/ppu/ppu.c
@@ -1,52 +1,48 @@
 #include <stdlib.h>
 
-#include "ppu/ppu.h"
-#include "ppu/internals.h"
 #include "ppu/consts.h"
+#include "ppu/internals.h"
+#include "ppu/ppu.h"
 
 void hh_ppu_update_foreground(unsigned index, hh_s_ppu_loc_fam_entry e) {
 	hh_s_ppu_vram_data s = hh_ppu_2nat_fam(e);
-	s.offset = HH_PPU_VRAM_FAM_OFFSET + HH_PPU_VRAM_FAM_ENTRY_SIZE * index;
+	s.offset			 = HH_PPU_VRAM_FAM_OFFSET + HH_PPU_VRAM_FAM_ENTRY_SIZE * index;
 	hh_ppu_vram_write(s);
 	free(s.data);
 }
 
 void hh_ppu_update_background(unsigned index, hh_s_ppu_loc_bam_entry e) {
 	hh_s_ppu_vram_data s = hh_ppu_2nat_bam(e);
-	s.offset = HH_PPU_VRAM_BAM_OFFSET + HH_PPU_VRAM_BAM_ENTRY_SIZE * index;
+	s.offset			 = HH_PPU_VRAM_BAM_OFFSET + HH_PPU_VRAM_BAM_ENTRY_SIZE * index;
 	hh_ppu_vram_write(s);
 	free(s.data);
 }
 
 void hh_ppu_update_sprite(unsigned tilemap_index, const hh_s_ppu_loc_sprite sprite) {
 	hh_s_ppu_vram_data s = hh_ppu_2nat_sprite(sprite);
-	s.offset = HH_PPU_VRAM_TMM_OFFSET + HH_PPU_VRAM_TMM_SPRITE_SIZE * tilemap_index;
+	s.offset			 = HH_PPU_VRAM_TMM_OFFSET + HH_PPU_VRAM_TMM_SPRITE_SIZE * tilemap_index;
 	hh_ppu_vram_write(s);
 	free(s.data);
 }
 
 void hh_ppu_update_aux(hh_s_ppu_loc_aux aux) {
 	hh_s_ppu_vram_data a = hh_ppu_2nat_aux(aux);
-	a.offset = HH_PPU_VRAM_AUX_OFFSET;
+	a.offset			 = HH_PPU_VRAM_AUX_OFFSET;
 	hh_ppu_vram_write(a);
 	free(a.data);
 }
 
 void hh_ppu_update_palette_table(hh_ppu_loc_palette_table_t table) {
-	for(unsigned i = 0; i < HH_PPU_PALETTE_COUNT; i++)
-		hh_ppu_update_palette(i, table[i]);
+	for (unsigned i = 0; i < HH_PPU_PALETTE_COUNT; i++) hh_ppu_update_palette(i, table[i]);
 }
 
 void hh_ppu_update_palette(unsigned palette_index, hh_ppu_loc_palette_data_t palette) {
-	for(unsigned i = 0; i < HH_PPU_PALETTE_COLOR_COUNT; i++)
-		hh_ppu_update_color(palette_index, i, palette[i]);
+	for (unsigned i = 0; i < HH_PPU_PALETTE_COLOR_COUNT; i++) hh_ppu_update_color(palette_index, i, palette[i]);
 }
 
 void hh_ppu_update_color(unsigned palette_index, unsigned color_index, hh_ppu_rgb_color_t color) {
 	hh_s_ppu_vram_data c = hh_ppu_2nat_color(color);
-	c.offset = HH_PPU_VRAM_PAL_OFFSET +
-		palette_index * HH_PPU_VRAM_PAL_ENTRY_SIZE * HH_PPU_PALETTE_COLOR_COUNT +
-		color_index * HH_PPU_VRAM_PAL_ENTRY_SIZE;
+	c.offset			 = HH_PPU_VRAM_PAL_OFFSET + palette_index * HH_PPU_VRAM_PAL_ENTRY_SIZE * HH_PPU_PALETTE_COLOR_COUNT + color_index * HH_PPU_VRAM_PAL_ENTRY_SIZE;
 	hh_ppu_vram_write(c);
 	free(c.data);
 }
diff --git a/src/ppusim/input.c b/src/ppusim/input.c
index bdb94ac..08bc382 100644
--- a/src/ppusim/input.c
+++ b/src/ppusim/input.c
@@ -2,15 +2,14 @@
 
 #include "input.h"
 
-hh_s_gamepad g_hh_controller_p1 = { 0 };
-hh_s_gamepad g_hh_controller_p2 = { 0 };
+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];
+	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/ppusim/mem.c b/src/ppusim/mem.c
index e3f41f5..bd8606e 100644
--- a/src/ppusim/mem.c
+++ b/src/ppusim/mem.c
@@ -1,8 +1,8 @@
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 
-#include "ppusim/mem.h"
 #include "ppu/internals.h"
+#include "ppusim/mem.h"
 
 hh_ppu_data_t *g_hh_ppusim_vram = NULL;
 
diff --git a/src/ppusim/pixel.c b/src/ppusim/pixel.c
index 6e915e6..0457d55 100644
--- a/src/ppusim/pixel.c
+++ b/src/ppusim/pixel.c
@@ -1,10 +1,10 @@
 #include <SDL2/SDL.h>
 #include <stdbool.h>
 
-#include "ppusim/work.h"
+#include "ppu/consts.h"
 #include "ppu/internals.h"
 #include "ppusim/mem.h"
-#include "ppu/consts.h"
+#include "ppusim/work.h"
 
 /* transform xy if tile is flipped */
 static uint16_t hh_ppusim_apply_transform(unsigned x, unsigned y, bool fliph, bool flipv) {
@@ -15,25 +15,25 @@ static uint16_t hh_ppusim_apply_transform(unsigned x, unsigned y, bool fliph, bo
 
 /* @brief get current bg pixel cidx */
 static uint8_t hh_ppusim_bg_pixel(unsigned x, unsigned y) {
-	hh_ppu_data_t* aux = &g_hh_ppusim_vram[HH_PPU_VRAM_AUX_OFFSET];
-	unsigned bg_shift_y = HH_RESIZE(aux[0], 7, 0);
-	unsigned bg_shift_x = HH_RESIZE(aux[0], 15, 8) | HH_RESIZE(aux[1], 0, 0) << 8;
-	unsigned abs_x = bg_shift_x + x;
-	unsigned abs_y = bg_shift_y + y;
-	unsigned grid_x = abs_x / HH_PPU_SPRITE_WIDTH;
-	unsigned grid_y = abs_y / HH_PPU_SPRITE_HEIGHT;
-	unsigned loc_x = abs_x - grid_x * HH_PPU_SPRITE_WIDTH;
-	unsigned loc_y = abs_y - grid_y * HH_PPU_SPRITE_HEIGHT;
-	unsigned bam_offset = grid_y * HH_PPU_BG_CANVAS_TILES_H + grid_x;
-	hh_ppu_data_t bam = g_hh_ppusim_vram[HH_PPU_VRAM_BAM_OFFSET + bam_offset];
-	uint8_t cidx = 0;
+	hh_ppu_data_t *aux		= &g_hh_ppusim_vram[HH_PPU_VRAM_AUX_OFFSET];
+	unsigned bg_shift_y		= HH_RESIZE(aux[0], 7, 0);
+	unsigned bg_shift_x		= HH_RESIZE(aux[0], 15, 8) | HH_RESIZE(aux[1], 0, 0) << 8;
+	unsigned abs_x			= bg_shift_x + x;
+	unsigned abs_y			= bg_shift_y + y;
+	unsigned grid_x			= abs_x / HH_PPU_SPRITE_WIDTH;
+	unsigned grid_y			= abs_y / HH_PPU_SPRITE_HEIGHT;
+	unsigned loc_x			= abs_x - grid_x * HH_PPU_SPRITE_WIDTH;
+	unsigned loc_y			= abs_y - grid_y * HH_PPU_SPRITE_HEIGHT;
+	unsigned bam_offset		= grid_y * HH_PPU_BG_CANVAS_TILES_H + grid_x;
+	hh_ppu_data_t bam		= g_hh_ppusim_vram[HH_PPU_VRAM_BAM_OFFSET + bam_offset];
+	uint8_t cidx			= 0;
 	uint16_t tile_pixel_idx = hh_ppusim_apply_transform(loc_x, loc_y, HH_RESIZE(bam, 14, 14), HH_RESIZE(bam, 13, 13));
-	uint16_t tile_idx = HH_RESIZE(bam, 9, 0);
-	hh_ppu_addr_t ttm_addr = tile_idx * HH_PPU_VRAM_TMM_SPRITE_SIZE + tile_pixel_idx / 5;
-	uint8_t word_bit_addr = (tile_pixel_idx % 5) * 3;
-	hh_ppu_data_t tmm = g_hh_ppusim_vram[HH_PPU_VRAM_TMM_OFFSET + ttm_addr];
+	uint16_t tile_idx		= HH_RESIZE(bam, 9, 0);
+	hh_ppu_addr_t ttm_addr	= tile_idx * HH_PPU_VRAM_TMM_SPRITE_SIZE + tile_pixel_idx / 5;
+	uint8_t word_bit_addr	= (tile_pixel_idx % 5) * 3;
+	hh_ppu_data_t tmm		= g_hh_ppusim_vram[HH_PPU_VRAM_TMM_OFFSET + ttm_addr];
 	cidx |= HH_RESIZE(bam, 12, 10) << 3;
-	cidx |= HH_RESIZE(tmm, word_bit_addr+2, word_bit_addr) << 0;
+	cidx |= HH_RESIZE(tmm, word_bit_addr + 2, word_bit_addr) << 0;
 	return cidx;
 }
 
@@ -44,42 +44,37 @@ static uint8_t hh_ppusim_fg_pixel(unsigned x, unsigned y) {
 	uint8_t cidx = 0;
 	for (unsigned i = 0; i < HH_PPU_FG_SPRITE_COUNT; i++) {
 		unsigned fam_offset = i * HH_PPU_VRAM_FAM_ENTRY_SIZE;
-		hh_ppu_data_t* fam = &g_hh_ppusim_vram[HH_PPU_VRAM_FAM_OFFSET + fam_offset];
-		unsigned sprite_y = HH_RESIZE(fam[0], 15, 13) | HH_RESIZE(fam[1], 4, 0) << 3;
-		unsigned sprite_x = HH_RESIZE(fam[1], 13, 5);
+		hh_ppu_data_t *fam	= &g_hh_ppusim_vram[HH_PPU_VRAM_FAM_OFFSET + fam_offset];
+		unsigned sprite_y	= HH_RESIZE(fam[0], 15, 13) | HH_RESIZE(fam[1], 4, 0) << 3;
+		unsigned sprite_x	= HH_RESIZE(fam[1], 13, 5);
 		if (x < sprite_x) continue;
 		if (x >= sprite_x + HH_PPU_SPRITE_WIDTH) continue;
 		if (y < sprite_y) continue;
 		if (y >= sprite_y + HH_PPU_SPRITE_HEIGHT) continue;
-		unsigned loc_x = x - sprite_x;
-		unsigned loc_y = y - sprite_y;
+		unsigned loc_x			= x - sprite_x;
+		unsigned loc_y			= y - sprite_y;
 		uint16_t tile_pixel_idx = hh_ppusim_apply_transform(loc_x, loc_y, HH_RESIZE(fam[1], 15, 15), HH_RESIZE(fam[1], 14, 14));
-		uint16_t tile_idx = HH_RESIZE(fam[0], 9, 0);
-		hh_ppu_addr_t ttm_addr = tile_idx * HH_PPU_VRAM_TMM_SPRITE_SIZE + tile_pixel_idx / 5;
-		uint8_t word_bit_addr = (tile_pixel_idx % 5) * 3;
-		hh_ppu_data_t tmm = g_hh_ppusim_vram[HH_PPU_VRAM_TMM_OFFSET + ttm_addr];
-		unsigned cidx_col = HH_RESIZE(tmm, word_bit_addr+2, word_bit_addr);
+		uint16_t tile_idx		= HH_RESIZE(fam[0], 9, 0);
+		hh_ppu_addr_t ttm_addr	= tile_idx * HH_PPU_VRAM_TMM_SPRITE_SIZE + tile_pixel_idx / 5;
+		uint8_t word_bit_addr	= (tile_pixel_idx % 5) * 3;
+		hh_ppu_data_t tmm		= g_hh_ppusim_vram[HH_PPU_VRAM_TMM_OFFSET + ttm_addr];
+		unsigned cidx_col		= HH_RESIZE(tmm, word_bit_addr + 2, word_bit_addr);
 		if (cidx_col == 0) continue;
 		unsigned cidx_pal = HH_RESIZE(fam[0], 12, 10);
-		cidx = (cidx_col << 0) | (cidx_pal << 3);
+		cidx			  = (cidx_col << 0) | (cidx_pal << 3);
 		break;
 	}
 	return cidx;
 }
 
-void hh_ppusim_pixel(uint8_t* s, unsigned x, unsigned y) {
-	uint8_t bg_cidx = hh_ppusim_bg_pixel(x, y);
-	uint8_t fg_cidx = hh_ppusim_fg_pixel(x, y);
-	uint8_t cidx = (fg_cidx & HH_MASK(3)) == 0 ? bg_cidx : fg_cidx;
-	hh_ppu_data_t pal_rgb = g_hh_ppusim_vram[HH_PPU_VRAM_PAL_OFFSET + cidx];
-	hh_ppu_rgb_color_t rgb = {
-		HH_RESIZE(pal_rgb, 11, 8),
-		HH_RESIZE(pal_rgb, 7, 4),
-		HH_RESIZE(pal_rgb, 3, 0)
-	};
+void hh_ppusim_pixel(uint8_t *s, unsigned x, unsigned y) {
+	uint8_t bg_cidx		   = hh_ppusim_bg_pixel(x, y);
+	uint8_t fg_cidx		   = hh_ppusim_fg_pixel(x, y);
+	uint8_t cidx		   = (fg_cidx & HH_MASK(3)) == 0 ? bg_cidx : fg_cidx;
+	hh_ppu_data_t pal_rgb  = g_hh_ppusim_vram[HH_PPU_VRAM_PAL_OFFSET + cidx];
+	hh_ppu_rgb_color_t rgb = {HH_RESIZE(pal_rgb, 11, 8), HH_RESIZE(pal_rgb, 7, 4), HH_RESIZE(pal_rgb, 3, 0)};
 
 	s[0] = rgb[0] << 4;
 	s[1] = rgb[1] << 4;
 	s[2] = rgb[2] << 4;
 }
-
diff --git a/src/ppusim/sim.c b/src/ppusim/sim.c
index 2816b31..449b78d 100644
--- a/src/ppusim/sim.c
+++ b/src/ppusim/sim.c
@@ -1,6 +1,6 @@
-#include <stdlib.h>
-#include <stdbool.h>
 #include <SDL2/SDL.h>
+#include <stdbool.h>
+#include <stdlib.h>
 
 #include "main.h"
 #include "ppu/ppu.h"
@@ -8,16 +8,17 @@
 #include "ppusim/sim.h"
 #include "ppusim/work.h"
 
-SDL_Window *g_hh_window = NULL;
+SDL_Window *g_hh_window		= NULL;
 SDL_Renderer *g_hh_renderer = NULL;
 
 void hh_ppu_init() {
 	SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS);
-	g_hh_window = SDL_CreateWindow("ppusim", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, HH_PPU_SCREEN_WIDTH * HH_PPUSIM_UPSCALE_FACTOR, HH_PPU_SCREEN_HEIGHT * HH_PPUSIM_UPSCALE_FACTOR, SDL_WINDOW_SHOWN);
+	g_hh_window	  = SDL_CreateWindow("ppusim", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, HH_PPU_SCREEN_WIDTH * HH_PPUSIM_UPSCALE_FACTOR,
+									 HH_PPU_SCREEN_HEIGHT * HH_PPUSIM_UPSCALE_FACTOR, SDL_WINDOW_SHOWN);
 	g_hh_renderer = SDL_CreateRenderer(g_hh_window, -1, SDL_RENDERER_ACCELERATED);
 
 	g_hh_ppusim_core_count = SDL_GetCPUCount();
-	g_hh_ppusim_threads = malloc(sizeof(pthread_t) * g_hh_ppusim_core_count);
+	g_hh_ppusim_threads	   = malloc(sizeof(pthread_t) * g_hh_ppusim_core_count);
 
 	g_hh_ppusim_vram = malloc(sizeof(hh_ppu_data_t) * 0xffff);
 	memset(g_hh_ppusim_vram, 0x0000, 0xffff);
@@ -36,8 +37,9 @@ void hh_loop() {
 	SDL_Event e;
 	while (g_hh_run) {
 		uint32_t start = SDL_GetTicks();
-		while (SDL_PollEvent(&e)) if (e.type == SDL_QUIT) exit(0);
-		
+		while (SDL_PollEvent(&e))
+			if (e.type == SDL_QUIT) exit(0);
+
 		hh_ppu_vblank_interrupt();
 
 		SDL_RenderClear(g_hh_renderer);
diff --git a/src/ppusim/work.c b/src/ppusim/work.c
index 3b9cee6..96d15aa 100644
--- a/src/ppusim/work.c
+++ b/src/ppusim/work.c
@@ -2,12 +2,12 @@
 #include <pthread.h>
 #include <stdio.h>
 
-#include "ppusim/work.h"
-#include "ppusim/sim.h"
 #include "ppu/consts.h"
 #include "ppusim/pixel.h"
+#include "ppusim/sim.h"
+#include "ppusim/work.h"
 
-pthread_t* g_hh_ppusim_threads;
+pthread_t *g_hh_ppusim_threads;
 unsigned g_hh_ppusim_core_count;
 hh_s_ppusim_screen g_hh_ppusim_screen;
 
@@ -15,29 +15,26 @@ hh_s_ppusim_screen g_hh_ppusim_screen;
 #pragma GCC diagnostic ignored "-Wint-to-pointer-cast"
 #pragma GCC diagnostic ignored "-Wpointer-to-int-cast"
 
-void* hh_ppusim_draw_thread(void* arg) {
-	unsigned core = (unsigned long) arg;
+void *hh_ppusim_draw_thread(void *arg) {
+	unsigned core = (unsigned long)arg;
 	for (unsigned y = core; y < HH_PPU_SCREEN_HEIGHT; y += g_hh_ppusim_core_count)
-		for (unsigned x = 0; x < HH_PPU_SCREEN_WIDTH; x++)
-			hh_ppusim_pixel(g_hh_ppusim_screen[y][x], x, y);
+		for (unsigned x = 0; x < HH_PPU_SCREEN_WIDTH; x++) hh_ppusim_pixel(g_hh_ppusim_screen[y][x], x, y);
 	return NULL;
 }
 
-void hh_ppusim_draw_frame(SDL_Renderer* renderer) {
-	for (unsigned core = 0; core < g_hh_ppusim_core_count; core++)
-		pthread_create(&g_hh_ppusim_threads[core], NULL, hh_ppusim_draw_thread, (void*)(unsigned long)core);
-	for (unsigned core = 0; core < g_hh_ppusim_core_count; core++)
-		pthread_join(g_hh_ppusim_threads[core], NULL);
-	
+void hh_ppusim_draw_frame(SDL_Renderer *renderer) {
+	for (unsigned core = 0; core < g_hh_ppusim_core_count; core++) pthread_create(&g_hh_ppusim_threads[core], NULL, hh_ppusim_draw_thread, (void *)(unsigned long)core);
+	for (unsigned core = 0; core < g_hh_ppusim_core_count; core++) pthread_join(g_hh_ppusim_threads[core], NULL);
+
 	for (unsigned x = 0; x < HH_PPU_SCREEN_WIDTH; x++) {
 		for (unsigned y = 0; y < HH_PPU_SCREEN_HEIGHT; y++) {
 			SDL_SetRenderDrawColor(renderer, g_hh_ppusim_screen[y][x][0], g_hh_ppusim_screen[y][x][1], g_hh_ppusim_screen[y][x][2], 255);
-			SDL_RenderFillRect(renderer, &(SDL_Rect) {
-				.x = x * HH_PPUSIM_UPSCALE_FACTOR,
-				.y = y * HH_PPUSIM_UPSCALE_FACTOR,
-				.w = HH_PPUSIM_UPSCALE_FACTOR,
-				.h = HH_PPUSIM_UPSCALE_FACTOR,
-			});
+			SDL_RenderFillRect(renderer, &(SDL_Rect){
+											 .x = x * HH_PPUSIM_UPSCALE_FACTOR,
+											 .y = y * HH_PPUSIM_UPSCALE_FACTOR,
+											 .w = HH_PPUSIM_UPSCALE_FACTOR,
+											 .h = HH_PPUSIM_UPSCALE_FACTOR,
+										 });
 		}
 	}
 }
-- 
cgit v1.2.3