8000 esp32: Merge with master up to version 1.7.9.b1 · fsaf11/ESP32-micropython-lora@446be04 · GitHub
[go: up one dir, main page]
Skip to content

Commit 446be04

Browse files
author
Daniel Campora
committed
esp32: Merge with master up to version 1.7.9.b1
1 parent 8a4f37d commit 446be04

22 files changed

+204
-70
lines changed

‎esp32/bootloader/esp32.bootloader.ld

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ MEMORY
1515
of the various regions. The 'data access port' dram/drom regions map to the same iram/irom regions but
1616
are connected to the data port of the CPU and eg allow bytewise access. */
1717
dport0_seg (RW) : org = 0x3FF00000, len = 0x10 /* IO */
18-
iram_seg (RWX) : org = 0x4009FC00, len = 0x400
18+
iram_seg (RWX) : org = 0x4009FB00, len = 0x500
1919
iram_pool_1_seg (RWX) : org = 0x40078000, len = 0x8000 /* IRAM POOL1, used for APP CPU cache. We can abuse it in bootloader because APP CPU is still held in reset, until we enable APP CPU cache */
2020
dram_seg (RW) : org = 0x3FFF8000, len = 0x8000 /* Shared RAM, minus rom bss/data/stack.*/
2121
}

‎esp32/bootloader/lib/libbootloader_support.a

0 Bytes
Binary file not shown.

‎esp32/bootloader/lib/libmicro-ecc.a

0 Bytes
Binary file not shown.

‎esp32/bootloader/lib/libspi_flash.a

0 Bytes
Binary file not shown.

‎esp32/lora/board.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Maintainer: Miguel Luis and Gregory Cristian
3434
* Flag to indicate if the MCU is Initialized
3535
*/
3636
static bool McuInitialized = false;
37-
static uint8_t battery_level = 0;
37+
static uint8_t BatteryLevel = 255;
3838

3939
void BoardInitPeriph( void )
4040
{
@@ -76,13 +76,10 @@ void BoardGetUniqueId( uint8_t *id )
7676

7777
uint8_t BoardGetBatteryLevel( void )
7878
{
79-
return battery_level;
79+
return BatteryLevel;
8080
}
8181

8282
void BoardSetBatteryLevel( uint8_t level )
8383
{
84-
if (level > 100) {
85-
level = 100;
86-
}
87-
battery_level = level;
84+
BatteryLevel = level;
8885
}

‎esp32/mods/machtimer_alarm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ STATIC IRAM_ATTR void remove_alarm(uint32_t el) {
128128
}
129129

130130
STATIC IRAM_ATTR void load_next_alarm(void) {
131-
TIMERG0.hw_timer[0].config.alarm_en = 0; // disable the alarm system
132131
// everything here done without calling any timers function, so it works inside the interrupts
132+
TIMERG0.hw_timer[0].config.alarm_en = 0; // disable the alarm system
133133
if (alarm_heap.count > 0) {
134134
uint64_t when;
135135
when = alarm_heap.data[0]->when;

‎esp32/mods/modbt.c

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
/******************************************************************************
5555
DEFINE PRIVATE CONSTANTS
5656
******************************************************************************/
57-
#define BT_SCAN_QUEUE_SIZE_MAX (8)
57+
#define BT_SCAN_QUEUE_SIZE_MAX (16)
5858
#define BT_GATTS_QUEUE_SIZE_MAX (2)
5959
#define BT_CHAR_VALUE_SIZE_MAX (20)
6060

@@ -267,7 +267,7 @@ void modbt_init0(void) {
267267
static esp_gatt_status_t status = ESP_GATT_ERROR;
268268

269269
static esp_ble_scan_params_t ble_scan_params = {
270-
.scan_type = BLE_SCAN_TYPE_PASSIVE,
270+
.scan_type = BLE_SCAN_TYPE_ACTIVE,
271271
.own_addr_type = BLE_ADDR_TYPE_PUBLIC,
272272
.scan_filter_policy = BLE_SCAN_FILTER_ALLOW_ALL,
273273
.scan_interval = 0x50,
@@ -804,6 +804,28 @@ STATIC mp_obj_t bt_read_scan(mp_obj_t self_in) {
804804
}
805805
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bt_read_scan_obj, bt_read_scan);
806806

807+
STATIC mp_obj_t bt_get_advertisements(mp_obj_t self_in) {
808+
bt_event_result_t bt_event;
809+
810+
STATIC const qstr bt_scan_info_fields[] = {
811+
MP_QSTR_mac, MP_QSTR_addr_type, MP_QSTR_adv_type, MP_QSTR_rssi, MP_QSTR_data,
812+
};
813+
814+
mp_obj_t advs = mp_obj_new_list(0, NULL);
815+
while (xQueueReceive(xScanQueue, &bt_event, (TickType_t)0)) {
816+
mp_obj_t tuple[5];
817+
tuple[0] = mp_obj_new_bytes((const byte *)bt_event.scan.scan_rst.bda, 6);
818+
tuple[1] = mp_obj_new_int(bt_event.scan.scan_rst.ble_addr_type);
819+
tuple[2] = mp_obj_new_int(bt_event.scan.scan_rst.ble_evt_type & 0x03); // FIXME
820+
tuple[3] = mp_obj_new_int(bt_event.scan.scan_rst.rssi);
821+
tuple[4] = mp_obj_new_bytes((const byte *)bt_event.scan.scan_rst.ble_adv, ESP_BLE_ADV_DATA_LEN_MAX);
822+
823+
mp_obj_list_append(advs, mp_obj_new_attrtuple(bt_scan_info_fields, 5, tuple));
824+
}
825+
return advs;
826+
}
827+
STATIC MP_DEFINE_CONST_FUN_OBJ_1(bt_get_advertisements_obj, bt_get_advertisements);
828+
807829
STATIC mp_obj_t bt_resolve_adv_data(mp_obj_t self_in, mp_obj_t adv_data, mp_obj_t data_type) {
808830
mp_buffer_info_t bufinfo;
809831
uint8_t data_len;
@@ -995,7 +1017,7 @@ STATIC mp_obj_t bt_set_advertisement (mp_uint_t n_args, const mp_obj_t *pos_args
9951017
mp_get_buffer_raise(args[3].u_obj, &uuid_bufinfo, MP_BUFFER_READ);
9961018
adv_data.service_uuid_len = uuid_bufinfo.len;
9971019
adv_data.p_service_uuid = uuid_bufinfo.buf;
998-
if (adv_data.service_uuid_len != 16) {
1020+
if (adv_data.service_uuid_len % 16) {
9991021
nlr_raise(mp_obj_new_exception_msg(&mp_type_OSError, "incorrect service UUID length"));
10001022
}
10011023
}
@@ -1355,6 +1377,7 @@ STATIC const mp_map_elem_t bt_locals_dict_table[] = {
13551377
{ MP_OBJ_NEW_QSTR(MP_QSTR_isscanning), (mp_obj_t)&bt_isscanning_obj },
13561378
{ MP_OBJ_NEW_QSTR(MP_QSTR_stop_scan), (mp_obj_t)&bt_stop_scan_obj },
13571379
{ MP_OBJ_NEW_QSTR(MP_QSTR_get_adv), (mp_obj_t)&bt_read_scan_obj },
1380+
{ MP_OBJ_NEW_QSTR(MP_QSTR_get_advertisements), (mp_obj_t)&bt_get_advertisements_obj },
13581381
{ MP_OBJ_NEW_QSTR(MP_QSTR_resolve_adv_data), (mp_obj_t)&bt_resolve_adv_data_obj },
13591382
{ MP_OBJ_NEW_QSTR(MP_QSTR_connect), (mp_obj_t)&bt_connect_obj },
13601383
{ MP_OBJ_NEW_QSTR(MP_QSTR_set_advertisement), (mp_obj_t)&bt_set_advertisement_obj },

0 commit comments

Comments
 (0)
0