fruchti/inverse_thermal_camera
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Print halfway usable images

Browse source
This commit is contained in:
fruchti 2018-08-23 12:49:29 +02:00
parent b2b3931e81
commit 804a11cb10
5 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build-number.txt
View file

@ -1 +1 @@
429 444

4
src/main.c
View file

@ -30,8 +30,8 @@ int main(void)
while(!Camera_Captured); while(!Camera_Captured);
extern uint8_t ImageBuffer[176 * 144 / 8]; extern uint8_t ImageBuffer[CAMERA_IMAGE_WIDTH * CAMERA_IMAGE_HEIGHT / 8];
Print_Image(ImageBuffer, 176, 144); Print_Image(ImageBuffer, CAMERA_IMAGE_WIDTH, CAMERA_IMAGE_HEIGHT);
for(;;) for(;;)
{ {

23
src/ov7670.c
View file

@ -148,10 +148,10 @@
#define I2C_ADDRESS 0x42 #define I2C_ADDRESS 0x42
uint8_t ImageBuffer[176 * 144 / 8]; uint8_t ImageBuffer[CAMERA_IMAGE_WIDTH * CAMERA_IMAGE_HEIGHT / 8];
static volatile int CurrentLine = 0; static volatile int CurrentLine = 0;
uint8_t LineBuffer1[176 * 2 + 40]; uint8_t LineBuffer1[CAMERA_IMAGE_WIDTH + 40];
uint8_t LineBuffer2[176 * 2 + 40]; uint8_t LineBuffer2[CAMERA_IMAGE_WIDTH + 40];
int LineCount = 0; int LineCount = 0;
static int FrameCount = 0; static int FrameCount = 0;
volatile int Camera_Captured = 0; volatile int Camera_Captured = 0;
@ -265,7 +265,7 @@ void Camera_Init(void)
// pixel clock and should trigger DMA transfers // pixel clock and should trigger DMA transfers
TIM3->PSC = 0; TIM3->PSC = 0;
TIM3->ARR = 1; TIM3->ARR = 1;
TIM3->CCMR1 = TIM_CCMR1_CC2S_0 | TIM_CCMR1_CC1S_0; TIM3->CCMR1 = TIM_CCMR1_CC2S_0 | TIM_CCMR1_CC1S_0 | TIM_CCMR1_IC1PSC_0;
TIM3->CCER = TIM_CCER_CC2P | TIM_CCER_CC2E | TIM_CCER_CC1E | TIM_CCER_CC1P; TIM3->CCER = TIM_CCER_CC2P | TIM_CCER_CC2E | TIM_CCER_CC1E | TIM_CCER_CC1P;
TIM3->DIER = TIM_DIER_CC2IE; TIM3->DIER = TIM_DIER_CC2IE;
TIM3->CR1 = TIM_CR1_CEN; TIM3->CR1 = TIM_CR1_CEN;
@ -297,8 +297,8 @@ void Camera_Init(void)
WriteRegister(REG_COM10, 0x20); WriteRegister(REG_COM10, 0x20);
// Enable pixel clock scaling // Enable pixel clock scaling
WriteRegister(REG_COM14, 0x18 | 2); WriteRegister(REG_COM14, 0x18 | 1);
WriteRegister(REG_SCALING_PCLK_DIV, 2); WriteRegister(REG_SCALING_PCLK_DIV, 1);
} }
void TIM1_CC_IRQHandler(void) void TIM1_CC_IRQHandler(void)
@ -328,6 +328,7 @@ void TIM3_IRQHandler(void)
// HSYNC // HSYNC
GPIOC->BRR = (1 << PIN_LED); GPIOC->BRR = (1 << PIN_LED);
TIM3->DIER &= ~TIM_DIER_CC1DE; TIM3->DIER &= ~TIM_DIER_CC1DE;
TIM3->SR &= ~TIM_SR_CC1IF; TIM3->SR &= ~TIM_SR_CC1IF;
@ -351,18 +352,20 @@ void TIM3_IRQHandler(void)
if(!Camera_Captured) if(!Camera_Captured)
{ {
int error = 0; int error = 0;
for(int i = 0; i < 176; i++) for(int i = 0; i < CAMERA_IMAGE_WIDTH; i++)
{ {
int pixel = filledbuffer[i * 2 + 33] + error; int pixel = filledbuffer[i + 15] + error;
if(pixel < 127) if(pixel < 127)
{ {
error = pixel; error = pixel;
ImageBuffer[(CurrentLine * 176 + i) / 8] |= 0x80 >> (i % 8); ImageBuffer[(CurrentLine * CAMERA_IMAGE_WIDTH + i) / 8] |=
0x80 >> (i % 8);
} }
else else
{ {
error = pixel - 255; error = pixel - 255;
ImageBuffer[(CurrentLine * 176 + i) / 8] &= ~(0x80 >> (i % 8)); ImageBuffer[(CurrentLine * CAMERA_IMAGE_WIDTH + i) / 8] &=
~(0x80 >> (i % 8));
} }
} }
} }

3
src/ov7670.h
View file

@ -3,6 +3,9 @@
#include <stdlib.h> #include <stdlib.h>
#include "stm32f1xx.h" #include "stm32f1xx.h"
#define CAMERA_IMAGE_WIDTH 176
#define CAMERA_IMAGE_HEIGHT 144
extern volatile int Camera_Captured; extern volatile int Camera_Captured;
void Camera_Init(void); void Camera_Init(void);

2
src/print.c
View file

@ -55,7 +55,7 @@ void Print_Image(const uint8_t *data, int width, int height)
memcpy(Print_Buffer + i * LTP1245_LINE_BYTES, memcpy(Print_Buffer + i * LTP1245_LINE_BYTES,
data + currentline * width / 8, data + currentline * width / 8,
width / 8); width / 8);
//memset(Print_Buffer + width / 8, 0, LTP1245_LINE_BYTES - width / 8); memset(Print_Buffer + width / 8, 0, LTP1245_LINE_BYTES - width / 8);
currentline++; currentline++;
} }