Circuitpython standard for function macros is upper case

Author: RetiredWizard

shared-module/terminalio/Terminal.c

@@ -44,7 +44,7 @@ void common_hal_terminalio_terminal_construct(terminalio_terminal_obj_t *self,
 }
 
 size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, const byte *data, size_t len, int *errcode) {
-    #define scrnmod(x) (((x) + (self->scroll_area->top_left_y)) % (self->scroll_area->height_in_tiles))
+    #define SCRNMOD(x) (((x) + (self->scroll_area->top_left_y)) % (self->scroll_area->height_in_tiles))
 
     // Make sure the terminal is initialized before we do anything with it.
     if (self->scroll_area == NULL) {
@@ -201,7 +201,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
                             if (vt_args[1] >= self->scroll_area->width_in_tiles) {
                                 vt_args[1] = self->scroll_area->width_in_tiles - 1;
                             }
-                            vt_args[0] = scrnmod(vt_args[0]);
+                            vt_args[0] = SCRNMOD(vt_args[0]);
                             self->cursor_x = vt_args[1];
                             self->cursor_y = vt_args[0];
                             start_y = self->cursor_y;
@@ -233,7 +233,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
                     }
                 #if CIRCUITPY_TERMINALIO_VT100
                 } else if (i[0] == 'M') {
-                    if (self->cursor_y != scrnmod(self->vt_scroll_top)) {
+                    if (self->cursor_y != SCRNMOD(self->vt_scroll_top)) {
                         if (self->cursor_y > 0) {
                             self->cursor_y = self->cursor_y - 1;
                         } else {
@@ -244,7 +244,7 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
                             // Scroll range defined, manually move tiles to perform scroll
                             for (int16_t irow = self->vt_scroll_end - 1; irow >= self->vt_scroll_top; irow--) {
                                 for (int16_t icol = 0; icol < self->scroll_area->width_in_tiles; icol++) {
-                                    common_hal_displayio_tilegrid_set_tile(self->scroll_area, icol, scrnmod(irow + 1), common_hal_displayio_tilegrid_get_tile(self->scroll_area, icol, scrnmod(irow)));
+                                    common_hal_displayio_tilegrid_set_tile(self->scroll_area, icol, SCRNMOD(irow + 1), common_hal_displayio_tilegrid_get_tile(self->scroll_area, icol, SCRNMOD(irow)));
                                 }
                             }
                             for (int16_t icol = 0; icol < self->scroll_area->width_in_tiles; icol++) {
@@ -292,15 +292,15 @@ size_t common_hal_terminalio_terminal_write(terminalio_terminal_obj_t *self, con
             self->cursor_y %= self->scroll_area->height_in_tiles;
         }
         if (self->cursor_y != start_y) {
-            if (((self->cursor_y + self->scroll_area->height_in_tiles) - 1) % self->scroll_area->height_in_tiles == scrnmod(self->vt_scroll_end)) {
+            if (((self->cursor_y + self->scroll_area->height_in_tiles) - 1) % self->scroll_area->height_in_tiles == SCRNMOD(self->vt_scroll_end)) {
                 #if CIRCUITPY_TERMINALIO_VT100
                 if (self->vt_scroll_top != 0 || self->vt_scroll_end != self->scroll_area->height_in_tiles) {
                     // Scroll range defined, manually move tiles to perform scroll
-                    self->cursor_y = scrnmod(self->vt_scroll_end);
+                    self->cursor_y = SCRNMOD(self->vt_scroll_end);
 
                     for (int16_t irow = self->vt_scroll_top; irow < self->vt_scroll_end; irow++) {
                         for (int16_t icol = 0; icol < self->scroll_area->width_in_tiles; icol++) {
-                            common_hal_displayio_tilegrid_set_tile(self->scroll_area, icol, scrnmod(irow), common_hal_displayio_tilegrid_get_tile(self->scroll_area, icol, scrnmod(irow + 1)));
+                            common_hal_displayio_tilegrid_set_tile(self->scroll_area, icol, SCRNMOD(irow), common_hal_displayio_tilegrid_get_tile(self->scroll_area, icol, SCRNMOD(irow + 1)));
                         }
                     }
                 }