From 2d0261c3bb6822685b24a833952efe1d36e729e7 Mon Sep 17 00:00:00 2001 From: vlad Date: Mon, 31 Oct 2022 13:06:11 +0300 Subject: [PATCH] Update frequency division --- CMakeLists.txt | 5 +++-- main.c | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3241e80..09d62b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,7 @@ project(sdp-dry-sensor C) set(CMAKE_CXX_COMPILER avr-g++) set(CMAKE_C_COMPILER avr-gcc) +#set(PROGRAMMER avrisp2) set(PROGRAMMER usbasp) add_definitions(-D'F_CPU=1000000L') @@ -26,7 +27,7 @@ add_custom_target( # cmake -E support copy/env/echo and so on. use cmake -E to see # COMMAND/COMMENT must be upper case #COMMAND ${CMAKE_COMMAND} -E environment - COMMAND avrdude -c usbasp -p t2313a -e -Uflash:w:${PROJECT_NAME}.elf:e + COMMAND avrdude -c ${PROGRAMMER} -p t2313a -e -Uflash:w:${PROJECT_NAME}.elf:e COMMENT "Flashing ${PROJECT_NAME}.elf to flash memory" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} @@ -50,7 +51,7 @@ add_custom_target( # cmake -E support copy/env/echo and so on. use cmake -E to see # COMMAND/COMMENT must be upper case #COMMAND ${CMAKE_COMMAND} -E environment - COMMAND avrdude -c usbasp -p t2313a -e -Uflash:w:comparator-test.elf:e + COMMAND avrdude -c ${PROGRAMMER} -p t2313a -e -Uflash:w:comparator-test.elf:e COMMENT "Flashing comparator-test.elf to flash memory" WORKING_DIRECTORY ${CMAKE_BINARY_DIR} diff --git a/main.c b/main.c index 2d04c4a..5aaacad 100644 --- a/main.c +++ b/main.c @@ -8,7 +8,6 @@ //#define TARGET_PHONE "+79208109798" // мой номер #define TARGET_PHONE "+79536215150" // номер "Данила Меркунов Агромаг" -//#define TARGET_PHONE "+7huipissy69" #define MEASUREMENTS 6 @@ -275,8 +274,8 @@ void read_sensors() { // быстрое деление на 2 (считалось каждое изменение) // 64 секунды * 2 = 128 (2^7) - sensor_1[sensor_measurements] = (uint16_t)(s1 >> 7); - sensor_2[sensor_measurements] = (uint16_t)(s2 >> 7); + sensor_1[sensor_measurements] = (uint16_t)(s1 >> 5); + sensor_2[sensor_measurements] = (uint16_t)(s2 >> 5); sensor_measurements++; // готово!