comparison: main/task_user.c
main/task_user.c
- changeset 60
- 07a1a07fdc8c
- parent 57
- 232f318a6b51
- child 71
- 995557380e5f
equal
deleted
inserted
replaced
| 59:52d9405474e1 | 60:07a1a07fdc8c |
|---|---|
| 753 if (gpio_get_level(io_num) == 0) { | 753 if (gpio_get_level(io_num) == 0) { |
| 754 pushed = esp_timer_get_time(); | 754 pushed = esp_timer_get_time(); |
| 755 PushDuration = 0; | 755 PushDuration = 0; |
| 756 } else if (gpio_get_level(io_num) == 1) { | 756 } else if (gpio_get_level(io_num) == 1) { |
| 757 PushDuration = (esp_timer_get_time() - pushed) / 1000; | 757 PushDuration = (esp_timer_get_time() - pushed) / 1000; |
| 758 ESP_LOGI(TAG, "GPIO rotary button intr, val: %d time: %d", gpio_get_level(io_num), PushDuration); | 758 ESP_LOGD(TAG, "GPIO rotary button intr, val: %d time: %d", gpio_get_level(io_num), PushDuration); |
| 759 if (! user_busy()) { | 759 if (! user_busy()) { |
| 760 xEventGroupSetBits(xEventGroupUser, TASK_USER_WAKEUP); | 760 xEventGroupSetBits(xEventGroupUser, TASK_USER_WAKEUP); |
| 761 } | 761 } |
| 762 } | 762 } |
| 763 } else { | 763 } else { |
| 886 case ML2_WIFI: | 886 case ML2_WIFI: |
| 887 screen_wifi(); | 887 screen_wifi(); |
| 888 break; | 888 break; |
| 889 | 889 |
| 890 case ML2_SETUP_WIFI: | 890 case ML2_SETUP_WIFI: |
| 891 ESP_LOGI(TAG, "Loop user: WiFi setup"); | |
| 892 screen_wifi_setup(SubMenu); | 891 screen_wifi_setup(SubMenu); |
| 893 break; | 892 break; |
| 894 | 893 |
| 895 case ML2_LIST_APS: | 894 case ML2_LIST_APS: |
| 896 ESP_LOGI(TAG, "Loop user: WiFi list APs"); | |
| 897 SubMenu = SubOffset = 0; | 895 SubMenu = SubOffset = 0; |
| 898 screen_list_aps(SubMenu, SubOffset); | 896 screen_list_aps(SubMenu, SubOffset); |
| 899 break; | 897 break; |
| 900 | 898 |
| 901 case ML2_EDIT_AP: | 899 case ML2_EDIT_AP: |
| 902 ESP_LOGI(TAG, "Loop user: WiFi edit AP"); | |
| 903 screen_edit_ap(0); | 900 screen_edit_ap(0); |
| 904 break; | 901 break; |
| 905 | 902 |
| 906 case ML2_NETWORK: | 903 case ML2_NETWORK: |
| 907 screen_network(); | 904 screen_network(); |
| 908 break; | 905 break; |
| 909 | 906 |
| 910 case ML2_SETUP_NETWORK: | 907 case ML2_SETUP_NETWORK: |
| 911 ESP_LOGI(TAG, "Loop user: Network setup"); | |
| 912 screen_network_setup(SubMenu); | 908 screen_network_setup(SubMenu); |
| 913 break; | 909 break; |
| 914 | 910 |
| 915 case ML2_MQTT: | 911 case ML2_MQTT: |
| 916 screen_mqtt(); | 912 screen_mqtt(); |
| 917 break; | 913 break; |
| 918 | 914 |
| 919 case ML2_SETUP_MQTT: | 915 case ML2_SETUP_MQTT: |
| 920 ESP_LOGI(TAG, "Loop user: MQTT setup"); | |
| 921 screen_mqtt_setup(SubMenu); | 916 screen_mqtt_setup(SubMenu); |
| 922 break; | 917 break; |
| 923 | 918 |
| 924 case ML2_UPDATE: | 919 case ML2_UPDATE: |
| 925 screen_update(); | 920 screen_update(); |
| 930 break; | 925 break; |
| 931 | 926 |
| 932 case ML2_SETUP_UNIT1: | 927 case ML2_SETUP_UNIT1: |
| 933 case ML2_SETUP_UNIT2: | 928 case ML2_SETUP_UNIT2: |
| 934 case ML2_SETUP_UNIT3: | 929 case ML2_SETUP_UNIT3: |
| 935 ESP_LOGI(TAG, "Loop user: Setup Unit %d", Main_Loop2 - ML2_SETUP_UNIT1); | |
| 936 SubMenu = SubOffset = 0; | 930 SubMenu = SubOffset = 0; |
| 937 screen_unit_setup(Main_Loop2 - ML2_SETUP_UNIT1, SubMenu); | 931 screen_unit_setup(Main_Loop2 - ML2_SETUP_UNIT1, SubMenu); |
| 938 break; | 932 break; |
| 939 | 933 |
| 940 case ML2_ZERO_UNIT1: | 934 case ML2_ZERO_UNIT1: |
| 941 case ML2_ZERO_UNIT2: | 935 case ML2_ZERO_UNIT2: |
| 942 case ML2_ZERO_UNIT3: | 936 case ML2_ZERO_UNIT3: |
| 943 ESP_LOGI(TAG, "Loop user: Zero Unit %d", Main_Loop2 - ML2_ZERO_UNIT1); | |
| 944 SubMenu = SubOffset = 0; | 937 SubMenu = SubOffset = 0; |
| 945 screen_unit_zero(Main_Loop2 - ML2_ZERO_UNIT1, SubMenu); | 938 screen_unit_zero(Main_Loop2 - ML2_ZERO_UNIT1, SubMenu); |
| 946 break; | 939 break; |
| 947 | 940 |
| 948 case ML2_SEL_SENSOR1: | 941 case ML2_SEL_SENSOR1: |
| 949 case ML2_SEL_SENSOR2: | 942 case ML2_SEL_SENSOR2: |
| 950 case ML2_SEL_SENSOR3: | 943 case ML2_SEL_SENSOR3: |
| 951 ESP_LOGI(TAG, "Loop user: Select sensor %d", Main_Loop2 - ML2_SEL_SENSOR1); | |
| 952 SubMenu = SubOffset = 0; | 944 SubMenu = SubOffset = 0; |
| 953 screen_list_sensors(Main_Loop2 - ML2_SEL_SENSOR1, SubMenu, SubOffset); | 945 screen_list_sensors(Main_Loop2 - ML2_SEL_SENSOR1, SubMenu, SubOffset); |
| 954 break; | 946 break; |
| 955 | 947 |
| 956 case ML2_INACTIVE: | 948 case ML2_INACTIVE: |
