HG_REPOSITORIES/LPP/INSTRUMENTATION/SOLO_LFR/DEV_PLE Commit - r191:88d58b8c0419

python_scripts/LFRControlPlugin_reload_fsw.py created 644 +13 0

@@ -0,0 +1,13
	1	# LOAD FSW USING LINK 1
	2	SpwPlugin0.StarDundeeSelectLinkNumber( 1 )
	3
	4	dsu3plugin0.openFile("/opt/DEV_PLE/FSW-qt/bin/fsw")
	5	dsu3plugin0.loadFile()
	6
	7	dsu3plugin0.run()
	8
	9	# START SENDING TIMECODES AT 1 Hz
	10	SpwPlugin0.StarDundeeStartTimecodes( 1 )
	11
	12	# it is possible to change the time code frequency
	13	#RMAPPlugin0.changeTimecodeFrequency(2)

python_scripts/LFRControlPlugin_reload_timegen.py created 644 +12 0

@@ -0,0 +1,12
	1	# LOAD FSW USING LINK 1
	2	SpwPlugin0.StarDundeeSelectLinkNumber( 2 )
	3
	4	dsu3plugin0.openFile("/opt/DEV_PLE/timegen-qt/bin/timegen")
	5	dsu3plugin0.loadFile()
	6
	7	dsu3plugin0.run()
	8
	9	# START SENDING TIMECODES AT 1 Hz
	10	SpwPlugin0.StarDundeeStartTimecodes( 1 )
	11
	12	SpwPlugin0.StarDundeeSelectLinkNumber( 1 )

python_scripts/LFRControlPlugin_startFsw.py created 644 +29 0

@@ -0,0 +1,29
	1	#!/usr/bin/lppmon -e
	2
	3	import time
	4
	5	proxy.loadSysDriver("SpwPlugin","SpwPlugin0")
	6	SpwPlugin0.selectBridge("STAR-Dundee Spw USB Brick")
	7
	8	proxy.loadSysDriverToParent("dsu3plugin","SpwPlugin0")
	9	proxy.loadSysDriverToParent("LFRControlPlugin","SpwPlugin0")
	10
	11	availableBrickCount = SpwPlugin0.StarDundeeGetAvailableBrickCount()
	12	print "availableBrickCount = ", availableBrickCount
	13
	14	SpwPlugin0.StarDundeeSelectBrick(1)
	15	SpwPlugin0.StarDundeeSetBrickAsARouter(1)
	16	SpwPlugin0.connectBridge()
	17
	18	#SpwPlugin0.TCPServerSetIP("127.0.0.1")
	19	SpwPlugin0.TCPServerConnect()
	20
	21	#LFRControlPlugin0.SetSpwServerIP(129,104,27,164)
	22	LFRControlPlugin0.TCPServerConnect()
	23
	24	dsu3plugin0.openFile("/opt/DEV_PLE/FSW-qt/bin/fsw")
	25	dsu3plugin0.loadFile()
	26	dsu3plugin0.run()
	27
	28	LFRControlPlugin0.TMEchoBridgeOpenPort()
	29

.hgignore +1 0

             doc
             *.srec
             FSW-qt/bin/fsw
+            timegen-qt/bin/timegen
             src/LFR_basic-parameters
             *.pro.user.*
             FSW-qt/bin/spectralmatrix/asm_f0_test_20140403_case1.txt

.hgsubstate +1 -1

@@ -1,2 +1,2
1	a586fe639ac179e95bdc150ebdbab0312f31dc30 LFR_basic-parameters	1	a586fe639ac179e95bdc150ebdbab0312f31dc30 LFR_basic-parameters
2	be0dc1c1876987307ddfc0fb47044f6d41815866 header/lfr_common_headers	2	611fe904e4b4e05736a8a618c561980d10bceead 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=2 # internal
+            DEFINES += SW_VERSION_N4=3 # internal
             # <GCOV>
             #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage

src/fsw_spacewire.c +1 -1

                 grspwPtr = (unsigned int *) (REGS_ADDR_GRSPW + APB_OFFSET_GRSPW_TIME_REGISTER);
-                housekeeping_packet.hk_lfr_dpu_spw_last_timc = (unsigned char) (grspwPtr[0] & 0x3f);   // [11 1111]
+                housekeeping_packet.hk_lfr_dpu_spw_last_timc = (unsigned char) (grspwPtr[0] & 0xff);   // [11 1111]
                 // update the number of valid timecodes that have been received
                 if (housekeeping_packet.hk_lfr_dpu_spw_tick_out_cnt == 255)

src/tc_handler.c +3 -2

                 {
                     localCoarseTime = time_management_regs->coarse_time & 0x7fffffff;
+                    PRINTF2("localTime = %x, transitionTime = %x\n", localCoarseTime, transitionCoarseTime)
                     if ( transitionCoarseTime <= localCoarseTime )   // SSS-CP-EQS-322
                     {
                         status = LFR_DEFAULT;
-                        PRINTF2("ERR *** in check_transition_date *** transition = %x, local = %x\n", transitionCoarseTime, localCoarseTime)
+                        PRINTF("ERR *** in check_transition_date *** transitionCoarseTime <= localCoarseTime\n")
                     }
                     if (status == LFR_SUCCESSFUL)
                     waveform_picker_regs->start_date = transitionCoarseTime;
                 }
-                PRINTF1("commutation coarse time = %x\n", transitionCoarseTime)
             }
             void launch_spectral_matrix( void )

src/wf_handler.c +1 -1

                 delta_f0_in_float =nb_samples_per_snapshot / 2. * ( 1. / 256. - 1. / 24576.) * 256.;
                 waveform_picker_regs->delta_f0      =  delta_snapshot - floor( delta_f0_in_float );
-                waveform_picker_regs->delta_f0_2    = 0x7;         // max 7 bits
+                waveform_picker_regs->delta_f0_2    = 0x30;         // 48 = 11 0000, max 7 bits
             }
             void set_wfp_delta_f1( void )

timegen-qt/src/fsw_spacewire.c +6 -3

             {
                 struct grgpio_regs_str *grgpio_regs = (struct grgpio_regs_str *) REGS_ADDR_GRGPIO;
+                incrementLocalCoarseTime();
                 //*******
                 // GPIO 2
                 if ( get_transitionCoarseTime() == getLocalCoarseTime() )
                 rtems_event_set event_out;
                 rtems_status_code status;
                 rtems_id queue_id;
+                unsigned int coarseTimeToSend;
                 Packet_TC_LFR_UPDATE_TIME_WITH_HEADER_t update_time_packet;
                 while(true){
                     rtems_event_receive(RTEMS_EVENT_0, RTEMS_WAIT | RTEMS_EVENT_ANY, RTEMS_NO_TIMEOUT, &event_out); // wait for an SPW_LINKERR_EVENT
-                    incrementLocalCoarseTime();
+                    coarseTimeToSend = getLocalCoarseTime() + 1;
-                    updateTimePacket( getLocalCoarseTime() , &update_time_packet);
+                    updateTimePacket( coarseTimeToSend, &update_time_packet);
-                    printf("UPDT will send %x as coarse time in 700 ms\n", getLocalCoarseTime());
+                    printf("UPDT will send %x as coarse time in 700 ms\n", coarseTimeToSend);
                     rtems_task_wake_after( 70 ); // 70 => 700 ms

timegen-qt/src/tc_handler.c +3 -1

             int action_update_time(ccsdsTelecommandPacket_t *TC)
             {
                 unsigned int incomingCoarseTime;
+                unsigned int currentLocalCoarseTime;
                 incomingCoarseTime = (TC->dataAndCRC[0] << 24)
                         + (TC->dataAndCRC[1] << 16)
                         + (TC->dataAndCRC[2] << 8)
                         + TC->dataAndCRC[3];
+                currentLocalCoarseTime = getLocalCoarseTime();
                 setLocalCoarseTime( incomingCoarseTime );
-                printf( "localCoarseTime set to: %x\n", getLocalCoarseTime() );
+                printf( "currentLocalCoarseTime = %x, localCoarseTime set to: %x\n", currentLocalCoarseTime, getLocalCoarseTime() );
                 return LFR_SUCCESSFUL;
             }

timegen-qt/timegen-qt.pro +1 -1

             DEFINES += SW_VERSION_N1=0 # major
             DEFINES += SW_VERSION_N2=0 # minor
             DEFINES += SW_VERSION_N3=0 # patch
-            DEFINES += SW_VERSION_N4=1 # internal
+            DEFINES += SW_VERSION_N4=2 # internal
             contains( CONFIG, debug_tch ) {
                 DEFINES += DEBUG_TCH

	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