Skip to content

Commit

Permalink
Merge pull request #551 from justcallmekoko/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@justcallmekoko
justcallmekoko authored Jun 27, 2024
2 parents ac96072 + 84dc00d commit e58c063
Show file tree
Hide file tree
Showing 22 changed files with 5 additions and 284,973 deletions.
Binary file added Release Bins/esp32_marauder_v1_0_0_20240626_esp32_lddb.bin
View file
Binary file not shown.
Binary file added Release Bins/esp32_marauder_v1_0_0_20240626_flipper.bin
View file
Binary file not shown.
Binary file added Release Bins/esp32_marauder_v1_0_0_20240626_kit.bin
View file
Binary file not shown.
Binary file added Release Bins/esp32_marauder_v1_0_0_20240626_m5stickc_plus.bin
View file
Binary file not shown.
Binary file added Release Bins/esp32_marauder_v1_0_0_20240626_marauder_dev_board_pro.bin
View file
Binary file not shown.
Binary file added Release Bins/esp32_marauder_v1_0_0_20240626_mini.bin
View file
Binary file not shown.
Binary file added Release Bins/esp32_marauder_v1_0_0_20240626_old_hardware.bin
View file
Binary file not shown.
Binary file added Release Bins/esp32_marauder_v1_0_0_20240626_rev_feather.bin
View file
Binary file not shown.
Binary file added Release Bins/esp32_marauder_v1_0_0_20240626_v6.bin
View file
Binary file not shown.
Binary file added Release Bins/esp32_marauder_v1_0_0_20240626_v6_1.bin
View file
Binary file not shown.
Binary file removed esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bin
View file
Binary file not shown.
Binary file removed esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.bootloader.bin
View file
Binary file not shown.
Binary file removed esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.elf
View file
Binary file not shown.
164,462 changes: 0 additions & 164,462 deletions esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.map
View file

This file was deleted.

Binary file removed esp32_marauder/build/esp32.esp32.d32/esp32_marauder.ino.partitions.bin
View file
Binary file not shown.
Binary file removed esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bin
View file
Binary file not shown.
Binary file removed esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.bootloader.bin
View file
Binary file not shown.
Binary file removed esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.elf
View file
Binary file not shown.
120,502 changes: 0 additions & 120,502 deletions esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.map
View file

This file was deleted.

Binary file removed esp32_marauder/build/esp32.esp32.esp32s2/esp32_marauder.ino.partitions.bin
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions esp32_marauder/configs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

//// BOARD TARGETS
//#define MARAUDER_M5STICKC
#define MARAUDER_MINI
//#define MARAUDER_MINI
//#define MARAUDER_V4
//#define MARAUDER_V6
//#define MARAUDER_V6_1
Expand All @@ -21,7 +21,7 @@
//#define MARAUDER_REV_FEATHER
//// END BOARD TARGETS

#define MARAUDER_VERSION "v0.13.11"
#define MARAUDER_VERSION "v1.0.0"

//// HARDWARE NAMES
#ifdef MARAUDER_M5STICKC
Expand Down
10 changes: 3 additions & 7 deletions esp32_marauder/esp32_marauder.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,9 @@ void setup()
*/

#ifdef HAS_SCREEN
#ifndef MARAUDER_MINI
display_obj.tft.drawCentreString(display_obj.version_number, 120, 250, 2);
#endif

#ifdef MARAUDER_MINI
display_obj.tft.drawCentreString(display_obj.version_number, TFT_WIDTH/2, TFT_HEIGHT, 1);
#endif
display_obj.tft.drawCentreString("ESP32 Marauder", TFT_WIDTH/2, TFT_HEIGHT * 0.33, 1);
display_obj.tft.drawCentreString("JustCallMeKoko", TFT_WIDTH/2, TFT_HEIGHT * 0.5, 1);
display_obj.tft.drawCentreString(display_obj.version_number, TFT_WIDTH/2, TFT_HEIGHT * 0.66, 1);
#endif


Expand Down

1 comment on commit e58c063

@SilentSong1982
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am getting the the following error messages when attempting to upload from Arduino IDE- It terminated the upload on the 'esp_base_mac_addr_set' was not declared in this scope; did you mean 'esp_base_mac_addr'?

"C:\Users\graha\Documents\Arduino\libraries\ESP32Marauder-master\esp32_marauder\WiFiScan.cpp: In member function 'void WiFiScan::executeSwiftpairSpam(EBLEPayloadType)':
C:\Users\graha\Documents\Arduino\libraries\ESP32Marauder-master\esp32_marauder\WiFiScan.cpp:1919:5: error: 'esp_base_mac_addr_set' was not declared in this scope; did you mean 'esp_base_mac_addr'?
1919 | esp_base_mac_addr_set(macAddr);
| ^~~~~~~~~~~~~~~~~~~~~
| esp_base_mac_addr
C:\Users\graha\Documents\Arduino\libraries\ESP32Marauder-master\esp32_marauder\WiFiScan.cpp: In member function 'void WiFiScan::RunBluetoothScan(uint8_t, uint16_t)':
C:\Users\graha\Documents\Arduino\libraries\ESP32Marauder-master\esp32_marauder\WiFiScan.cpp:2364:17: error: 'class NimBLEScan' has no member named 'setAdvertisedDeviceCallbacks'
2364 | pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanAllCallback(), false);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
C:\Users\graha\Documents\Arduino\libraries\ESP32Marauder-master\esp32_marauder\WiFiScan.cpp:2401:19: error: 'class NimBLEScan' has no member named 'setAdvertisedDeviceCallbacks'
2401 | pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanAllCallback(), false);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
C:\Users\graha\Documents\Arduino\libraries\ESP32Marauder-master\esp32_marauder\WiFiScan.cpp:2403:19: error: 'class NimBLEScan' has no member named 'setAdvertisedDeviceCallbacks'
2403 | pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanAllCallback(), true);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
C:\Users\graha\Documents\Arduino\libraries\ESP32Marauder-master\esp32_marauder\WiFiScan.cpp:2420:17: error: 'class NimBLEScan' has no member named 'setAdvertisedDeviceCallbacks'
2420 | pBLEScan->setAdvertisedDeviceCallbacks(new bluetoothScanSkimmersCallback(), false);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
C:\Users\graha\Documents\Arduino\libraries\ESP32Marauder-master\esp32_marauder\WiFiScan.cpp:2426:20: error: no matching function for call to 'NimBLEScan::start(int, void (&)(NimBLEScanResults), bool)'
2426 | pBLEScan->start(0, scanCompleteCB, false);
| ~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from c:\Users\graha\Documents\Arduino\libraries\NimBLE-Arduino\src/NimBLEDevice.h:22,
from C:\Users\graha\Documents\Arduino\libraries\ESP32Marauder-master\esp32_marauder\WiFiScan.h:12,
from C:\Users\graha\Documents\Arduino\libraries\ESP32Marauder-master\esp32_marauder\WiFiScan.cpp:1:
c:\Users\graha\Documents\Arduino\libraries\NimBLE-Arduino\src/NimBLEScan.h:65:25: note: candidate: 'bool NimBLEScan::start(uint32_t, bool)'
65 | bool start(uint32_t duration, bool is_continue = false);
| ^~~~~
c:\Users\graha\Documents\Arduino\libraries\NimBLE-Arduino\src/NimBLEScan.h:65:25: note: candidate expects 2 arguments, 3 provided
Multiple libraries were found for "SD.h"
Used: C:\Users\graha\AppData\Local\Arduino15\packages\esp32\hardware\esp32\3.0.2\libraries\SD
Not used: C:\Users\graha\AppData\Local\Arduino15\libraries\SD
exit status 1

Compilation error: 'esp_base_mac_addr_set' was not declared in this scope; did you mean 'esp_base_mac_addr'?

Please sign in to comment.