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

add internal basic support for multiple users.

Browse Source
This commit is contained in:
OliE
2015-01-02 18:15:50 +01:00
parent c0701e99b7
commit a3aa38bf66
5 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arduino_mcu/openScale_MCU/openScale_MCU.ino
View File

@@ -73,12 +73,14 @@ int no_activity_cycles = 0;
volatile boolean sleep_state = true;
int measured_user_id = -1;
int measured_weight = -1;
int measured_fat = -1;
int measured_water = -1;
int measured_muscle = -1;
typedef struct scale_data{
byte user_id;
int year;
byte month;
byte day;
@@ -217,8 +219,8 @@ void before_sleep_event()
{
Serial.println("$I$ going to sleep in 3 seconds!");
if (measured_weight != -1 && measured_fat != -1 && measured_water != -1 && measured_muscle != -1) {
write_scale_data(measured_weight, measured_fat, measured_water, measured_muscle);
if (measured_user_id != -1 && measured_weight != -1 && measured_fat != -1 && measured_water != -1 && measured_muscle != -1) {
write_scale_data(measured_user_id, measured_weight, measured_fat, measured_water, measured_muscle);
delay(100);
}
@@ -233,6 +235,7 @@ void after_sleep_event()
{
digitalWrite(EXT_SWITCH_PIN, HIGH);
measured_user_id = -1;
measured_weight = -1;
measured_fat = -1;
measured_water = -1;
@@ -299,6 +302,7 @@ int calc_checksum(struct scale_data* wdata)
{
int checksum = 0;
checksum ^= wdata->user_id;
checksum ^= wdata->year;
checksum ^= wdata->month;
checksum ^= wdata->day;
@@ -312,13 +316,14 @@ int calc_checksum(struct scale_data* wdata)
return checksum;
}
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;
struct scale_data wdata;
eeprom.readBlock(0, (uint8_t*)&data_size, sizeof(data_size));
wdata.user_id = user_id;
wdata.year = year();
wdata.month = month();
wdata.day = day();
@@ -363,7 +368,7 @@ void send_scale_data()
}
Serial.print("$D$");
Serial.print(i);
Serial.print(wdata.user_id);
Serial.print(',');
Serial.print(wdata.year);
Serial.print(',');
@@ -471,6 +476,10 @@ void loop()
if (seg_value_4 == 'M') {
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; // user id starts by 0
}
sample_count = 0;
}
@@ -509,7 +518,7 @@ int char_to_int(char c)
void print_debug_output()
{
Serial.print("Debug Ausgabe\n");
Serial.print("Debug output\n");
Serial.print("-----------------------------------\n");
Serial.print("\nSeg 1\n");
for (int i=0; i<4; i++)