Commit d9a4ffe5 authored Apr 22, 2019 by Andrey Filippov

vospi, lepton3.5 changes

parent c6986b53

src/arch/arm/boot/dts/elphel393_4_mt9p006.dts

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -284,7 +284,8 @@
	"pca9500_eeprom 0x50 1 1 100",		"pca9500_eeprom 0x50 1 1 100",
	"sensor_eeprom 0x50 1 1 100",		"sensor_eeprom 0x50 1 1 100",
	"sensor_temp 0x18 1 2 100",		"sensor_temp 0x18 1 2 100",
	"cy22393 0x69 1 1 100";		"cy22393 0x69 1 1 100",
			"lepton35 0x2a 2 2 500";
	} ;		} ;

	framepars_operations: elphel393-framepars@0 {		framepars_operations: elphel393-framepars@0 {

src/drivers/elphel/detect_sensors.c

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -78,6 +78,7 @@ const struct sensor_name_t sensor_names[] ={
	{.name="mt9f002", .type=1, .iface=HISPI4, .code = SENSOR_MT9F002}, // MT9F002		{.name="mt9f002", .type=1, .iface=HISPI4, .code = SENSOR_MT9F002}, // MT9F002
	{.name="ibis51300", .type=1, .iface=PARALLEL12, .code = SENSOR_IBIS51300}, // FillFactory IBIS51300		{.name="ibis51300", .type=1, .iface=PARALLEL12, .code = SENSOR_IBIS51300}, // FillFactory IBIS51300
	{.name="kai11002", .type=1, .iface=PARALLEL12, .code = SENSOR_KAI11000}, // Kodak KAI11002		{.name="kai11002", .type=1, .iface=PARALLEL12, .code = SENSOR_KAI11000}, // Kodak KAI11002
			{.name="lepton3.5", .type=1, .iface=VOSPI, .code = SENSOR_LEPTON35}, // Kodak KAI11002
	{.name=NULL, .type=0, .iface=NONE, .code = 0} // end of list		{.name=NULL, .type=0, .iface=NONE, .code = 0} // end of list
	};		};
	static sens_iface_t port_iface[SENSOR_PORTS];		static sens_iface_t port_iface[SENSOR_PORTS];

src/drivers/elphel/detect_sensors.h

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -45,7 +45,7 @@ struct sensor_port_config_t {

	extern struct sensor_port_config_t *pSensorPortConfig;		extern struct sensor_port_config_t *pSensorPortConfig;

	typedef enum {NONE,PARALLEL12,HISPI4} sens_iface_t; ///< Sensor port interface type		typedef enum {NONE,PARALLEL12,HISPI4,VOSPI} sens_iface_t; ///< Sensor port interface type

	int get_code_by_name(const char * name, int type);		int get_code_by_name(const char * name, int type);
	const char * get_name_by_code(int code, int type);		const char * get_name_by_code(int code, int type);

src/drivers/elphel/framepars.c

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2032,8 +2032,10 @@ static ssize_t show_fpga_sensor_interface(struct device *dev, struct device_attr
	return sprintf(buf,"PAR12\n");		return sprintf(buf,"PAR12\n");
	case 1:		case 1:
	return sprintf(buf,"HISPI\n");		return sprintf(buf,"HISPI\n");
			case 2:
			return sprintf(buf,"VOSPI\n");
	default:		default:
	return sprintf(buf,"0x%08%lx\n", x393_sensor_interface());		return sprintf(buf,"0x%08x\n", (int) x393_sensor_interface());
	}		}
	}		}

src/include/uapi/elphel/c313a.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -254,6 +254,7 @@
	#define SENSOR_MT9F002 0x38 ///< MT9F002		#define SENSOR_MT9F002 0x38 ///< MT9F002
	//#define SENSOR_MT9Y001 0x34 ///< Micron/Aptina/Onsemi MT9P001 - 34		//#define SENSOR_MT9Y001 0x34 ///< Micron/Aptina/Onsemi MT9P001 - 34
	#define SENSOR_IBIS51300 0x40 ///< FillFactory IBIS51300		#define SENSOR_IBIS51300 0x40 ///< FillFactory IBIS51300
			#define SENSOR_LEPTON35 0x41 ///< FLIR Lepton3 sensor
	#define SENSOR_KAI11000 0x80 ///< Kodak KAI11002		#define SENSOR_KAI11000 0x80 ///< Kodak KAI11002
	#define SENSOR_MUX_10359 0xe0 ///< Sensor multiplexer 10359		#define SENSOR_MUX_10359 0xe0 ///< Sensor multiplexer 10359
	#define SENSOR_NONE 0xfc ///< No sensor present		#define SENSOR_NONE 0xfc ///< No sensor present