Skip to content

Commit b85d28e

Browse files
authored
Merge pull request #480 from tock/tut-net-minimize-diff
[net tutorial]: remove inconsequntial diff content
2 parents 711a5b4 + 383bba9 commit b85d28e

File tree

2 files changed

+9
-4
lines changed
  • examples/tutorials/thread_network

2 files changed

+9
-4
lines changed

examples/tutorials/thread_network/08_screen_u8g2/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ static void update_screen(void);
1616

1717
uint8_t global_temperature_setpoint = 0;
1818
uint8_t local_temperature_setpoint = 22;
19-
uint8_t measured_temperature = 0;
19+
int measured_temperature = 0;
2020

2121
static void button_callback(returncode_t ret,
2222
int btn_num,

examples/tutorials/thread_network/09_screen_final/main.c

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ static void update_screen(void);
1616

1717
uint8_t global_temperature_setpoint = 0;
1818
uint8_t local_temperature_setpoint = 22;
19-
uint8_t measured_temperature = 0;
19+
int measured_temperature = 0;
2020

2121
bool callback_event = false;
2222

@@ -45,6 +45,7 @@ int main(void) {
4545
u8g2_SetFont(&u8g2, u8g2_font_profont12_tr);
4646
u8g2_SetFontPosTop(&u8g2);
4747

48+
// Enable buttons
4849
for (int i = 0; i < 4; i++) {
4950
libtock_button_notify_on_press(i, button_callback);
5051
}
@@ -70,9 +71,13 @@ static void update_screen(void) {
7071
"Global Set Point: %d",
7172
global_temperature_setpoint);
7273

74+
uint8_t whole_temp = measured_temperature / 100;
75+
uint8_t decimal_temp = measured_temperature % 100;
76+
7377
sprintf(temperature_current_measure_str,
74-
"Measured Temp: %d",
75-
measured_temperature);
78+
"Measured Temp: %d.%d",
79+
whole_temp,
80+
decimal_temp);
7681

7782
// Use u8g2 library to draw each string.
7883
u8g2_ClearBuffer(&u8g2);

0 commit comments

Comments
 (0)