Merge official v1.16.0 firmware and resolve conflicts

variants/lilygo_tbeam_1w/platformio.ini

@@ -195,3 +195,8 @@ build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
 lib_deps =
   ${LilyGo_TBeam_1W.lib_deps}
   ${esp32_ota.lib_deps}
+
+[env:LilyGo_TBeam_1W_kiss_modem]
+extends = LilyGo_TBeam_1W
+build_src_filter = ${LilyGo_TBeam_1W.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_tbeam_1w/target.cpp

@@ -47,21 +47,6 @@ bool radio_init() {
   return success;
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);

variants/lilygo_tbeam_1w/target.h

@@ -23,7 +23,4 @@ extern EnvironmentSensorManager sensors;
 SPIClass* getBoardSharedArchiveSPI();
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();