Use primary/secondary terminology in scripts

Author: jepler

extmod/machine_i2c.c

@@ -193,7 +193,7 @@ int mp_machine_soft_i2c_writeto(mp_obj_base_t *self_in, uint16_t addr, const uin
         return ret;
     }
 
-    // write the slave address
+    // write the secondary address
     ret = mp_hal_i2c_write_byte(self, addr << 1);
     if (ret < 0) {
         return ret;
@@ -239,7 +239,7 @@ int mp_machine_soft_i2c_readfrom(mp_obj_base_t *self_in, uint16_t addr, uint8_t
         return ret;
     }
 
-    // write the slave address
+    // write the secondary address
     ret = mp_hal_i2c_write_byte(self, (addr << 1) | 1);
     if (ret < 0) {
         return ret;
@@ -249,7 +249,7 @@ int mp_machine_soft_i2c_readfrom(mp_obj_base_t *self_in, uint16_t addr, uint8_t
         return -MP_ENODEV;
     }
 
-    // read the bytes from the slave
+    // read the bytes from the secondary
     while (len--) {
         ret = mp_hal_i2c_read_byte(self, dest++, len == 0);
         if (ret != 0) {

tests/run-tests

@@ -87,28 +87,28 @@ def run_micropython(pyb, args, test_file, is_special=False):
                     def get(required=False):
                         rv = b''
                         while True:
-                            ready = select.select([master], [], [], 0.02)
-                            if ready[0] == [master]:
-                                rv += os.read(master, 1024)
+                            ready = select.select([primary], [], [], 0.02)
+                            if ready[0] == [primary]:
+                                rv += os.read(primary, 1024)
                             else:
                                 if not required or rv:
                                     return rv
 
                     def send_get(what):
-                        os.write(master, what)
+                        os.write(primary, what)
                         return get()
 
                     with open(test_file, 'rb') as f:
                         # instead of: output_mupy = subprocess.check_output(args, stdin=f)
-                        master, slave = pty.openpty()
-                        p = subprocess.Popen(args, stdin=slave, stdout=slave,
+                        primary, secondary = pty.openpty()
+                        p = subprocess.Popen(args, stdin=secondary, stdout=secondary,
                                              stderr=subprocess.STDOUT, bufsize=0)
                         banner = get(True)
                         output_mupy = banner + b''.join(send_get(line) for line in f)
                         send_get(b'\x04') # exit the REPL, so coverage info is saved
                         p.kill()
-                        os.close(master)
-                        os.close(slave)
+                        os.close(primary)
+                        os.close(secondary)
                 else:
                     output_mupy = subprocess.check_output(args + [test_file], stderr=subprocess.STDOUT)
             except subprocess.CalledProcessError:

tools/pyboard.py

@@ -191,7 +191,7 @@ def inWaiting(self):
 
 
 class ProcessPtyToTerminal:
-    """Execute a process which creates a PTY and prints slave PTY as
+    """Execute a process which creates a PTY and prints secondary PTY as
     first line of its output, and emulate serial connection using
     this PTY."""