Skip to content

Draft: CFSPDK 1073 Add gecko ADC driver #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Draft: CFSPDK 1073 Add gecko ADC driver #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion samples/tmo_shell/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ target_sources(app PRIVATE src/buzzer_test.c)
target_sources(app PRIVATE src/led_test.c)
target_sources(app PRIVATE src/misc_test.c)
target_sources(app PRIVATE src/tmo_file.c)
target_sources(app PRIVATE src/tmo_adc.c)
target_sources(app PRIVATE src/tmo_bq24250.c)
target_sources(app PRIVATE src/tmo_battery_ctrl.c)
target_sources(app PRIVATE src/tmo_sntp.c)
Expand Down
39 changes: 39 additions & 0 deletions samples/tmo_shell/boards/tmo_dev_edge.overlay
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,42 @@
*
* SPDX-License-Identifier: Apache-2.0
*/
#include <zephyr/dt-bindings/adc/adc.h>
#include <zephyr/dt-bindings/gpio/gpio.h>

/ {
zephyr,user {
/* adjust channel number according to pinmux in board.dts */
io-channels = <&adc 0>, <&adc 1>;
battsense-gpios = <&gpiok 0 GPIO_ACTIVE_HIGH>;
};
};

&gpiok {
hog1 {
gpio-hog;
gpios = <0 GPIO_ACTIVE_HIGH>;
output-high;
};
};

&adc {
#address-cells = <1>;
#size-cells = <0>;

channel@0 {
reg = <0>;
zephyr,gain = "ADC_GAIN_1_3";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_TICKS, 32)>;
zephyr,resolution = <12>;
};

channel@1 {
reg = <1>;
zephyr,gain = "ADC_GAIN_1_3";
zephyr,reference = "ADC_REF_INTERNAL";
zephyr,acquisition-time = <ADC_ACQ_TIME(ADC_ACQ_TIME_TICKS, 32)>;
zephyr,resolution = <12>;
};
};
1 change: 1 addition & 0 deletions samples/tmo_shell/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,3 +160,4 @@ CONFIG_LOG_PRINTK=n
CONFIG_TMO_TEST_MFG_CHECK_GOLDEN=y
CONFIG_TMO_TEST_MFG_CHECK_ACCESS_CODE=y
CONFIG_DFU_GECKO_LIB=y
CONFIG_ADC_GECKO=y
4 changes: 4 additions & 0 deletions samples/tmo_shell/src/misc_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@
#include <zephyr/shell/shell.h>
#include <zephyr/shell/shell_uart.h>

#if DT_NODE_EXISTS(DT_NODELABEL(sonycxd5605))
#include "tmo_gnss.h"
#endif

#define I2C_0 DT_NODE_FULL_NAME(DT_NODELABEL(i2c0))
#define I2C_1 DT_NODE_FULL_NAME(DT_NODELABEL(i2c1))

Expand Down
200 changes: 0 additions & 200 deletions samples/tmo_shell/src/tmo_adc.c
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions samples/tmo_shell/src/tmo_adc.h
View file
Open in desktop

This file was deleted.

5 changes: 5 additions & 0 deletions samples/tmo_shell/src/tmo_battery_ctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,8 @@ int get_battery_charging_status(uint8_t *charging, uint8_t *vbus, uint8_t *attac

return status;
}

uint8_t battery_millivolts_to_percent(uint32_t millivolts) {
float curBv = get_remaining_capacity((float) millivolts / 1000);
return (uint8_t) (curBv + 0.5);
} // Calculate input voltage in mV
1 change: 1 addition & 0 deletions samples/tmo_shell/src/tmo_battery_ctrl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ float get_remaining_capacity(float battery_voltage);
bool is_battery_charging(void);
int get_battery_charging_status(uint8_t *charging, uint8_t *vbus, uint8_t *attached, uint8_t *fault);

uint8_t battery_millivolts_to_percent(uint32_t millivolts);
#endif
Loading