Merge pull request #202 from 708yamaguchi/delimiter

Use '|' as string delimiter
iory · Feb 26, 2025 · c04daf1 · c04daf1
2 parents 734f6cd + 126b506
commit c04daf1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/firmware/atom_s3_i2c_display/lib/teaching_mode/teaching_mode.cpp b/firmware/atom_s3_i2c_display/lib/teaching_mode/teaching_mode.cpp
@@ -8,7 +8,7 @@ void TeachingMode::task(PrimitiveLCD &lcd, CommunicationBase &com) {
         int listSize = 2;
         // Draw string
         char **StrList = (char **)malloc(listSize * sizeof(char *));
-        int modeCount = com.splitString(lcd.color_str, ',', StrList, listSize);
+        int modeCount = com.splitString(lcd.color_str, '|', StrList, listSize);
         lcd.drawBlack();
         lcd.printColorText(String(StrList[1]));
         // Draw AR Marker if found

diff --git a/ros/riberry_startup/node_scripts/pressure_control_mode.py b/ros/riberry_startup/node_scripts/pressure_control_mode.py
@@ -43,7 +43,7 @@ def __init__(self, i2c_addr):
             queue_size=1,
         )
         self.air_work_list = SelectList()
-        self.delimiter = ":"
+        self.delimiter = "|"
 
         # Read pressure
         self.pressures = {}

diff --git a/ros/riberry_startup/node_scripts/teaching_mode.py b/ros/riberry_startup/node_scripts/teaching_mode.py
@@ -449,7 +449,7 @@ def update_atoms3(self, event):
         if self.teaching_manager.marker_manager.is_marker_recognized():
             marker_ids = self.teaching_manager.marker_manager.current_marker_ids()
             sent_str += str(marker_ids[0])
-        delimiter = ','
+        delimiter = '|'
         sent_str += delimiter
         if self.state != State.WAIT:
             self.additional_str = ""