Merge pull request #548 from cyberman54/master

sync dev to master
This commit is contained in:
Verkehrsrot 2020-02-08 13:13:54 +01:00 committed by GitHub
commit 9f993e6ccf
4 changed files with 71 additions and 6 deletions

View File

@ -3,7 +3,7 @@
Tutorial (in german language): https://www.heise.de/select/make/2019/1/1551099236518668 Tutorial (in german language): https://www.heise.de/select/make/2019/1/1551099236518668
**#36C3 attendees: i am on site (27th - 30th)! You might contact me via twitter @RecumbentTravel**
<img src="img/Paxcounter-title.jpg"> <img src="img/Paxcounter-title.jpg">
<img src="img/Paxcounter-ttgo.jpg"> <img src="img/Paxcounter-ttgo.jpg">

View File

@ -31,7 +31,8 @@ halfile = generic.h
;halfile = octopus32.h ;halfile = octopus32.h
;halfile = tinypico.h ;halfile = tinypico.h
;halfile = tinypicomatrix.h ;halfile = tinypicomatrix.h
;halfile = m5stack.h ;halfile = m5core.h
;halfile = m5fire.h
[platformio] [platformio]
; upload firmware to board with usb cable ; upload firmware to board with usb cable

View File

@ -1,11 +1,11 @@
// clang-format off // clang-format off
// upload_speed 921600 // upload_speed 921600
// board M5Stack-Core-ESP32 // board m5stack-core-esp32
// EXPERIMENTAL VERSION - NOT TESTED ON M5 HARDWARE YET // EXPERIMENTAL VERSION - NOT TESTED ON M5 HARDWARE YET
#ifndef _M5STACK_H #ifndef _M5CORE_H
#define _M5STACK_H #define _M5CORE_H
#include <stdint.h> #include <stdint.h>
@ -57,6 +57,6 @@
#define MY_OLED_RST GPIO_NUM_33 #define MY_OLED_RST GPIO_NUM_33
#define MY_OLED_BL GPIO_NUM_32 #define MY_OLED_BL GPIO_NUM_32
#define MY_OLED_MOSI GPIO_NUM_23 #define MY_OLED_MOSI GPIO_NUM_23
#define MY_OLED_MISO GPIO_NUM_23 #define MY_OLED_MISO GPIO_NUM_19
#endif #endif

64
src/hal/m5fire.h Normal file
View File

@ -0,0 +1,64 @@
// clang-format off
// upload_speed 921600
// board m5stack-fire
// EXPERIMENTAL VERSION - NOT TESTED ON M5 HARDWARE YET
#ifndef _M5FIRE_H
#define _M5FIRE_H
#include <stdint.h>
// #define HAS_LORA 1 // comment out if device shall not send data via LoRa or has no M5 RA01 LoRa module
// Pins for LORA chip SPI interface, reset line and interrupt lines
#define LORA_SCK SCK
#define LORA_CS SS
#define LORA_MISO MISO
#define LORA_MOSI MOSI
#define LORA_RST GPIO_NUM_36
#define LORA_IRQ GPIO_NUM_26
#define LORA_IO1 GPIO_NUM_34 // must be externally wired on PCB!
#define LORA_IO2 LMIC_UNUSED_PIN
// enable only if you want to store a local paxcount table on the device
#define HAS_SDCARD 1 // this board has an SD-card-reader/writer
// Pins for SD-card
#define SDCARD_CS GPIO_NUM_4
#define SDCARD_MOSI MOSI
#define SDCARD_MISO MISO
#define SDCARD_SCLK SCK
// user defined sensors
//#define HAS_SENSORS 1 // comment out if device has user defined sensors
#define CFG_sx1276_radio 1 // select LoRa chip
#define BOARD_HAS_PSRAM // use if board has external PSRAM
#define DISABLE_BROWNOUT 1 // comment out if you want to keep brownout feature
//#define HAS_DISPLAY 1
#define HAS_TFT 1
//#define DISPLAY_FLIP 1 // use if display is rotated
//#define BAT_MEASURE_ADC ADC1_GPIO35_CHANNEL // battery probe GPIO pin -> ADC1_CHANNEL_7
//#define BAT_VOLTAGE_DIVIDER 2 // voltage divider 100k/100k on board
#define HAS_LED NOT_A_PIN // no on board LED (?)
#define HAS_RGB_LED SmartLed rgb_led(LED_SK6812, 10, GPIO_NUM_15) // LED_SK6812 RGB LED on GPIO15
#define HAS_BUTTON (39) // on board button A
// GPS settings
#define HAS_GPS 0 // use on board GPS
#define GPS_SERIAL 9600, SERIAL_8N1, RXD2, TXD2 // UBlox NEO 6M RX, TX
// #define GPS_INT GPIO_NUM_35 // 30ns accurary timepulse, to be external wired on pcb: shorten R12!
// Pins for interface of LC Display
#define MY_OLED_CS GPIO_NUM_14
#define MY_OLED_DC GPIO_NUM_27
#define MY_OLED_CLK GPIO_NUM_18
#define MY_OLED_RST GPIO_NUM_33
#define MY_OLED_BL GPIO_NUM_32
#define MY_OLED_MOSI GPIO_NUM_23
#define MY_OLED_MISO GPIO_NUM_19
#endif