HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/LFR_FSW Commit - r187:87f7d2226935

2.0.2.2...

paul -

r187:87f7d2226935 VHDL_0_1_28

parent child

Context file:

r187:87f7d2226935

Collapse all files

.hgsubstate +1 -1

@@ -1,2 +1,2
1	a586fe639ac179e95bdc150ebdbab0312f31dc30 LFR_basic-parameters	1	a586fe639ac179e95bdc150ebdbab0312f31dc30 LFR_basic-parameters
2	6d02d4b02291d2b25c387fa74037dc7929cd92b5 header/lfr_common_headers	2	be0dc1c1876987307ddfc0fb47044f6d41815866 header/lfr_common_headers

FSW-qt/fsw-qt.pro +1 -1

             DEFINES += SW_VERSION_N1=2 # major
             DEFINES += SW_VERSION_N2=0 # minor
             DEFINES += SW_VERSION_N3=2 # patch
-            DEFINES += SW_VERSION_N4=1 # internal
+            DEFINES += SW_VERSION_N4=2 # internal
             # <GCOV>
             #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage

header/GscMemoryLPP.hpp +3 -7

             #ifndef GSCMEMORY_HPP_
             #define GSCMEMORY_HPP_
-            static unsigned int getCacheControlRegister(){
             #ifndef LEON3
             #define LEON3
             #endif
+            static unsigned int getCacheControlRegister(){
             #ifdef LEON3
                 unsigned int cacheControlRegister = 0;
                 __asm__ __volatile__("lda [%%g0] 2, %0" : "=r"(cacheControlRegister) : );
             #endif
             }
-            static void setCacheControlRegister(unsigned int cacheControlRegister){
+            static void setCacheControlRegister(unsigned int cacheControlRegister)
+            {
             #ifdef LEON3
                 __asm__ __volatile__("sta %0, [%%g0] 2" : : "r"(cacheControlRegister));
             #endif
             static void enableInstructionCache() {
             #ifdef LEON3
                 unsigned int cacheControlRegister;
                 cacheControlRegister = getCacheControlRegister();
             }
             static void enableDataCache() {
             #ifdef LEON3
                 unsigned int cacheControlRegister;
                 cacheControlRegister = getCacheControlRegister();
             }
             static void enableInstructionBurstFetch() {
             #ifdef LEON3
                 unsigned int cacheControlRegister;
                 cacheControlRegister = getCacheControlRegister();

header/grlib_regs.h +10 -3

@@ -45,9 +45,16 typedef struct {
45	volatile int coarse_time_load;	45	volatile int coarse_time_load;
46	volatile int coarse_time;	46	volatile int coarse_time;
47	volatile int fine_time;	47	volatile int fine_time;
48	volatile int temp_scm;	48	// TEMPERATURES
49	volatile int temp_pcb;	49	volatile int temp_pcb; // SEL1 = 0 SEL0 = 0
50	volatile int temp_fpga;	50	volatile int temp_fpga; // SEL1 = 0 SEL0 = 1
		51	volatile int temp_scm; // SEL1 = 1 SEL0 = 0
		52	// CALIBRATION
		53	volatile unsigned int calDACCtrl;
		54	volatile unsigned int calPrescaler;
		55	volatile unsigned int calDivisor;
		56	volatile unsigned int calDataPtr;
		57	volatile unsigned int calData;
51	} time_management_regs_t;	58	} time_management_regs_t;
52		59
53	// PDB >= 0.1.28	60	// PDB >= 0.1.28

header/tc_handler.h +11 0

@@ -51,6 +51,17 void set_sm_irq_onError( unsigned char v
51	void updateLFRCurrentMode();	51	void updateLFRCurrentMode();
52	void set_lfr_soft_reset( unsigned char value );	52	void set_lfr_soft_reset( unsigned char value );
53	void reset_lfr( void );	53	void reset_lfr( void );
		54	// CALIBRATION
		55	void setCalibrationPrescaler( unsigned int prescaler );
		56	void setCalibrationDivisor( unsigned int divisionFactor );
		57	void setCalibrationData( void );
		58	void setCalibrationReload( bool state);
		59	void setCalibrationEnable( bool state );
		60	void setCalibrationInterleaved( bool state );
		61	void startCalibration( void );
		62	void stopCalibration( void );
		63	void configureCalibration( bool interleaved );
		64	//
54	void update_last_TC_exe( ccsdsTelecommandPacket_t TC , unsigned char time );	65	void update_last_TC_exe( ccsdsTelecommandPacket_t TC , unsigned char time );
55	void update_last_TC_rej(ccsdsTelecommandPacket_t TC , unsigned char time );	66	void update_last_TC_rej(ccsdsTelecommandPacket_t TC , unsigned char time );
56	void close_action( ccsdsTelecommandPacket_t *TC, int result, rtems_id queue_id );	67	void close_action( ccsdsTelecommandPacket_t *TC, int result, rtems_id queue_id );

header/wf_handler.h +1 -1

             #include "fsw_misc.h"
             #include "fsw_params_wf_handler.h"
-            #define pi 3.1415
+            #define pi 3.14159265359
             extern int fdSPW;

src/fsw_init.c +3 0

                 SM_reset_current_ring_nodes();
                 reset_spectral_matrix_regs();
+                // configure calibration
+                configureCalibration( false );   // true means interleaved mode, false is for normal mode
                 updateLFRCurrentMode();
                 BOOT_PRINTF1("in INIT *** lfrCurrentMode is %d\n", lfrCurrentMode)

src/fsw_misc.c +5 0

                 unsigned char* temp_pcb_ptr;
                 unsigned char* temp_fpga_ptr;
+                // SEL1 SEL0
+                // 0    0       => PCB
+                // 0    1       => FPGA
+                // 1    0       => SCM
                 temp_scm_ptr  = (unsigned char *) &time_management_regs->temp_scm;
                 temp_pcb_ptr =  (unsigned char *) &time_management_regs->temp_pcb;
                 temp_fpga_ptr = (unsigned char *) &time_management_regs->temp_fpga;

src/tc_handler.c +154 -8

@@ -11,6 +11,7
11	*/	11	*/
12		12
13	#include "tc_handler.h"	13	#include "tc_handler.h"
		14	#include "math.h"
14		15
15	//***********	16	//***********
16	// RTEMS TASK	17	// RTEMS TASK
@@ -267,13 +268,12 int action_enable_calibration(ccsdsTelec
267	*/	268	*/
268		269
269	int result;	270	int result;
270	unsigned char lfrMode;
271		271
272	result = LFR_DEFAULT;	272	result = LFR_DEFAULT;
273	lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
274		273
275	send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );	274	startCalibration();
276	result = LFR_DEFAULT;	275
		276	result = LFR_SUCCESSFUL;
277		277
278	return result;	278	return result;
279	}	279	}
@@ -288,13 +288,12 int action_disable_calibration(ccsdsTele
288	*/	288	*/
289		289
290	int result;	290	int result;
291	unsigned char lfrMode;
292		291
293	result = LFR_DEFAULT;	292	result = LFR_DEFAULT;
294	lfrMode = (housekeeping_packet.lfr_status_word[0] & 0xf0) >> 4;
295		293
296	send_tm_lfr_tc_exe_not_implemented( TC, queue_id, time );	294	stopCalibration();
297	result = LFR_DEFAULT;	295
		296	result = LFR_SUCCESSFUL;
298		297
299	return result;	298	return result;
300	}	299	}
@@ -823,6 +822,153 void set_sm_irq_onError( unsigned char v
823	}	822	}
824	}	823	}
825		824
		825	//*****************************
		826	// CONFIGURE CALIBRATION SIGNAL
		827	void setCalibrationPrescaler( unsigned int prescaler )
		828	{
		829	// prescaling of the master clock (25 MHz)
		830	// master clock is divided by 2^prescaler
		831	time_management_regs->calPrescaler = prescaler;
		832	}
		833
		834	void setCalibrationDivisor( unsigned int divisionFactor )
		835	{
		836	// division of the prescaled clock by the division factor
		837	time_management_regs->calDivisor = divisionFactor;
		838	}
		839
		840	void setCalibrationData( void ){
		841	unsigned int k;
		842	unsigned short data;
		843	float val;
		844	float f0;
		845	float f1;
		846	float fs;
		847	float Ts;
		848	float scaleFactor;
		849
		850	f0 = 625;
		851	f1 = 10000;
		852	fs = 160256.410;
		853	Ts = 1. / fs;
		854	scaleFactor = 0.125 / 0.000654; // 191, 500 mVpp, 2 sinus waves => 250 mVpp each, amplitude = 125 mV
		855
		856	time_management_regs->calDataPtr = 0x00;
		857
		858	// build the signal for the SCM calibration
		859	for (k=0; k<256; k++)
		860	{
		861	val = sin( 2 * pi * f0 * k * Ts )
		862	+ sin( 2 * pi * f1 * k * Ts );
		863	data = (unsigned short) ((val * scaleFactor) + 2048);
		864	time_management_regs->calData = data & 0xfff;
		865	}
		866	}
		867
		868	void setCalibrationDataInterleaved( void ){
		869	unsigned int k;
		870	float val;
		871	float f0;
		872	float f1;
		873	float fs;
		874	float Ts;
		875	unsigned short data[384];
		876	unsigned char *dataPtr;
		877
		878	f0 = 625;
		879	f1 = 10000;
		880	fs = 240384.615;
		881	Ts = 1. / fs;
		882
		883	time_management_regs->calDataPtr = 0x00;
		884
		885	// build the signal for the SCM calibration
		886	for (k=0; k<384; k++)
		887	{
		888	val = sin( 2 * pi * f0 * k * Ts )
		889	+ sin( 2 * pi * f1 * k * Ts );
		890	data[k] = (unsigned short) (val * 512 + 2048);
		891	}
		892
		893	// write the signal in interleaved mode
		894	for (k=0; k<128; k++)
		895	{
		896	dataPtr = (unsigned char) &data[k3 + 2];
		897	time_management_regs->calData = (data[k*3] & 0xfff)
		898	+ ( (dataPtr[0] & 0x3f) << 12);
		899	time_management_regs->calData = (data[k*3 + 1] & 0xfff)
		900	+ ( (dataPtr[1] & 0x3f) << 12);
		901	}
		902	}
		903
		904	void setCalibrationReload( bool state)
		905	{
		906	if (state == true)
		907	{
		908	time_management_regs->calDACCtrl = time_management_regs->calDACCtrl \| 0x00000010; // [0001 0000]
		909	}
		910	else
		911	{
		912	time_management_regs->calDACCtrl = time_management_regs->calDACCtrl & 0xffffffef; // [1110 1111]
		913	}
		914	}
		915
		916	void setCalibrationEnable( bool state )
		917	{
		918	// this bit drives the multiplexer
		919	if (state == true)
		920	{
		921	time_management_regs->calDACCtrl = time_management_regs->calDACCtrl \| 0x00000040; // [0100 0000]
		922	}
		923	else
		924	{
		925	time_management_regs->calDACCtrl = time_management_regs->calDACCtrl & 0xffffffbf; // [1011 1111]
		926	}
		927	}
		928
		929	void setCalibrationInterleaved( bool state )
		930	{
		931	// this bit drives the multiplexer
		932	if (state == true)
		933	{
		934	time_management_regs->calDACCtrl = time_management_regs->calDACCtrl \| 0x00000020; // [0010 0000]
		935	}
		936	else
		937	{
		938	time_management_regs->calDACCtrl = time_management_regs->calDACCtrl & 0xffffffdf; // [1101 1111]
		939	}
		940	}
		941
		942	void startCalibration( void )
		943	{
		944	setCalibrationEnable( true );
		945	setCalibrationReload( false );
		946	}
		947
		948	void stopCalibration( void )
		949	{
		950	setCalibrationEnable( false );
		951	setCalibrationReload( true );
		952	}
		953
		954	void configureCalibration( bool interleaved )
		955	{
		956	stopCalibration();
		957	if ( interleaved == true )
		958	{
		959	setCalibrationInterleaved( true );
		960	setCalibrationPrescaler( 0 ); // 25 MHz => 25 000 000
		961	setCalibrationDivisor( 26 ); // => 240 384
		962	setCalibrationDataInterleaved();
		963	}
		964	else
		965	{
		966	setCalibrationPrescaler( 0 ); // 25 MHz => 25 000 000
		967	setCalibrationDivisor( 38 ); // => 160 256 (39 - 1)
		968	setCalibrationData();
		969	}
		970	}
		971
826	//****************	972	//****************
827	// CLOSING ACTIONS	973	// CLOSING ACTIONS
828	void update_last_TC_exe( ccsdsTelecommandPacket_t TC, unsigned char time )	974	void update_last_TC_exe( ccsdsTelecommandPacket_t TC, unsigned char time )

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages