Commit c6342926 authored by Andrey Filippov's avatar Andrey Filippov
Browse files

fixing multi-sensor operation

parent 0a534fc8

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -13,3 +13,4 @@ bitbake-logs 
*.o

*.cgi

bitbake-logs

.depend

src/Makefile

+7 −0
Original line number Diff line number Diff line
@@ -36,3 +36,10 @@ clean: 
#                REMOTE_USER=${REMOTE_USER}

#                REMOTE_IP=${REMOTE_IP}



depend: .depend



.depend: $(SRCS)

	rm -f ./.depend

	$(CC) $(CFLAGS) -MM $^ > ./.depend;



include .depend

src/autoexposure

deleted100755 → 0
−85.6 KiB

File deleted.

View file

src/globalsinit.c

+8 −4
Original line number Diff line number Diff line
@@ -67,13 +67,17 @@ int initFilesMmap(int sensor_port, int sensor_subchannel) { 
  const char *framepars_driver_name=framepars_dev_names[sensor_port];

  const char histogram_driver_name[]=DEV393_PATH(DEV393_HISTOGRAM);

  const char gamma_driver_name[]=    DEV393_PATH(DEV393_GAMMA);

  int total_hist_entries; // =8*4 for 4 sensors



///Frame parameters file open/mmap (read/write)

  fd_fparmsall= open(framepars_driver_name, O_RDWR);

  if (fd_fparmsall <0) {

     ELP_FERR(fprintf(stderr, "Open failed: (%s)\r\n", framepars_driver_name));

     return -1;

  }

  frameParsAll = (struct framepars_all_t *) mmap(0, sizeof (struct framepars_all_t) * HISTOGRAM_CACHE_NUMBER , PROT_READ | PROT_WRITE, MAP_SHARED, fd_fparmsall, 0);

//  frameParsAll = (struct framepars_all_t *) mmap(0, sizeof (struct framepars_all_t) * HISTOGRAM_CACHE_NUMBER , PROT_READ | PROT_WRITE, MAP_SHARED, fd_fparmsall, 0);

  frameParsAll = (struct framepars_all_t *) mmap(0, sizeof (struct framepars_all_t), PROT_READ | PROT_WRITE, MAP_SHARED, fd_fparmsall, 0);



  if((int) frameParsAll == -1) {

     ELP_FERR(fprintf(stderr, "problems with mmap: %s\n", framepars_driver_name));

     close (fd_fparmsall);
@@ -90,10 +94,10 @@ int initFilesMmap(int sensor_port, int sensor_subchannel) { 
     close (fd_fparmsall);

     return -1;

  }

  // Select port and subchannel for histograms

  lseek(fd_histogram_cache, LSEEK_HIST_SET_CHN + (4 * sensor_port) + sensor_subchannel, SEEK_END); /// specify port/sub-channel is needed

  // Select port and subchannel for histograms (result is the total number of histograms entries)

  total_hist_entries = lseek(fd_histogram_cache, LSEEK_HIST_SET_CHN + (4 * sensor_port) + sensor_subchannel, SEEK_END); /// specify port/sub-channel is needed



  histogram_cache = (struct histogram_stuct_t *) mmap(0, sizeof (struct histogram_stuct_t) * HISTOGRAM_CACHE_NUMBER , PROT_READ, MAP_SHARED, fd_histogram_cache, 0);

  histogram_cache = (struct histogram_stuct_t *) mmap(0, sizeof (struct histogram_stuct_t) * total_hist_entries , PROT_READ, MAP_SHARED, fd_histogram_cache, 0);

  if((int) histogram_cache == -1) {

     ELP_FERR(fprintf(stderr, "problems with mmap: %s\n", histogram_driver_name));

     close (fd_fparmsall);

src/temperature

deleted100755 → 0
−32.8 KiB

File deleted.

View file