mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-29 11:10:35 +02:00
Code Issues Releases Wiki Activity

Updated Home (markdown)

oliexdev
2015-01-03 00:18:26 -08:00
parent 9809a6d903
commit 68adc3a439
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Home.md

@@ -126,8 +126,8 @@ void before_sleep_event()
{ {
Serial.println("$I$ going to sleep in 3 seconds!"); Serial.println("$I$ going to sleep in 3 seconds!");
if (measured_weight != -1 && measured_fat != -1 && measured_water != -1 && measured_muscle != -1) { if (measured_user_id != -1 && measured_weight != -1 && measured_fat != -1 && measured_water != -1 && measured_muscle != -1) {
write_scale_data(measured_weight, measured_fat, measured_water, measured_muscle); write_scale_data(measured_user_id, measured_weight, measured_fat, measured_water, measured_muscle);
delay(100); delay(100);
} }
@@ -155,6 +155,7 @@ void after_sleep_event()
{ {
digitalWrite(EXT_SWITCH_PIN, HIGH); digitalWrite(EXT_SWITCH_PIN, HIGH);
measured_user_id = -1;
measured_weight = -1; measured_weight = -1;
measured_fat = -1; measured_fat = -1;
measured_water = -1; measured_water = -1;
@@ -209,6 +210,7 @@ For storing the measured values I first defined a struct "scale_data".
```C ```C
typedef struct scale_data{ typedef struct scale_data{
byte user_id;
int year; int year;
byte month; byte month;
byte day; byte day;
@@ -230,13 +232,14 @@ The attribute `__attribute__ ((packed))` is important to avoid byte padding in t
I2C_eeprom eeprom(0x50); I2C_eeprom eeprom(0x50);
void write_scale_data(int weight, int fat, int water, int muscle) void write_scale_data(int user_id, int weight, int fat, int water, int muscle)
{ {
int data_size = 0; int data_size = 0;
struct scale_data wdata; struct scale_data wdata;
eeprom.readBlock(0, (uint8_t*)&data_size, sizeof(data_size)); eeprom.readBlock(0, (uint8_t*)&data_size, sizeof(data_size));
wdata.user_id = user_id;
wdata.year = year(); wdata.year = year();
wdata.month = month(); wdata.month = month();
wdata.day = day(); wdata.day = day();
@@ -268,6 +271,7 @@ int calc_checksum(struct scale_data* wdata)
{ {
int checksum = 0; int checksum = 0;
checksum ^= wdata->user_id;
checksum ^= wdata->year; checksum ^= wdata->year;
checksum ^= wdata->month; checksum ^= wdata->month;
checksum ^= wdata->day; checksum ^= wdata->day;
@@ -307,7 +311,7 @@ void send_scale_data()
} }
Serial.print("$D$"); Serial.print("$D$");
Serial.print(i); Serial.print(wdata.user_id);
Serial.print(','); Serial.print(',');
Serial.print(wdata.year); Serial.print(wdata.year);
Serial.print(','); Serial.print(',');
@@ -820,6 +824,7 @@ RunningMedian<char, MAX_SAMPLE_SIZE> seg_samples_4;
int sample_count = 0; int sample_count = 0;
int measured_user_id = -1;
int measured_weight = -1; int measured_weight = -1;
int measured_fat = -1; int measured_fat = -1;
int measured_water = -1; int measured_water = -1;
@@ -862,6 +867,10 @@ void loop()
measured_muscle = char_to_int(seg_value_1) + char_to_int(seg_value_2)*10 + char_to_int(seg_value_3)*100; measured_muscle = char_to_int(seg_value_1) + char_to_int(seg_value_2)*10 + char_to_int(seg_value_3)*100;
} }
if (seg_value_4 == 'P') {
measured_user_id = char_to_int(seg_value_1) - 1;
}
sample_count = 0; sample_count = 0;
} }
... ...