Unambiguous color abbreviations in accordance with EC 60757

Based on the original work of @endolith at BusPirate#136 - I also filled the colors for Bus Pirate v4. Co-authored-by: endolith <[email protected]> Signed-off-by: Mike Banon <[email protected]>
mikebdp2 · Feb 11, 2024 · 9a81c15 · 9a81c15
1 parent d6fb95d
commit 9a81c15
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Firmware/messages_v4.s b/Firmware/messages_v4.s
@@ -704,7 +704,7 @@ _BPMSG1255_str:
 	.section .text.BPMSG1256, code
 	.global _BPMSG1256_str
 _BPMSG1256_str:
-	.pasciz "#12    \t#11    \t#10    \t#09   \t#08   \t#07   \t#06   \t#05   \t#04   \t#03   \t#02   \t#01   "
+	.pasciz "12.(Bk)\t11.(Wt)\t10.(Gy)\t9.(Pu)\t8.(Bu)\t7.(Gn)\t6.(Yw)\t5.(Or)\t4.(Rd)\t3.(Br)\t2.(Bk)\1.(Wt)"
 
 	; BPMSG1257
 	.section .text.BPMSG1257, code

diff --git a/Firmware/proc_menu.c b/Firmware/proc_menu.c
@@ -1594,10 +1594,10 @@ void print_status_info(void) {
 void print_pins_information(void) {
   BPMSG1226;
 #ifdef BUSPIRATEV4
-  BPMSG1256; // bpWstring("12.(RD)\t11.(BR)\t10.(BLK)\t9.(WT)\t8.(GR)\t7.(PU)\t6.(BL)\t5.(GN)\t4.(YW)\t3.(OR)\t2.(RD)\1.(BR)");
+  BPMSG1256; // bpWstring("12.(Bk)\t11.(Wt)\t10.(Gy)\t9.(Pu)\t8.(Bu)\t7.(Gn)\t6.(Yw)\t5.(Or)\t4.(Rd)\t3.(Br)\t2.(Bk)\1.(Wt)");
   BPMSG1257; // bpWstring("GND\t5.0V\t3.3V\tVPU\tADC\tAUX2\tAUX1\tAUX\t");
 #else
-  BPMSG1233; // bpWstring("1.(BR)\t2.(RD)\t3.(OR)\t4.(YW)\t5.(GN)\t6.(BL)\t7.(PU)\t8.(GR)\t9.(WT)\t0.(BLK)");
+  BPMSG1233; // bpWstring("1.(Br)\t2.(Rd)\t3.(Or)\t4.(Yw)\t5.(Gn)\t6.(Bu)\t7.(Pu)\t8.(Gy)\t9.(Wt)\t0.(Bk)");
   BPMSG1227; // bpWstring("GND\t3.3V\t5.0V\tADC\tVPU\tAUX\t");
 #endif /* BUSPIRATEV4 */
 

diff --git a/tools/packstrings/bus_pirate_v3_strings.txt b/tools/packstrings/bus_pirate_v3_strings.txt
@@ -24,7 +24,7 @@ BPMSG1126	0	" Bootloader v"
 BPMSG1163	1	"Disconnect any devices\r\nConnect (Vpu to +5V) and (ADC to +3.3V)"
 BPMSG1178	1	"MODE and VREG LEDs should be on!"
 BPMSG1227	0	"GND\t3.3V\t5.0V\tADC\tVPU\tAUX\t"
-BPMSG1233	1	"1.(BR)\t2.(RD)\t3.(OR)\t4.(YW)\t5.(GN)\t6.(BL)\t7.(PU)\t8.(GR)\t9.(WT)\t0.(Blk)"
+BPMSG1233	1	"1.(Br)\t2.(Rd)\t3.(Or)\t4.(Yw)\t5.(Gn)\t6.(Bu)\t7.(Pu)\t8.(Gy)\t9.(Wt)\t0.(Bk)"
 HLP1000	1	" General\t\t\t\t\tProtocol interaction"
 HLP1001	1	" ---------------------------------------------------------------------------"
 HLP1002	1	" ?\tThis help\t\t\t(0)\tList current macros"