diff --git a/Localizable.xcstrings b/Localizable.xcstrings
index 08f7b2ae..43a11bb0 100644
--- a/Localizable.xcstrings
+++ b/Localizable.xcstrings
@@ -23158,16 +23158,6 @@
}
},
"Power Metrics Log" : {
- "localizations" : {
- "sr" : {
- "stringUnit" : {
- "state" : "translated",
- "value" : "Логови метрике снаге"
- }
- }
- }
- },
- "Power Metrics Log}" : {
"localizations" : {
"sr" : {
"stringUnit" : {
diff --git a/Meshtastic.xcodeproj/project.pbxproj b/Meshtastic.xcodeproj/project.pbxproj
index 58e2baa5..a1f44726 100644
--- a/Meshtastic.xcodeproj/project.pbxproj
+++ b/Meshtastic.xcodeproj/project.pbxproj
@@ -1805,7 +1805,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 2.5.22;
+ MARKETING_VERSION = 2.5.23;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@@ -1839,7 +1839,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
- MARKETING_VERSION = 2.5.22;
+ MARKETING_VERSION = 2.5.23;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTS_MACCATALYST = YES;
@@ -1871,7 +1871,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 2.5.22;
+ MARKETING_VERSION = 2.5.23;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1904,7 +1904,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
- MARKETING_VERSION = 2.5.22;
+ MARKETING_VERSION = 2.5.23;
PRODUCT_BUNDLE_IDENTIFIER = gvh.MeshtasticClient.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Meshtastic/Assets.xcassets/THINKNODEM1.imageset/Contents.json b/Meshtastic/Assets.xcassets/THINKNODEM1.imageset/Contents.json
new file mode 100644
index 00000000..7001ca9b
--- /dev/null
+++ b/Meshtastic/Assets.xcassets/THINKNODEM1.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "thinknode_m1.svg",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/Meshtastic/Assets.xcassets/THINKNODEM1.imageset/thinknode_m1.svg b/Meshtastic/Assets.xcassets/THINKNODEM1.imageset/thinknode_m1.svg
new file mode 100644
index 00000000..27e21a0b
--- /dev/null
+++ b/Meshtastic/Assets.xcassets/THINKNODEM1.imageset/thinknode_m1.svg
@@ -0,0 +1,109 @@
+
\ No newline at end of file
diff --git a/Meshtastic/Assets.xcassets/THINKNODEM2.imageset/Contents.json b/Meshtastic/Assets.xcassets/THINKNODEM2.imageset/Contents.json
new file mode 100644
index 00000000..81ee0ac1
--- /dev/null
+++ b/Meshtastic/Assets.xcassets/THINKNODEM2.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+ "images" : [
+ {
+ "filename" : "thinknode_m2.svg",
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/Meshtastic/Assets.xcassets/THINKNODEM2.imageset/thinknode_m2.svg b/Meshtastic/Assets.xcassets/THINKNODEM2.imageset/thinknode_m2.svg
new file mode 100644
index 00000000..5e5a0e3c
--- /dev/null
+++ b/Meshtastic/Assets.xcassets/THINKNODEM2.imageset/thinknode_m2.svg
@@ -0,0 +1,391 @@
+
+
diff --git a/Meshtastic/Resources/DeviceHardware.json b/Meshtastic/Resources/DeviceHardware.json
index 00b80aea..bbe99f2a 100644
--- a/Meshtastic/Resources/DeviceHardware.json
+++ b/Meshtastic/Resources/DeviceHardware.json
@@ -543,7 +543,7 @@
"images": [
"t-watch-s3.svg"
],
- "partitionScheme": "16MB"
+ "partitionScheme": "8MB"
},
{
"hwModel": 52,
@@ -845,25 +845,32 @@
"hwModelSlug": "THINKNODE_M1",
"platformioTarget": "thinknode_m1",
"architecture": "nrf52840",
- "activelySupported": false,
+ "activelySupported": true,
"supportLevel": 1,
"displayName": "ThinkNode M1",
"tags": [
"Elecrow"
],
- "requiresDfu": true
+ "requiresDfu": true,
+ "images": [
+ "thinknode_m1.svg"
+ ],
+ "hasInkHud": true
},
{
"hwModel": 90,
"hwModelSlug": "THINKNODE_M2",
"platformioTarget": "thinknode_m2",
"architecture": "esp32-s3",
- "activelySupported": false,
+ "activelySupported": true,
"supportLevel": 1,
"displayName": "ThinkNode M2",
"tags": [
"Elecrow"
],
- "requiresDfu": false
+ "requiresDfu": false,
+ "images": [
+ "thinknode_m2.svg"
+ ]
}
]