global: add _img suffixes to icons & images to avoid naming collisions

and3rson · Apr 14, 2024 · d374787 · d374787
1 parent f30d78d
commit d374787
Show file tree

Hide file tree

Showing 38 changed files with 122 additions and 122 deletions.
diff --git a/firmware/keira/src/apps/gpiomanager.cpp b/firmware/keira/src/apps/gpiomanager.cpp
@@ -43,7 +43,7 @@ void GPIOManagerApp::run() {
             for (int i = 0; i < PIN_COUNT; i++) {
                 menu.addItem(
                     String(pinNo[i]) + (pinM[i] == INPUT ? " <- IN" : " -> OUT"),
-                    pinM[i] == INPUT ? &input : &output,
+                    pinM[i] == INPUT ? &input_img : &output_img,
                     0,
                     pinData[i] == HIGH ? "HIGH" : "LOW"
                 );

diff --git a/firmware/keira/src/apps/icons/app.h b/firmware/keira/src/apps/icons/app.h
diff --git a/firmware/keira/src/apps/icons/app_group.h b/firmware/keira/src/apps/icons/app_group.h
diff --git a/firmware/keira/src/apps/icons/battery.h b/firmware/keira/src/apps/icons/battery.h
diff --git a/firmware/keira/src/apps/icons/battery_absent.h b/firmware/keira/src/apps/icons/battery_absent.h
diff --git a/firmware/keira/src/apps/icons/battery_danger.h b/firmware/keira/src/apps/icons/battery_danger.h
diff --git a/firmware/keira/src/apps/icons/bin.h b/firmware/keira/src/apps/icons/bin.h
diff --git a/firmware/keira/src/apps/icons/demos.h b/firmware/keira/src/apps/icons/demos.h
diff --git a/firmware/keira/src/apps/icons/dev.h b/firmware/keira/src/apps/icons/dev.h
diff --git a/firmware/keira/src/apps/icons/folder.h b/firmware/keira/src/apps/icons/folder.h
diff --git a/firmware/keira/src/apps/icons/hdd.h b/firmware/keira/src/apps/icons/hdd.h
diff --git a/firmware/keira/src/apps/icons/info.h b/firmware/keira/src/apps/icons/info.h
diff --git a/firmware/keira/src/apps/icons/input.h b/firmware/keira/src/apps/icons/input.h
diff --git a/firmware/keira/src/apps/icons/js.h b/firmware/keira/src/apps/icons/js.h
diff --git a/firmware/keira/src/apps/icons/lua.h b/firmware/keira/src/apps/icons/lua.h
diff --git a/firmware/keira/src/apps/icons/memory.h b/firmware/keira/src/apps/icons/memory.h
diff --git a/firmware/keira/src/apps/icons/nes.h b/firmware/keira/src/apps/icons/nes.h
diff --git a/firmware/keira/src/apps/icons/normalfile.h b/firmware/keira/src/apps/icons/normalfile.h
diff --git a/firmware/keira/src/apps/icons/output.h b/firmware/keira/src/apps/icons/output.h
diff --git a/firmware/keira/src/apps/icons/ram.h b/firmware/keira/src/apps/icons/ram.h
diff --git a/firmware/keira/src/apps/icons/sdcard.h b/firmware/keira/src/apps/icons/sdcard.h
diff --git a/firmware/keira/src/apps/icons/settings.h b/firmware/keira/src/apps/icons/settings.h
diff --git a/firmware/keira/src/apps/icons/wifi_0.h b/firmware/keira/src/apps/icons/wifi_0.h
diff --git a/firmware/keira/src/apps/icons/wifi_1.h b/firmware/keira/src/apps/icons/wifi_1.h
diff --git a/firmware/keira/src/apps/icons/wifi_2.h b/firmware/keira/src/apps/icons/wifi_2.h
diff --git a/firmware/keira/src/apps/icons/wifi_3.h b/firmware/keira/src/apps/icons/wifi_3.h
diff --git a/firmware/keira/src/apps/icons/wifi_connecting.h b/firmware/keira/src/apps/icons/wifi_connecting.h
diff --git a/firmware/keira/src/apps/icons/wifi_offline.h b/firmware/keira/src/apps/icons/wifi_offline.h