Commit graph

683 commits

Author SHA1 Message Date
Garth Vander Houwen
ef6d28bfad Battery gauge 2022-09-28 15:44:42 -07:00
Garth Vander Houwen
401423f606 Sharelink for qr code 2022-09-27 22:42:45 -07:00
Garth Vander Houwen
840e5ed2e3 Merge branch 'main' 2022-09-27 22:23:36 -07:00
Garth Vander Houwen
cd630e1dc6
Merge pull request #184 from meshtastic/default_cleanup
Default cleanup
2022-09-27 22:22:18 -07:00
Garth Vander Houwen
83fac42e3d remove disabled from settings 2022-09-27 22:20:04 -07:00
Garth Vander Houwen
27a90c4dc4 Fix assorted nulls 2022-09-27 22:18:50 -07:00
Garth Vander Houwen
367a3d7fab
Merge pull request #183 from meshtastic/ios16_coredata
Ios16 coredata
2022-09-27 21:49:38 -07:00
Garth Vander Houwen
41a6422986 Merge branch 'main'
Conflicts:
	Meshtastic/Views/Settings/Settings.swift
2022-09-27 21:47:43 -07:00
Garth Vander Houwen
d892af07b1 Delete weird version 2022-09-27 21:47:13 -07:00
Garth Vander Houwen
5ecf4a031c
Merge pull request #182 from meshtastic/flatten_coredata
Flatten coredata, blast the database
2022-09-27 10:22:18 -07:00
Garth Vander Houwen
47fd8b4b58 Orange! 2022-09-27 10:20:12 -07:00
Garth Vander Houwen
58d009a200 Delete core data versions 2022-09-27 10:15:41 -07:00
Garth Vander Houwen
2df102696f Generic model 2022-09-27 10:13:06 -07:00
Garth Vander Houwen
a2cdbdaa76
Merge pull request #181 from meshtastic/add_share_channels
More version updates
2022-09-27 09:24:19 -07:00
Garth Vander Houwen
7d236c10c8 Disable settings when you are not subscribed so 1.2 nodes stop crashing and instead get a warning 2022-09-27 09:23:52 -07:00
Garth Vander Houwen
8213f3db65 More version updates 2022-09-27 09:01:33 -07:00
Garth Vander Houwen
2eafaad8e1
Merge pull request #180 from meshtastic/add_share_channels
Add share channels view back
2022-09-27 08:14:46 -07:00
Garth Vander Houwen
e2e8eb0faa Add back link to share channels 2022-09-27 08:14:12 -07:00
Garth Vander Houwen
2bac0a28bf Add share channels view back 2022-09-27 08:09:35 -07:00
Garth Vander Houwen
0dd50e6f62 Merge branch 'main'
Conflicts:
	Meshtastic.xcodeproj/project.pbxproj
	Meshtastic/Helpers/BLEManager.swift
	Meshtastic/Views/Settings/Settings.swift
2022-09-27 07:14:14 -07:00
Garth Vander Houwen
e324de4858 Delete Share channels for merge 2022-09-27 07:10:31 -07:00
Garth Vander Houwen
8a7d15840e
Merge pull request #179 from meshtastic/firmware_version_sheet
Firmware version sheet
2022-09-27 06:54:16 -07:00
Garth Vander Houwen
336ecdd659 Set version to 1.3.41 2022-09-27 06:53:00 -07:00
Garth Vander Houwen
fbdec5808f Delete Share Channel view 2022-09-27 06:47:51 -07:00
Garth Vander Houwen
6e5c4787b2
Update InvalidVersion.swift 2022-09-27 06:40:10 -07:00
Garth Vander Houwen
76a3635c1b
Update Connect.swift 2022-09-27 06:34:13 -07:00
Garth Vander Houwen
86ae65e720
Update BLEManager.swift 2022-09-27 06:33:00 -07:00
Garth Vander Houwen
2f3f6c11b7 Add back sharelink 2022-09-25 16:31:14 -07:00
Garth Vander Houwen
469e41dc2f Add missing bracket from merge 2022-09-25 15:42:45 -07:00
Garth Vander Houwen
b7eabe41d7
Merge pull request #176 from meshtastic/channel_updates
Channel updates
2022-09-25 15:15:58 -07:00
Garth Vander Houwen
5eccf8d543
Merge branch 'ios16' into channel_updates 2022-09-25 15:15:25 -07:00
Garth Vander Houwen
087404b620 Delete deleted file from project 2022-09-24 13:36:41 -07:00
Garth Vander Houwen
7bb3125cf6 Rename view to aid merge 2022-09-24 13:32:35 -07:00
Garth Vander Houwen
04fb42e934
Merge pull request #175 from meshtastic/channel_updates
Channel updates
2022-09-24 11:34:44 -07:00
Garth Vander Houwen
f1c71c8280 Cleanup 2022-09-24 11:28:36 -07:00
Garth Vander Houwen
e49eb363d3 Config view updates 2022-09-23 21:41:07 -07:00
Garth Vander Houwen
82b2c2106b Core data for channels 2022-09-21 07:27:08 -07:00
Garth Vander Houwen
a55e54febc Merge branch 'main'
Conflicts:
	Meshtastic.xcodeproj/project.pbxproj
	Meshtastic/Helpers/MeshPackets.swift
2022-09-20 21:07:20 -07:00
Garth Vander Houwen
7c7129cd10
Merge pull request #174 from meshtastic/channel_updates
Channel updates, require 1.3.41 version
2022-09-20 19:32:57 -07:00
Garth Vander Houwen
0fa95d89ec Channel updates, require 1.3.41 version 2022-09-20 19:32:29 -07:00
Garth Vander Houwen
5554d6231f Serialize channel responses 2022-09-19 23:21:05 -07:00
Garth Vander Houwen
b261a98c3f
Merge pull request #172 from meshtastic/txenabled_fix
bump version
2022-09-19 15:58:57 -07:00
Garth Vander Houwen
18a80eeb33 bump version 2022-09-19 15:54:02 -07:00
Garth Vander Houwen
a7c7fd8e4a
Merge pull request #171 from meshtastic/txenabled_fix
tx enabled fix
2022-09-19 15:50:42 -07:00
Garth Vander Houwen
2acdb1d071 tx enabled fix 2022-09-19 15:50:06 -07:00
Garth Vander Houwen
a3d20585a1 IOS 16 updates 2022-09-19 15:47:21 -07:00
Garth Vander Houwen
0c2179c95a Merge branch 'main' 2022-09-18 10:34:36 -07:00
Garth Vander Houwen
aad1804d0d
Merge pull request #170 from meshtastic/proto_cleanup
Update data model to include lora config values
2022-09-18 10:27:17 -07:00
Garth Vander Houwen
3cbf8adbd1 Update data model to include lora config values 2022-09-18 08:56:08 -07:00
Garth Vander Houwen
3246459f31 Delete bad data migration and start over 2022-09-18 08:18:42 -07:00