This commit is contained in:
rbaron 2023-03-29 21:42:41 +02:00
parent dbded329a4
commit ebc26fcccd
17 changed files with 18 additions and 34 deletions

View file

@ -45,4 +45,4 @@
low-power-enable; low-power-enable;
}; };
}; };
}; };

View file

@ -1,2 +1 @@
CONFIG_BOARD_REVISION="1.1.0"
CONFIG_BOARD_REVISION="1.1.0"

View file

@ -27,4 +27,4 @@
zephyr,input-positive = <NRF_SAADC_AIN0>; zephyr,input-positive = <NRF_SAADC_AIN0>;
zephyr,resolution = <10>; zephyr,resolution = <10>;
}; };
}; };

View file

@ -1,2 +1 @@
CONFIG_BOARD_REVISION="1.2.0"
CONFIG_BOARD_REVISION="1.2.0"

View file

@ -26,4 +26,4 @@
zephyr,input-positive = <NRF_SAADC_AIN0>; zephyr,input-positive = <NRF_SAADC_AIN0>;
zephyr,resolution = <10>; zephyr,resolution = <10>;
}; };
}; };

View file

@ -1 +1 @@
CONFIG_BOARD_REVISION="2.0.0" CONFIG_BOARD_REVISION="2.0.0"

View file

@ -32,4 +32,4 @@
zephyr,input-positive = <NRF_SAADC_AIN0>; zephyr,input-positive = <NRF_SAADC_AIN0>;
zephyr,resolution = <10>; zephyr,resolution = <10>;
}; };
}; };

View file

@ -1 +1 @@
CONFIG_BOARD_REVISION="1.1.0" CONFIG_BOARD_REVISION="1.1.0"

View file

@ -1 +1 @@
CONFIG_BOARD_REVISION="1.2.0" CONFIG_BOARD_REVISION="1.2.0"

View file

@ -1 +1 @@
CONFIG_BOARD_REVISION="2.0.0" CONFIG_BOARD_REVISION="2.0.0"

View file

@ -32,4 +32,4 @@
zephyr,input-positive = <NRF_SAADC_AIN0>; zephyr,input-positive = <NRF_SAADC_AIN0>;
zephyr,resolution = <10>; zephyr,resolution = <10>;
}; };
}; };

View file

@ -21,4 +21,4 @@ int prst_button_register_callback(prst_button_callback_t callback);
// -1 on error // -1 on error
int prst_button_poll(prst_button_t prst_button); int prst_button_poll(prst_button_t prst_button);
#endif // _PRST_BUTTON_H_ #endif // _PRST_BUTTON_H_

View file

@ -65,4 +65,4 @@ int prst_button_register_callback(prst_button_callback_t callback) {
int prst_button_poll(prst_button_t prst_button) { int prst_button_poll(prst_button_t prst_button) {
RET_CHECK(prst_button == PRST_BUTTON_SW1, "Invalid button"); RET_CHECK(prst_button == PRST_BUTTON_SW1, "Invalid button");
return gpio_pin_get_dt(&button); return gpio_pin_get_dt(&button);
} }

View file

@ -11,8 +11,6 @@
"C_Cpp.autoAddFileAssociations": false, "C_Cpp.autoAddFileAssociations": false,
"nrf-connect.applications": [ "nrf-connect.applications": [
"${workspaceFolder}" "${workspaceFolder}"
], ]
"nrf-connect.toolchain.path": "${nrf-connect.toolchain:2.2.0}",
"nrf-connect.topdir": "${nrf-connect.sdk:2.2.0}"
} }
} }

View file

@ -20,7 +20,7 @@ CONFIG_NEWLIB_LIBC=y
CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
# Application config - see all options in Kconfig. # Application config - see all options in Kconfig.
CONFIG_PRST_BLE_ENCODING_BTHOME_V2=y # CONFIG_PRST_BLE_ENCODING_BTHOME_V2=y
# CONFIG_PRST_SLEEP_DURATION_SEC=1 # CONFIG_PRST_SLEEP_DURATION_SEC=1
# prstlib config - ser all options in prstlib/Kconfig. # prstlib config - ser all options in prstlib/Kconfig.

View file

@ -1,10 +1,3 @@
// #include <prstlib/button.h>
// #include <prstlib/led.h>
// #include <prstlib/sensors.h>
// #include <zephyr/logging/log.h>
// #include <zephyr/pm/device.h>
// #include <zephyr/pm/pm.h>
// #include <zephyr/pm/policy.h>
#include <prstlib/adc.h> #include <prstlib/adc.h>
#include <prstlib/button.h> #include <prstlib/button.h>
#include <prstlib/led.h> #include <prstlib/led.h>
@ -13,9 +6,6 @@
#include <prstlib/shtc3.h> #include <prstlib/shtc3.h>
#include <zephyr/kernel.h> #include <zephyr/kernel.h>
#include <zephyr/logging/log.h> #include <zephyr/logging/log.h>
#include <zephyr/pm/device.h>
#include <zephyr/pm/pm.h>
#include <zephyr/pm/policy.h>
LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG); LOG_MODULE_REGISTER(main, LOG_LEVEL_DBG);

View file

@ -11,8 +11,6 @@
"C_Cpp.autoAddFileAssociations": false, "C_Cpp.autoAddFileAssociations": false,
"nrf-connect.applications": [ "nrf-connect.applications": [
"${workspaceFolder}" "${workspaceFolder}"
], ]
"nrf-connect.toolchain.path": "${nrf-connect.toolchain:2.2.0}",
"nrf-connect.topdir": "${nrf-connect.sdk:2.2.0}"
} }
} }