drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Change analogRead calls to analogReadPin (#9023)

Browse source 
* Change analogRead calls to analogReadPin

* Add ChangeLog

* Update docs, remove mention of `analogRead()`

* Retarget changelog for next round
This commit is contained in:
Ryan 2020-07-02 13:12:34 +10:00 • committed by James Young
parent 60e5733c48
commit 8a4a0c25fd
5 changed files with 27 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

1
keyboards/handwired/promethium/config.h
View file

@ -150,7 +150,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_FUNCTION
#define PS2_MOUSE_INIT_DELAY 2000
#define BATTERY_PIN 9
#define BATTERY_POLL 30000
#define MAX_VOLTAGE 4.2
#define MIN_VOLTAGE 3.2

3
keyboards/handwired/promethium/promethium.c
View file

@ -3,6 +3,7 @@
#include "timer.h"
#include "matrix.h"
#include "musical_notes.h"
#include "adafruit_ble.h"
float fauxclicky_pressed_note[2] = MUSICAL_NOTE(_A4, 0.0625);
float fauxclicky_released_note[2] = MUSICAL_NOTE(_A4, 0.0625);
@ -11,7 +12,7 @@ float fauxclicky_beep_note[2] = MUSICAL_NOTE(_C6, 0.25);
// cubic fit {3.3, 0}, {3.5, 2.9}, {3.6, 5}, {3.7, 8.6}, {3.8, 36}, {3.9, 62}, {4.0, 73}, {4.05, 83}, {4.1, 89}, {4.15, 94}, {4.2, 100}
uint8_t battery_level(void) {
float voltage = analogRead(BATTERY_PIN) * 2 * 3.3 / 1024;
float voltage = adafruit_ble_read_battery_voltage() * 2 * 3.3 / 1024;
if (voltage < MIN_VOLTAGE) return 0;
if (voltage > MAX_VOLTAGE) return 255;
return (voltage - MIN_VOLTAGE) / (MAX_VOLTAGE - MIN_VOLTAGE) * 255;