firmware , production

firmware/h-files/cariboulite_fpga_firmware.h

@@ -17,15 +17,15 @@ extern "C" {
 
 /*
  * Time tagging of the module through the 'struct tm' structure 
- *     Date: 2022-01-05
- *     Time: 15:28:36
+ *     Date: 2022-04-20
+ *     Time: 18:29:19
  */
 struct tm cariboulite_firmware_date_time = {
-   .tm_sec = 36,
-   .tm_min = 28,
-   .tm_hour = 15,
-   .tm_mday = 5,
-   .tm_mon = 0,   /* +1    */
+   .tm_sec = 19,
+   .tm_min = 29,
+   .tm_hour = 18,
+   .tm_mday = 20,
+   .tm_mon = 3,   /* +1    */
    .tm_year = 122,  /* +1900 */
 };
 

firmware/top.v

@@ -261,10 +261,7 @@ module top(
       .i_reset (w_soft_reset),
       .i_ddr_clk (lvds_clock_buf),
       
-      // test reversed LSB / MSB
-      // -----------------------
       .i_ddr_data ({w_lvds_rx_09_d1, w_lvds_rx_09_d0}),
-	  //.i_ddr_data ({w_lvds_rx_09_d0, w_lvds_rx_09_d1}),
       
       .i_fifo_full (w_rx_09_fifo_full),
       .o_fifo_write_clk (w_rx_09_fifo_write_clk),
@@ -299,8 +296,6 @@ module top(
       .i_reset (w_soft_reset),
       .i_ddr_clk (lvds_clock_buf),
 
-      // test reversed LSB / MSB
-      // -----------------------
       .i_ddr_data ({!w_lvds_rx_24_d1, !w_lvds_rx_24_d0}),
 
       .i_fifo_full (w_rx_24_fifo_full),

software/libcariboulite/src/cariboulite_fpga_firmware.h

@@ -17,15 +17,15 @@ extern "C" {
 
 /*
  * Time tagging of the module through the 'struct tm' structure 
- *     Date: 2022-01-05
- *     Time: 15:28:36
+ *     Date: 2022-04-20
+ *     Time: 18:29:19
  */
 struct tm cariboulite_firmware_date_time = {
-   .tm_sec = 36,
-   .tm_min = 28,
-   .tm_hour = 15,
-   .tm_mday = 5,
-   .tm_mon = 0,   /* +1    */
+   .tm_sec = 19,
+   .tm_min = 29,
+   .tm_hour = 18,
+   .tm_mday = 20,
+   .tm_mon = 3,   /* +1    */
    .tm_year = 122,  /* +1900 */
 };
 

software/libcariboulite/src/cariboulite_production.c

@@ -60,29 +60,7 @@ cariboulite_eeprom_st ee = { .i2c_address = 0x50, .eeprom_type = eeprom_type_24c
 int cariboulite_prod_eeprom_programming(cariboulite_st* sys, cariboulite_eeprom_st* eeprom)
 {
 	int led0 = 0, led1 = 0, btn = 0, cfg = 0;
-	ZF_LOGI("==============================================");
-	ZF_LOGI("EEPROM CONFIG - PRESS AND HOLD BUTTON");
-
-	int c = 0;
-	while (1)
-	{
-		caribou_fpga_get_io_ctrl_dig (&sys->fpga, &led0, &led1, &btn, &cfg);
-		if (btn == 0)	// pressed
-		{
-			ZF_LOGI("    <=== KEEP HOLDING THE BUTTON ====>");
-			caribou_fpga_set_io_ctrl_dig (&sys->fpga, 1, 1);
-			break;
-		}
-
-		if (c == 0) caribou_fpga_set_io_ctrl_dig (&sys->fpga, 0, 0);
-		else if (c == 1) caribou_fpga_set_io_ctrl_dig (&sys->fpga, 0, 1);
-		else if (c == 2) caribou_fpga_set_io_ctrl_dig (&sys->fpga, 1, 1);
-		else if (c == 3) caribou_fpga_set_io_ctrl_dig (&sys->fpga, 1, 0);
-
-		usleep(200000);
-		c = (c + 1) % 4;
-	}
-
+	caribou_fpga_get_io_ctrl_dig (&sys->fpga, &led0, &led1, &btn, &cfg);
 	cariboulite_system_type_en type = (cfg&0x1)?cariboulite_system_type_full:cariboulite_system_type_ism;
 	if (type == cariboulite_system_type_full) ZF_LOGI("Detected CaribouLite FULL Version");
 	else if (type == cariboulite_system_type_ism) ZF_LOGI("Detected CaribouLite ISM Version");
@@ -90,7 +68,7 @@ int cariboulite_prod_eeprom_programming(cariboulite_st* sys, cariboulite_eeprom_
 
 	sleep(1);
 	caribou_fpga_set_io_ctrl_dig (&sys->fpga, 0, 0);
-	ZF_LOGI("    <=== DONE - YOU CAN RELEASE BUTTON ====>");
+	ZF_LOGI("Finished EEPROM configuration");
 	return 0;
 }
 
@@ -167,8 +145,6 @@ int main(int argc, char *argv[])
     // setup the signal handler
     cariboulite_setup_signal_handler (&cariboulite_sys, sighandler, cariboulite_signal_handler_op_last, &cariboulite_sys);
 
-
-
     // dummy loop
     sleep(1);
     while (program_running)

software/libcariboulite/src/soapy_api/CaribouliteSampleQueue.cpp

@@ -125,7 +125,7 @@ int SoapySDR::Stream::ReadSamples(caribou_smi_sample_complex_int16* buffer, size
     
     int tot_read_elements = res;
 
-	return tot_read_elements;  
+	//return tot_read_elements;  
 
 	if (filterType != DigitalFilter_None && filter_i != NULL && filter_q != NULL)
 	{