Merge branch 'main' of https://github.com/DangerousPrototypes/BusPirate5-firmware

Author: DESKTOP-M9CCUTI\ian

commands/global/freq.c

@@ -90,12 +90,12 @@ uint32_t freq_print(uint8_t pin, bool refresh)
     freq_display_ns(&freq_ns_value, &ns_friendly_value, &ns_friendly_units);
 
     printf("%s%s%s IO%s%d%s: %s%.2f%s%s %s%.2f%s%s (%s%.0f%sHz), %s%s:%s %s%.1f%s%%\r%s",
-        ui_term_color_info(), t[T_MODE_FREQ_FREQUENCY],  ui_term_color_reset(), 
+        ui_term_color_info(), GET_T(T_MODE_FREQ_FREQUENCY),  ui_term_color_reset(), 
         ui_term_color_num_float(), pin, ui_term_color_reset(),
         ui_term_color_num_float(),freq_friendly_value,ui_term_color_reset(), ui_const_freq_labels[freq_friendly_units],
         ui_term_color_num_float(),ns_friendly_value, ui_term_color_reset(), ui_const_freq_labels[ns_friendly_units],
         ui_term_color_num_float(),measured_period, ui_term_color_reset(), 
-        ui_term_color_info(), t[T_MODE_FREQ_DUTY_CYCLE], ui_term_color_reset(),
+        ui_term_color_info(), GET_T(T_MODE_FREQ_DUTY_CYCLE), ui_term_color_reset(),
         ui_term_color_num_float(), measured_duty_cycle * 100.f, ui_term_color_reset(), (refresh?"":"\n")
     ); 
 
@@ -109,7 +109,7 @@ uint32_t freq_configure_enable(void)
 {
     uint32_t pin;
 
-    printf("%s%s%s",ui_term_color_info(), t[T_MODE_FREQ_MEASURE_FREQUENCY], ui_term_color_reset());
+    printf("%s%s%s",ui_term_color_info(), GET_T(T_MODE_FREQ_MEASURE_FREQUENCY), ui_term_color_reset());
 
     static const struct ui_prompt_config freq_menu_enable_config={
         false,false,false,true,
@@ -147,8 +147,8 @@ uint32_t freq_configure_enable(void)
     system_set_active(true, (uint8_t)pin, &system_config.freq_active);
 
     printf("\r\n%s%s:%s %s on IO%s%d%s\r\n", 
-        ui_term_color_notice(),t[T_MODE_FREQ_MEASURE_FREQUENCY],ui_term_color_reset(),
-        t[T_MODE_ENABLED], ui_term_color_num_float(),(uint8_t)pin,ui_term_color_reset() 
+        ui_term_color_notice(),GET_T(T_MODE_FREQ_MEASURE_FREQUENCY),ui_term_color_reset(),
+        GET_T(T_MODE_ENABLED), ui_term_color_num_float(),(uint8_t)pin,ui_term_color_reset() 
     );
 
     //initial measurement
@@ -207,8 +207,8 @@ uint32_t freq_configure_disable(void)
     system_set_active(false, (uint8_t)pin, &system_config.freq_active);
 
     printf("\r\n%s%s:%s %s on IO%s%d%s", 
-        ui_term_color_notice(),t[T_MODE_FREQ_MEASURE_FREQUENCY],ui_term_color_reset(),
-        t[T_MODE_DISABLED], ui_term_color_num_float(),(uint8_t)pin,ui_term_color_reset() 
+        ui_term_color_notice(),GET_T(T_MODE_FREQ_MEASURE_FREQUENCY),ui_term_color_reset(),
+        GET_T(T_MODE_DISABLED), ui_term_color_num_float(),(uint8_t)pin,ui_term_color_reset() 
     );
 
     return 1;           

commands/global/i_info.c

@@ -45,7 +45,7 @@ void i_info_handler(struct command_result *res){
 
 	printf("\r\n%s\r\n", BP_HARDWARE_VERSION);
 	printf("%s %s%s%s @ %s (%s%s%s)\r\n", 
-		t[T_INFO_FIRMWARE], 
+		GET_T(T_INFO_FIRMWARE), 
 		ui_term_color_num_float(),
 		BP_FIRMWARE_VERSION, 
 		ui_term_color_reset(),
@@ -57,61 +57,64 @@ void i_info_handler(struct command_result *res){
 		ui_term_color_num_float(),
 		BP_HARDWARE_MCU, 
 		ui_term_color_reset(),
-		t[T_INFO_WITH], 
+		GET_T(T_INFO_WITH), 
 		ui_term_color_num_float(),
 		BP_HARDWARE_RAM, 
 		ui_term_color_reset(),
-		t[T_INFO_RAM], 
+		GET_T(T_INFO_RAM), 
 		ui_term_color_num_float(),
 		BP_HARDWARE_FLASH, 
 		ui_term_color_reset(),
-		t[T_INFO_FLASH]);
+		GET_T(T_INFO_FLASH));
 	printf("%s: %s%016llX%s\r\n", 
-		t[T_INFO_SN], 
+		GET_T(T_INFO_SN), 
 		ui_term_color_num_float(),
 		mcu_get_unique_id(),
 		ui_term_color_reset());
-	printf("%s\r\n", t[T_INFO_WEBSITE]);
+	printf("%s\r\n", GET_T(T_INFO_WEBSITE));
 
 	// TF flash card information
 	if(system_config.storage_available){
 		printf("%s: %s%6.2fGB%s (%s %s)\r\n", 
-			t[T_INFO_TF_CARD],
+			GET_T(T_INFO_TF_CARD),
 			ui_term_color_num_float(),
 			system_config.storage_size, 
 			ui_term_color_reset(),
 			storage_fat_type_labels[system_config.storage_fat_type-1],
-			t[T_INFO_FILE_SYSTEM]
+			GET_T(T_INFO_FILE_SYSTEM)
 		);
 
 	}else{
-		printf("%s: %s\r\n", t[T_INFO_TF_CARD], t[T_NOT_DETECTED]);
+		printf("%s: %s\r\n", GET_T(T_INFO_TF_CARD), GET_T(T_NOT_DETECTED));
 	}
 
 	//config file loaded
-	printf("\r\n%s%s:%s %s\r\n", ui_term_color_info(), t[T_CONFIG_FILE], ui_term_color_reset(), system_config.config_loaded_from_file?t[T_LOADED]:t[T_NOT_DETECTED]);
+	do {
+		const char * string = system_config.config_loaded_from_file ? GET_T(T_LOADED) : GET_T(T_NOT_DETECTED);
+		printf("\r\n%s%s:%s %s\r\n", ui_term_color_info(), GET_T(T_CONFIG_FILE), ui_term_color_reset(), string);
+	} while (0);
 
 	if(system_config.big_buffer_owner!=BP_BIG_BUFFER_NONE){
 		printf("%sBig buffer allocated to:%s #%d\r\n", ui_term_color_info(), ui_term_color_reset(), system_config.big_buffer_owner);
 	}
 
 
 	// Installed modes
-	printf("%s%s:%s", ui_term_color_info(), t[T_INFO_AVAILABLE_MODES], ui_term_color_reset());
+	printf("%s%s:%s", ui_term_color_info(), GET_T(T_INFO_AVAILABLE_MODES), ui_term_color_reset());
 	for(i=0; i<count_of(modes); i++){
 		printf(" %s", modes[i].protocol_name);
 	}
 	printf("\r\n");
 
 	// Current mode configuration
-	printf("%s%s:%s ", ui_term_color_info(), t[T_INFO_CURRENT_MODE], ui_term_color_reset());
+	printf("%s%s:%s ", ui_term_color_info(), GET_T(T_INFO_CURRENT_MODE), ui_term_color_reset());
 	//TODO: change to a return type and stick this in the fprint
 	modes[system_config.mode].protocol_settings();
 	printf("\r\n");
 
     printf("%s%s:%s %s\r\n", 
         ui_term_color_info(), 
-        t[T_INFO_DISPLAY_FORMAT], 
+        GET_T(T_INFO_DISPLAY_FORMAT), 
         ui_term_color_reset(), 
         ui_const_display_formats[system_config.display_format]);
 
@@ -120,40 +123,40 @@ void i_info_handler(struct command_result *res){
         // Data settings and configuration
 		printf("%s%s:%s %d %s, %s %s\r\n",
 			ui_term_color_info(),
-			t[T_INFO_DATA_FORMAT], 
+			GET_T(T_INFO_DATA_FORMAT), 
 			ui_term_color_reset(),
 			system_config.num_bits, 
-			t[T_INFO_BITS], 
+			GET_T(T_INFO_BITS), 
 			ui_const_bit_orders[system_config.bit_order], 
-			t[T_INFO_BITORDER]);
+			GET_T(T_INFO_BITORDER));
 
-		printf("%s%s:%s %s\r\n", ui_term_color_info(), t[T_INFO_PULLUP_RESISTORS], ui_term_color_reset(), ui_const_pin_states[system_config.pullup_enabled]);
+		printf("%s%s:%s %s\r\n", ui_term_color_info(), GET_T(T_INFO_PULLUP_RESISTORS), ui_term_color_reset(), ui_const_pin_states[system_config.pullup_enabled]);
 
         if(system_config.psu && !system_config.psu_error){
             printf("%s%s:%s %s (%u.%uV/%u.%uV)\r\n", 
-                ui_term_color_info(), t[T_INFO_POWER_SUPPLY], ui_term_color_reset(), t[T_ON],
+                ui_term_color_info(), GET_T(T_INFO_POWER_SUPPLY), ui_term_color_reset(), GET_T(T_ON),
                 (*hw_pin_voltage_ordered[0])/1000, ((*hw_pin_voltage_ordered[0])%1000)/100, 
                 (system_config.psu_voltage)/10000, ((system_config.psu_voltage)%10000)/100);
 
             uint32_t isense=((hw_adc_raw[HW_ADC_CURRENT_SENSE]) * ((500 * 1000)/4095)); //TODO: move this to a PSU function for all calls
             printf("%s%s:%s OK (%u.%umA/%u.%umA)\r\n", 
-                ui_term_color_info(), t[T_INFO_CURRENT_LIMIT], ui_term_color_reset(), 
+                ui_term_color_info(), GET_T(T_INFO_CURRENT_LIMIT), ui_term_color_reset(), 
                 (isense/1000), ((isense%1000)/100), 
                 (system_config.psu_current_limit)/10000, ((system_config.psu_current_limit)%10000)/100 );
         }else{
-            printf("%s%s:%s %s\r\n", ui_term_color_info(), t[T_INFO_POWER_SUPPLY], ui_term_color_reset(), t[T_OFF]);
+            printf("%s%s:%s %s\r\n", ui_term_color_info(), GET_T(T_INFO_POWER_SUPPLY), ui_term_color_reset(), GET_T(T_OFF));
 
             if(system_config.psu_error){
                 printf("%s%s:%s %s (exceeded %u.%umA)\r\n", 
-                    ui_term_color_info(), t[T_INFO_CURRENT_LIMIT], ui_term_color_reset(), 
+                    ui_term_color_info(), GET_T(T_INFO_CURRENT_LIMIT), ui_term_color_reset(), 
                     ui_const_pin_states[5],
                     (system_config.psu_current_limit)/10000, ((system_config.psu_current_limit)%10000)/100 );               
             }
 
 
         }
 
-		printf("%s%s:%s %s\r\n", ui_term_color_info(), t[T_INFO_FREQUENCY_GENERATORS], ui_term_color_reset(), !system_config.pwm_active?t[T_OFF]:" ");
+		printf("%s%s:%s %s\r\n", ui_term_color_info(), GET_T(T_INFO_FREQUENCY_GENERATORS), ui_term_color_reset(), !system_config.pwm_active ? GET_T(T_OFF) : " ");
 
         // PWMs
         if(system_config.pwm_active){

commands/global/l_bitorder.c

@@ -14,8 +14,8 @@ void bitorder_msb(void){
 void bitorder_msb_handler(struct command_result *res){
     bitorder_msb();
     printf("%s%s:%s %s 0b%s1%s0000000",
-        ui_term_color_notice(),t[T_MODE_BITORDER],ui_term_color_reset(),
-        t[T_MODE_BITORDER_MSB],	ui_term_color_info(),ui_term_color_reset()
+        ui_term_color_notice(),GET_T(T_MODE_BITORDER),ui_term_color_reset(),
+        GET_T(T_MODE_BITORDER_MSB),	ui_term_color_info(),ui_term_color_reset()
     );
 }
 
@@ -26,7 +26,7 @@ void bitorder_lsb(void){
 void bitorder_lsb_handler(struct command_result *res){
     bitorder_lsb();
     printf("%s%s:%s %s 0b0000000%s1%s",
-        ui_term_color_notice(),	t[T_MODE_BITORDER],	ui_term_color_reset(),
-        t[T_MODE_BITORDER_LSB],	ui_term_color_info(), ui_term_color_reset()
+        ui_term_color_notice(),	GET_T(T_MODE_BITORDER),	ui_term_color_reset(),
+        GET_T(T_MODE_BITORDER_LSB),	ui_term_color_info(), ui_term_color_reset()
     );    
 }

commands/global/p_pullups.c

@@ -34,8 +34,8 @@ void pullups_enable_handler(struct command_result *res){
 
     amux_sweep();
     printf("%s%s:%s %s (%s @ %s%d.%d%sV)", 
-        ui_term_color_notice(), t[T_MODE_PULLUP_RESISTORS],	ui_term_color_reset(), 
-        t[T_MODE_ENABLED], BP_HARDWARE_PULLUP_VALUE, 
+        ui_term_color_notice(), GET_T(T_MODE_PULLUP_RESISTORS),	ui_term_color_reset(), 
+        GET_T(T_MODE_ENABLED), BP_HARDWARE_PULLUP_VALUE, 
         ui_term_color_num_float(), hw_adc_voltage[HW_ADC_MUX_VREF_VOUT]/1000, 
         (hw_adc_voltage[HW_ADC_MUX_VREF_VOUT]%1000)/100, ui_term_color_reset()
     );
@@ -59,8 +59,8 @@ void pullups_disable_handler(struct command_result *res){
     pullups_disable();
 
     printf("%s%s:%s %s",
-        ui_term_color_notice(),t[T_MODE_PULLUP_RESISTORS],ui_term_color_reset(),
-        t[T_MODE_DISABLED]
+        ui_term_color_notice(),GET_T(T_MODE_PULLUP_RESISTORS),ui_term_color_reset(),
+        GET_T(T_MODE_DISABLED)
     );
 }
 

commands/global/pause.c

@@ -33,9 +33,9 @@ void pause_handler(struct command_result *res){
     bool exit_on_x=cmdln_args_find_flag('x'|0x20);
 
     //print option messages
-    if(pause_for_key) printf("%s\r\n", t[T_PRESS_ANY_KEY]);
-    if(pause_for_button) printf("%s\r\n", t[T_PRESS_BUTTON]);
-    if(exit_on_x) printf("%s\r\n", t[T_PRESS_X_TO_EXIT]);
+    if(pause_for_key) printf("%s\r\n", GET_T(T_PRESS_ANY_KEY));
+    if(pause_for_button) printf("%s\r\n", GET_T(T_PRESS_BUTTON));
+    if(exit_on_x) printf("%s\r\n", GET_T(T_PRESS_X_TO_EXIT));
 
     for(;;){
 
@@ -46,7 +46,7 @@ void pause_handler(struct command_result *res){
         if(rx_fifo_try_get(&c)){
             if(exit_on_x && ((c|0x20)=='x')) {
                 res->error=true;
-                printf("%s\r\n", t[T_EXIT]);
+                printf("%s\r\n", GET_T(T_EXIT));
                 return;
             }
             if(pause_for_key) return;

commands/global/pwm.c

@@ -55,7 +55,7 @@ void pwm_configure_enable(struct command_result *res)
 {
     uint32_t pin;
 
-    printf("%s%s%s",ui_term_color_info(), t[T_MODE_PWM_GENERATE_FREQUENCY], ui_term_color_reset());
+    printf("%s%s%s",ui_term_color_info(), GET_T(T_MODE_PWM_GENERATE_FREQUENCY), ui_term_color_reset());
 
     static const struct ui_prompt_config freq_menu_enable_config={
         false,false,false,true,
@@ -112,8 +112,8 @@ void pwm_configure_enable(struct command_result *res)
     system_set_active(true, (uint8_t)pin, &system_config.pwm_active);    
 
     printf("\r\n%s%s:%s %s on IO%s%d%s\r\n", 
-        ui_term_color_notice(),t[T_MODE_PWM_GENERATE_FREQUENCY],ui_term_color_reset(),
-        t[T_MODE_ENABLED], ui_term_color_num_float(),(uint8_t)pin,ui_term_color_reset() 
+        ui_term_color_notice(),GET_T(T_MODE_PWM_GENERATE_FREQUENCY),ui_term_color_reset(),
+        GET_T(T_MODE_ENABLED), ui_term_color_num_float(),(uint8_t)pin,ui_term_color_reset() 
     );
 
 }
@@ -200,8 +200,8 @@ void pwm_configure_disable(struct command_result *res){
     system_set_active(false, (uint8_t)pin, &system_config.pwm_active);    
 
     printf("\r\n%s%s:%s %s on IO%s%d%s", 
-        ui_term_color_notice(),t[T_MODE_PWM_GENERATE_FREQUENCY],ui_term_color_reset(),
-        t[T_MODE_DISABLED], ui_term_color_num_float(),(uint8_t)pin,ui_term_color_reset() 
+        ui_term_color_notice(),GET_T(T_MODE_PWM_GENERATE_FREQUENCY),ui_term_color_reset(),
+        GET_T(T_MODE_DISABLED), ui_term_color_num_float(),(uint8_t)pin,ui_term_color_reset() 
     );
 
 }

commands/global/v_adc.c

@@ -36,7 +36,7 @@ uint32_t adc_print(uint8_t bio_pin, bool refresh){
 	//sweep adc
 	amux_sweep();
     printf("%s%s IO%d:%s %s%d.%d%sV\r%s",
-        ui_term_color_info(), t[T_MODE_ADC_VOLTAGE], bio_pin, ui_term_color_reset(), ui_term_color_num_float(),
+        ui_term_color_info(), GET_T(T_MODE_ADC_VOLTAGE), bio_pin, ui_term_color_reset(), ui_term_color_num_float(),
 		((*hw_pin_voltage_ordered[bio_pin+1])/1000), (((*hw_pin_voltage_ordered[bio_pin+1])%1000)/100),
 		 ui_term_color_reset(), (refresh?"":"\n")); 
     return 1;	
@@ -58,7 +58,7 @@ void adc_measure(struct command_result *res, bool refresh){
 	if(!has_value){ //show voltage on all pins
 		if(refresh){
 			//TODO: use the ui_prompt_continue function, but how to deal with the names and labels????
-			printf("%s%s%s\r\n%s", ui_term_color_notice(), t[T_PRESS_ANY_KEY_TO_EXIT], ui_term_color_reset(), ui_term_cursor_hide());
+			printf("%s%s%s\r\n%s", ui_term_color_notice(), GET_T(T_PRESS_ANY_KEY_TO_EXIT), ui_term_color_reset(), ui_term_cursor_hide());
 			system_config.terminal_hide_cursor=true;
 		}
 

commands/global/w_psu.c

@@ -128,9 +128,9 @@ void psucmd_enable_handler(struct command_result *res){
         // current limit disabled
         printf("%s%s:%s%s\r\n",
         ui_term_color_notice(),
-        t[T_INFO_CURRENT_LIMIT],
+        GET_T(T_INFO_CURRENT_LIMIT),
         ui_term_color_reset(),
-        t[T_MODE_DISABLED]);
+        GET_T(T_MODE_DISABLED));
     }else{
         // x.xmA requested, closest value: x.xmA
         printf("%s%1.1f%smA%s requested, closest value: %s%3.1f%smA\r\n", 
@@ -141,9 +141,9 @@ void psucmd_enable_handler(struct command_result *res){
     // power supply: enabled
     printf("\r\n%s%s:%s%s\r\n",
         ui_term_color_notice(),
-        t[T_MODE_POWER_SUPPLY],
+        GET_T(T_MODE_POWER_SUPPLY),
         ui_term_color_reset(),
-        t[T_MODE_ENABLED]);
+        GET_T(T_MODE_ENABLED));
 
     // any error codes starting the PSU?
     if(psu_result!=PSU_OK){
@@ -193,9 +193,9 @@ void psucmd_disable_handler(struct command_result *res){
     psucmd_disable();
     printf("%s%s: %s%s\r\n",
         ui_term_color_notice(),
-        t[T_MODE_POWER_SUPPLY],
+        GET_T(T_MODE_POWER_SUPPLY),
         ui_term_color_reset(),
-        t[T_MODE_DISABLED]);        
+        GET_T(T_MODE_DISABLED));        
 }
 
 bool psucmd_init(void){       

commands/hdplxuart/bridge.c

@@ -50,7 +50,7 @@ void hduart_bridge_handler(struct command_result *res){
     bio_output(BIO2);
     bio_put(BIO2, system_config.rts); 
 
-    printf("%s%s%s\r\n", ui_term_color_notice(),t[T_HELP_UART_BRIDGE_EXIT], ui_term_color_reset());
+    printf("%s%s%s\r\n", ui_term_color_notice(),GET_T(T_HELP_UART_BRIDGE_EXIT), ui_term_color_reset());
     while(true){
         char c;
         bio_put(BIO2, !system_config.rts); 

commands/i2c/demos.c

@@ -23,7 +23,7 @@ void demo_tsl2561(struct command_result *res){
 	//0b11011100
 	uint16_t chan0, chan1;
 	char data[4];
-	printf("%s\r\n",t[T_HELP_I2C_TSL2561]);
+	printf("%s\r\n",GET_T(T_HELP_I2C_TSL2561));
 	//select register [0b01110010 0b11100000]
 	data[0]=0b11100000;
 	if(pio_i2c_write_blocking_timeout( 0b01110010, data, 1, 0xffff)) return;
@@ -55,7 +55,7 @@ void demo_ms5611(struct command_result *res){
 	//ADC read [0b11101110 0] [0b11101111 r:3]
 	float temperature;
 	float pressure;
-	printf("%s\r\n",t[T_HELP_I2C_MS5611]);
+	printf("%s\r\n",GET_T(T_HELP_I2C_MS5611));
 	if(ms5611_read_temperature_and_pressure_simple( &temperature, &pressure)){
 		res->error=1;
 		return;
@@ -65,7 +65,7 @@ void demo_ms5611(struct command_result *res){
 
 void demo_si7021(struct command_result *res){
 	uint8_t data[8];
-	printf("%s\r\n",t[T_HELP_I2C_SI7021]);
+	printf("%s\r\n",GET_T(T_HELP_I2C_SI7021));
 	// humidity
 	data[0]=0xf5;
 	if(pio_i2c_write_blocking_timeout( 0x80, data, 1, 0xffff)) return;