Skip to content

Commit

Permalink
Kleinere Fixes, Rel 0.10
Browse files Browse the repository at this point in the history
  • Loading branch information
Thomas Arlitt committed Jan 7, 2023
1 parent 1ef9042 commit 9317e1e
Show file tree
Hide file tree
Showing 12 changed files with 46,178 additions and 38 deletions.
3 changes: 2 additions & 1 deletion M5PaperCalendar.ino
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
V0.7 23.12.2021: Added the next event to today page
V0.8 29.12.2021: Changed time - no more using the rtc because time is synced with ntp time server every new day
V0.9 03.04.2022: Some minor improvements on the weather page
V0.10 07.01.2023: Fix if first day of current month is a monday
Important note:
Expand All @@ -61,7 +62,7 @@
*********************************************************************/

#define FIRMWARE "0.9 - 2022-04-03"
#define FIRMWARE "0.10 - 2023-01-07"

/**************************************************************************************
** Libraries
Expand Down
13 changes: 8 additions & 5 deletions M5PaperCalendar.vcxproj

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions M5PaperCalendar.vcxproj.filters
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<None Include="M5PaperCalendar.ino" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="__vm\.M5PaperCalendar.vsarduino.h">
<Filter>Header Files</Filter>
Expand All @@ -40,4 +37,7 @@
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="M5PaperCalendar.ino" />
</ItemGroup>
</Project>
52 changes: 33 additions & 19 deletions __vm/.M5PaperCalendar.vsarduino.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,33 @@
All non-arduino files created by visual micro and all visual studio project or solution files can be freely deleted and are not required to compile a sketch (do not delete your own code!).
Note: debugger breakpoints are stored in '.sln' or '.asln' files, knowledge of last uploaded breakpoints is stored in the upload.vmps.xml file. Both files are required to continue a previous debug session without needing to compile and upload again
Hardware: M5Stack-Paper (m5stack_m5stack-paper), Platform=esp32, Package=m5stack
Hardware: M5Stack-Paper(m5stack_m5stack-paper), Platform=esp32, Package=m5stack
*/

#if defined(_VMICRO_INTELLISENSE)

#ifndef _VSARDUINO_H_
#define _VSARDUINO_H_
#define __ESP32_esp32__
#define __ESP32_ESP32__
#define HAVE_CONFIG_H
#define UNITY_INCLUDE_CONFIG_H
#define WITH_POSIX
#define _GNU_SOURCE
#define ESP_PLATFORM
#define _POSIX_READER_WRITER_LOCKS
#define __ESP32_esp32__ 1
#define __ESP32_ESP32__ 1
#define HAVE_CONFIG_H 1
#define MBEDTLS_CONFIG_FILE "mbedtls/esp_config.h"
#define UNITY_INCLUDE_CONFIG_H 1
#define WITH_POSIX 1
#define _GNU_SOURCE 1
#define IDF_VER "v4.4.3"
#define ESP_PLATFORM 1
#define _POSIX_READER_WRITER_LOCKS 1
#define F_CPU 240000000L
#define ARDUINO 108019
#define ARDUINO_M5Stack_Paper
#define ARDUINO_ARCH_ESP32
#define ARDUINO_PARTITION_default_16MB
#define ESP32
#define ARDUINO_M5Stack_Paper 1
#define ARDUINO_ARCH_ESP32 1
#define ARDUINO_BOARD "M5Stack_Paper"
#define ARDUINO_VARIANT "m5stack_paper"
#define ARDUINO_PARTITION_default_16MB 1
#define ESP32 1
#define CORE_DEBUG_LEVEL 0
#define BOARD_HAS_PSRAM
#define BOARD_HAS_PSRAM 1
#define ARDUINO_USB_CDC_ON_BOOT 0
#define __cplusplus 201103L

Expand All @@ -53,12 +57,12 @@
//#define _STD_BEGIN
//#define EMIT
#define WARNING
#define _Lockit
//#define _Lockit
#define __CLR_OR_THIS_CALL
#define C4005
//#define _NEW

typedef bool _Bool;
typedef bool _bool;
typedef int _read;
typedef int _seek;
typedef int _write;
Expand All @@ -82,10 +86,12 @@ typedef int __gnuc_va_list;
typedef unsigned char byte;
extern "C" void __cxa_pure_virtual() {;}

typedef long __INTPTR_TYPE__ ;
//typedef long __INTPTR_TYPE__ ;
#define __INTPTR_TYPE__ unsigned int
typedef long __UINTPTR_TYPE__ ;
//typedef long __SIZE_TYPE__ ;
#define __SIZE_TYPE__ unsigned int
#define __INT32_TYPE__ long
typedef long __PTRDIFF_TYPE__;

typedef long pthread_t;
Expand All @@ -100,7 +106,15 @@ typedef long pthread_cond_t;
// Ensure ArduinoJSON Lib Intellisense works correctly
#define ARDUINOJSON_ENABLE_STD_STREAM 0

#include "arduino.h"
class VM_DBG {
public:
// Send a Message to the Serial Monitor via WiFi Connection
void sendUserMessage(const char* theMessage) {};
} MicroDebug;

class Lockit { public: int _Lockit() {} };

#include <arduino.h>
#include <pins_arduino.h>

#define interrupts() sei()
Expand All @@ -112,6 +126,6 @@ typedef long pthread_cond_t;
#define READ_PERI_REG(addr)
// Write Value to Register
#define WRITE_PERI_REG(addr,val)
#include "M5PaperCalendar.ino"
#include "..\M5PaperCalendar.ino"
#endif
#endif
4 changes: 2 additions & 2 deletions __vm/Compile.vmps.xml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions __vm/Upload.vmps.xml

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions debug.cfg
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# SPDX-License-Identifier: GPL-2.0-or-later
#
# Example OpenOCD configuration file for ESP32-WROVER-KIT board.
#
# For example, OpenOCD can be started for ESP32 debugging on
#
# openocd -f board/esp32-wrover-kit-3.3v.cfg
#

# Source the JTAG interface configuration file
source [find interface/ftdi/esp32_devkitj_v1.cfg]
set ESP32_FLASH_VOLTAGE 3.3
# Source the ESP32 configuration file
source [find target/esp32.cfg]
19 changes: 19 additions & 0 deletions debug_custom.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"name":"Arduino on ESP32",
"toolchainPrefix":"xtensa-esp32-elf",
"svdFile":"esp32.svd",
"request":"attach",
"postAttachCommands":[
"set remote hardware-watchpoint-limit 2",
"monitor reset halt",
"monitor gdb_sync",
"thb setup",
"c"
],
"overrideRestartCommands":[
"monitor reset halt",
"monitor gdb_sync",
"thb setup",
"c"
]
}
Loading

0 comments on commit 9317e1e

Please sign in to comment.