Skip to content

Fix legacy version to work. #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dhylands wants to merge 1 commit into
base: legacy_version
Choose a base branch
from
Open

Fix legacy version to work. #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions SPI_Camera/src/ArduCAM.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#define ARDUCAM_C
#include "ArduCAM.h"
#include "sccb_bus.h"
#include "ov2640_regs.h"
Expand Down
14 changes: 11 additions & 3 deletions SPI_Camera/src/ArduCAM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,28 @@
#define CMD_BUF_SIZE 512


#if defined(ARDUCAM_C)
char readbuf[JPEG_BUF_SIZE];


char* sendbuf_cam1 ;
char* sendbuf_cam2 ;
char* sendbuf_cam3 ;
char* sendbuf_cam4 ;

char revCmdData[CMD_BUF_SIZE];
#else
extern char readbuf[JPEG_BUF_SIZE];

extern char* sendbuf_cam1 ;
extern char* sendbuf_cam2 ;
extern char* sendbuf_cam3 ;
extern char* sendbuf_cam4 ;

char revCmdData[CMD_BUF_SIZE];
extern char revCmdData[CMD_BUF_SIZE];
#endif

//ArduCAM CS define
#define CAM_CS1 17
#define CAM_CS1 8
#define CAM_CS2 23
#define CAM_CS3 22
#define CAM_CS4 24
Expand Down
1 change: 1 addition & 0 deletions SPI_Camera/src/bcm283x_board_driver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#define DEFINE_VARS
#include "bcm283x_board_driver.h"

#include <stdlib.h>
Expand Down
21 changes: 13 additions & 8 deletions SPI_Camera/src/bcm283x_board_driver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,17 +88,22 @@
#define SPI_CS_CS_10 0x00000002
#define SPI_CS_CS_01 0x00000001

#if defined(DEFINE_VARS)
#define EXTERN
#else
#define EXTERN extern
#endif

// Pointers that will be memory mapped when pioInit() is called
volatile unsigned int *gpio; //pointer to base of gpio
volatile unsigned int *spi; //pointer to base of spi registers
volatile unsigned int *pwm;
EXTERN volatile unsigned int *gpio; //pointer to base of gpio
EXTERN volatile unsigned int *spi; //pointer to base of spi registers
EXTERN volatile unsigned int *pwm;

volatile unsigned int *sys_timer;
volatile unsigned int *arm_timer; // pointer to base of arm timer registers
EXTERN volatile unsigned int *sys_timer;
EXTERN volatile unsigned int *arm_timer; // pointer to base of arm timer registers

volatile unsigned int *uart;
volatile unsigned int *cm_pwm;
EXTERN volatile unsigned int *uart;
EXTERN volatile unsigned int *cm_pwm;

/////////////////////////////////////////////////////////////////////
// GPIO Registers
Expand Down Expand Up @@ -710,4 +715,4 @@ unsigned long get_microsecond_timestamp();



#endif
#endif