Browse Source

Address review comments and sync with dev

ViezeVingertjes 2 months ago
parent
commit
3b88783f57
  1. 14
      variants/nibble_zero_connect/platformio.ini
  2. 17
      variants/nibble_zero_connect/target.cpp
  3. 3
      variants/nibble_zero_connect/target.h

14
variants/nibble_zero_connect/platformio.ini

@ -31,7 +31,7 @@ lib_deps =
${esp32_base.lib_deps} ${esp32_base.lib_deps}
adafruit/Adafruit SSD1306 @ ^2.5.13 adafruit/Adafruit SSD1306 @ ^2.5.13
[env:nibble_zero_connect_repeater] [env:nibble_zero_connect_repeater_]
extends = nibble_zero_connect_base extends = nibble_zero_connect_base
build_flags = build_flags =
${nibble_zero_connect_base.build_flags} ${nibble_zero_connect_base.build_flags}
@ -48,7 +48,7 @@ lib_deps =
${nibble_zero_connect_base.lib_deps} ${nibble_zero_connect_base.lib_deps}
${esp32_ota.lib_deps} ${esp32_ota.lib_deps}
[env:nibble_zero_connect_repeater_bridge_espnow] [env:nibble_zero_connect_repeater_bridge_espnow_]
extends = nibble_zero_connect_base extends = nibble_zero_connect_base
build_flags = build_flags =
${nibble_zero_connect_base.build_flags} ${nibble_zero_connect_base.build_flags}
@ -67,7 +67,7 @@ lib_deps =
${nibble_zero_connect_base.lib_deps} ${nibble_zero_connect_base.lib_deps}
${esp32_ota.lib_deps} ${esp32_ota.lib_deps}
[env:nibble_zero_connect_terminal_chat] [env:nibble_zero_connect_terminal_chat_]
extends = nibble_zero_connect_base extends = nibble_zero_connect_base
build_flags = build_flags =
${nibble_zero_connect_base.build_flags} ${nibble_zero_connect_base.build_flags}
@ -79,7 +79,7 @@ lib_deps =
${nibble_zero_connect_base.lib_deps} ${nibble_zero_connect_base.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
[env:nibble_zero_connect_room_server] [env:nibble_zero_connect_room_server_]
extends = nibble_zero_connect_base extends = nibble_zero_connect_base
build_flags = build_flags =
${nibble_zero_connect_base.build_flags} ${nibble_zero_connect_base.build_flags}
@ -96,7 +96,7 @@ lib_deps =
${nibble_zero_connect_base.lib_deps} ${nibble_zero_connect_base.lib_deps}
${esp32_ota.lib_deps} ${esp32_ota.lib_deps}
[env:nibble_zero_connect_companion_radio_usb] [env:nibble_zero_connect_companion_radio_usb_]
extends = nibble_zero_connect_base extends = nibble_zero_connect_base
build_flags = build_flags =
${nibble_zero_connect_base.build_flags} ${nibble_zero_connect_base.build_flags}
@ -113,7 +113,7 @@ lib_deps =
${nibble_zero_connect_base.lib_deps} ${nibble_zero_connect_base.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
[env:nibble_zero_connect_companion_radio_ble] [env:nibble_zero_connect_companion_radio_ble_]
extends = nibble_zero_connect_base extends = nibble_zero_connect_base
build_flags = build_flags =
${nibble_zero_connect_base.build_flags} ${nibble_zero_connect_base.build_flags}
@ -134,7 +134,7 @@ lib_deps =
${nibble_zero_connect_base.lib_deps} ${nibble_zero_connect_base.lib_deps}
densaugeo/base64 @ ~1.4.0 densaugeo/base64 @ ~1.4.0
[env:nibble_zero_connect_companion_radio_wifi] [env:nibble_zero_connect_companion_radio_wifi_]
extends = nibble_zero_connect_base extends = nibble_zero_connect_base
build_flags = build_flags =
${nibble_zero_connect_base.build_flags} ${nibble_zero_connect_base.build_flags}

17
variants/nibble_zero_connect/target.cpp

@ -13,7 +13,7 @@ SensorManager sensors;
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
DISPLAY_CLASS display; DISPLAY_CLASS display;
MomentaryButton user_btn(PIN_USER_BTN, 1000, true, true); MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
#endif #endif
#ifndef LORA_CR #ifndef LORA_CR
@ -27,21 +27,6 @@ bool radio_init() {
return radio.std_init(&spi); return radio.std_init(&spi);
} }
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(uint8_t dbm) {
radio.setOutputPower(dbm);
}
mesh::LocalIdentity radio_new_identity() { mesh::LocalIdentity radio_new_identity() {
RadioNoiseListener rng(radio); RadioNoiseListener rng(radio);
return mesh::LocalIdentity(&rng); return mesh::LocalIdentity(&rng);

3
variants/nibble_zero_connect/target.h

@ -23,9 +23,6 @@ extern SensorManager sensors;
#endif #endif
bool radio_init(); 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(uint8_t dbm);
mesh::LocalIdentity radio_new_identity(); mesh::LocalIdentity radio_new_identity();

Loading…
Cancel
Save