diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml index 454ffb71a..01535306e 100644 --- a/.github/workflows/main_matrix.yml +++ b/.github/workflows/main_matrix.yml @@ -1,7 +1,7 @@ name: CI -concurrency: - group: ${{ github.ref }} - cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} +#concurrency: +# group: ${{ github.ref }} +# cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} on: # # Triggers the workflow on push but only for the master branch push: diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp index d1cc5ad36..b8abec66e 100644 --- a/src/graphics/Screen.cpp +++ b/src/graphics/Screen.cpp @@ -835,7 +835,11 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_ } static char distStr[20]; - strncpy(distStr, "? km", sizeof(distStr)); // might not have location data + if (config.display.units == meshtastic_Config_DisplayConfig_DisplayUnits_IMPERIAL) { + strncpy(distStr, "? mi", sizeof(distStr)); // might not have location data + } else { + strncpy(distStr, "? km", sizeof(distStr)); + } meshtastic_NodeInfoLite *ourNode = nodeDB.getMeshNode(nodeDB.getNodeNum()); const char *fields[] = {username, distStr, signalStr, lastStr, NULL}; int16_t compassX = 0, compassY = 0;