Apple-2-HW/aiie
1
0
Fork 0
mirror of https://github.com/JorjBauer/aiie.git synced 2024-11-29 16:49:26 +00:00
Code Issues Projects Releases Wiki Activity

remove RF24; working on the battery level meter

Browse Source
This commit is contained in:
Jorj Bauer 2017-07-13 20:31:04 -04:00
parent f910272cfa
commit d6f01329bb
1 changed files with 23 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
teensy/teensy.ino
View File

@ -40,20 +40,12 @@ uint8_t debugMode = D_NONE;
static time_t getTeensy3Time() { return Teensy3Clock.get(); } static time_t getTeensy3Time() { return Teensy3Clock.get(); }
/* Totally messing around with the RadioHead library */ #define ESP_TXD 51
#include <SPI.h> #define ESP_CHPD 52
#include <RH_NRF24.h> #define ESP_RST 53
#include <RHSoftwareSPI.h> #define ESP_RXD 40
RHSoftwareSPI spi; #define ESP_GPIO0 41
#define ESP_GPIO2 42
#define RF_CSN 40
#define RF_MOSI 41
#define RF_IRQ 42
#define RF_CE 53
#define RF_SCK 52
#define RF_MISO 51
RH_NRF24 nrf24(RF_CE, RF_CSN, spi);
void setup() void setup()
{ {
@ -77,18 +69,6 @@ void setup()
Serial.println("Error while setting RTC"); Serial.println("Error while setting RTC");
} }
#if 0
spi.setPins(RF_MISO, RF_MOSI, RF_SCK);
if (!nrf24.init())
Serial.println("init failed");
// Defaults after init are 2.402 GHz (channel 2), 2Mbps, 0dBm
if (!nrf24.setChannel(1))
Serial.println("setChannel failed");
if (!nrf24.setRF(RH_NRF24::DataRate2Mbps, RH_NRF24::TransmitPower0dBm))
Serial.println("setRF failed");
Serial.println("nrf24 initialized");
#endif
TCHAR *device = (TCHAR *)_T("0:/"); TCHAR *device = (TCHAR *)_T("0:/");
f_mount (&fatfs, device, 0); /* Mount/Unmount a logical drive */ f_mount (&fatfs, device, 0); /* Mount/Unmount a logical drive */
@ -281,24 +261,28 @@ void loop()
// in the appropriate block below // in the appropriate block below
if (millis() >= nextBattCheck) { if (millis() >= nextBattCheck) {
// FIXME: what about rollover? // FIXME: what about rollover?
nextBattCheck = millis() + 30 * 1000; // check every 30 seconds nextBattCheck = millis() + 3 * 1000; // check every 30 seconds
// FIXME: scale appropriately.
batteryLevel = analogRead(BATTERYPIN); batteryLevel = analogRead(BATTERYPIN);
/* 205 is "near dead, do something about it right now" - 3.2v and lower. /* 204 looks like the top end (5.05v * (204/255), within tolerance of my resistors).
* What's the top end? 216-ish? * Which suggests 176 is about 3.5v, which is the bottom 20% of discharge for LiIon.
* We'll call that 0% battery remaining to protect the battery.
* *
* The reading fluctuates quite a lot - we should probably capture * Notes: 191/192 is 3.7v
* more and average it over a longer period before showing * ... but 193/192 is also 3.57v. :/
* anything (FIXME)
*/ */
if (batteryLevel < 205) #if 1
batteryLevel = 205; Serial.print("battery: ");
if (batteryLevel > 216) Serial.println(batteryLevel);
batteryLevel = 216; #endif
batteryLevel = map(batteryLevel, 205, 216, 0, 100); if (batteryLevel < 176)
batteryLevel = 176;
if (batteryLevel > 204)
batteryLevel = 204;
batteryLevel = map(batteryLevel, 176, 204, 0, 100);
g_display->drawBatteryStatus(batteryLevel); g_display->drawBatteryStatus(batteryLevel);
} }
} }