config
This commit is contained in:
@ -75,10 +75,9 @@ int main (void) {
|
||||
init();
|
||||
ledInit();
|
||||
ls7366rInit(SPI_CHAN);
|
||||
sinkSenderInit();
|
||||
sinkSenderInit(&cfg);
|
||||
start();
|
||||
|
||||
uint8_t ledTick = 0;
|
||||
struct timespec timestamp;
|
||||
uint32_t last_seconds = 0;
|
||||
uint32_t last_milliseconds = 0;
|
||||
@ -92,13 +91,11 @@ int main (void) {
|
||||
uint32_t current_seconds = timestamp.tv_sec;
|
||||
uint32_t current_milliseconds = timestamp.tv_nsec / 1e6;
|
||||
uint32_t duration = ((current_seconds - last_seconds) * 1000) + (current_milliseconds - last_milliseconds);
|
||||
// logmsg(LOG_DEBUG, "s: %lu, ns: %lu, d: %lu, p: %lu", current_seconds, current_milliseconds, duration, period);
|
||||
|
||||
mainsCntSum += period;
|
||||
mainsCntCnt += 1;
|
||||
|
||||
if (duration >= 1000) {
|
||||
logmsg(LOG_DEBUG, "one second is over");
|
||||
last_seconds = current_seconds;
|
||||
last_milliseconds = current_milliseconds;
|
||||
|
||||
@ -109,15 +106,6 @@ int main (void) {
|
||||
|
||||
sinkSenderPut(current_seconds, freq);
|
||||
}
|
||||
|
||||
|
||||
|
||||
ledTick++;
|
||||
if (ledTick == 50) {
|
||||
ledTick = 0;
|
||||
led(E_GREEN, false);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
// will never be reached
|
||||
|
||||
158
src/sha256.c
Normal file
158
src/sha256.c
Normal file
@ -0,0 +1,158 @@
|
||||
/*********************************************************************
|
||||
* Filename: sha256.c
|
||||
* Author: Brad Conte (brad AT bradconte.com)
|
||||
* Copyright:
|
||||
* Disclaimer: This code is presented "as is" without any guarantees.
|
||||
* Details: Implementation of the SHA-256 hashing algorithm.
|
||||
SHA-256 is one of the three algorithms in the SHA2
|
||||
specification. The others, SHA-384 and SHA-512, are not
|
||||
offered in this implementation.
|
||||
Algorithm specification can be found here:
|
||||
* http://csrc.nist.gov/publications/fips/fips180-2/fips180-2withchangenotice.pdf
|
||||
This implementation uses little endian byte order.
|
||||
*********************************************************************/
|
||||
|
||||
/*************************** HEADER FILES ***************************/
|
||||
#include <stdlib.h>
|
||||
#include <memory.h>
|
||||
#include "sha256.h"
|
||||
|
||||
/****************************** MACROS ******************************/
|
||||
#define ROTLEFT(a,b) (((a) << (b)) | ((a) >> (32-(b))))
|
||||
#define ROTRIGHT(a,b) (((a) >> (b)) | ((a) << (32-(b))))
|
||||
|
||||
#define CH(x,y,z) (((x) & (y)) ^ (~(x) & (z)))
|
||||
#define MAJ(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
|
||||
#define EP0(x) (ROTRIGHT(x,2) ^ ROTRIGHT(x,13) ^ ROTRIGHT(x,22))
|
||||
#define EP1(x) (ROTRIGHT(x,6) ^ ROTRIGHT(x,11) ^ ROTRIGHT(x,25))
|
||||
#define SIG0(x) (ROTRIGHT(x,7) ^ ROTRIGHT(x,18) ^ ((x) >> 3))
|
||||
#define SIG1(x) (ROTRIGHT(x,17) ^ ROTRIGHT(x,19) ^ ((x) >> 10))
|
||||
|
||||
/**************************** VARIABLES *****************************/
|
||||
static const WORD k[64] = {
|
||||
0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5,0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5,
|
||||
0xd807aa98,0x12835b01,0x243185be,0x550c7dc3,0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174,
|
||||
0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc,0x2de92c6f,0x4a7484aa,0x5cb0a9dc,0x76f988da,
|
||||
0x983e5152,0xa831c66d,0xb00327c8,0xbf597fc7,0xc6e00bf3,0xd5a79147,0x06ca6351,0x14292967,
|
||||
0x27b70a85,0x2e1b2138,0x4d2c6dfc,0x53380d13,0x650a7354,0x766a0abb,0x81c2c92e,0x92722c85,
|
||||
0xa2bfe8a1,0xa81a664b,0xc24b8b70,0xc76c51a3,0xd192e819,0xd6990624,0xf40e3585,0x106aa070,
|
||||
0x19a4c116,0x1e376c08,0x2748774c,0x34b0bcb5,0x391c0cb3,0x4ed8aa4a,0x5b9cca4f,0x682e6ff3,
|
||||
0x748f82ee,0x78a5636f,0x84c87814,0x8cc70208,0x90befffa,0xa4506ceb,0xbef9a3f7,0xc67178f2
|
||||
};
|
||||
|
||||
/*********************** FUNCTION DEFINITIONS ***********************/
|
||||
void sha256_transform(SHA256_CTX *ctx, const BYTE data[])
|
||||
{
|
||||
WORD a, b, c, d, e, f, g, h, i, j, t1, t2, m[64];
|
||||
|
||||
for (i = 0, j = 0; i < 16; ++i, j += 4)
|
||||
m[i] = (data[j] << 24) | (data[j + 1] << 16) | (data[j + 2] << 8) | (data[j + 3]);
|
||||
for ( ; i < 64; ++i)
|
||||
m[i] = SIG1(m[i - 2]) + m[i - 7] + SIG0(m[i - 15]) + m[i - 16];
|
||||
|
||||
a = ctx->state[0];
|
||||
b = ctx->state[1];
|
||||
c = ctx->state[2];
|
||||
d = ctx->state[3];
|
||||
e = ctx->state[4];
|
||||
f = ctx->state[5];
|
||||
g = ctx->state[6];
|
||||
h = ctx->state[7];
|
||||
|
||||
for (i = 0; i < 64; ++i) {
|
||||
t1 = h + EP1(e) + CH(e,f,g) + k[i] + m[i];
|
||||
t2 = EP0(a) + MAJ(a,b,c);
|
||||
h = g;
|
||||
g = f;
|
||||
f = e;
|
||||
e = d + t1;
|
||||
d = c;
|
||||
c = b;
|
||||
b = a;
|
||||
a = t1 + t2;
|
||||
}
|
||||
|
||||
ctx->state[0] += a;
|
||||
ctx->state[1] += b;
|
||||
ctx->state[2] += c;
|
||||
ctx->state[3] += d;
|
||||
ctx->state[4] += e;
|
||||
ctx->state[5] += f;
|
||||
ctx->state[6] += g;
|
||||
ctx->state[7] += h;
|
||||
}
|
||||
|
||||
void sha256_init(SHA256_CTX *ctx)
|
||||
{
|
||||
ctx->datalen = 0;
|
||||
ctx->bitlen = 0;
|
||||
ctx->state[0] = 0x6a09e667;
|
||||
ctx->state[1] = 0xbb67ae85;
|
||||
ctx->state[2] = 0x3c6ef372;
|
||||
ctx->state[3] = 0xa54ff53a;
|
||||
ctx->state[4] = 0x510e527f;
|
||||
ctx->state[5] = 0x9b05688c;
|
||||
ctx->state[6] = 0x1f83d9ab;
|
||||
ctx->state[7] = 0x5be0cd19;
|
||||
}
|
||||
|
||||
void sha256_update(SHA256_CTX *ctx, const BYTE data[], size_t len)
|
||||
{
|
||||
WORD i;
|
||||
|
||||
for (i = 0; i < len; ++i) {
|
||||
ctx->data[ctx->datalen] = data[i];
|
||||
ctx->datalen++;
|
||||
if (ctx->datalen == 64) {
|
||||
sha256_transform(ctx, ctx->data);
|
||||
ctx->bitlen += 512;
|
||||
ctx->datalen = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void sha256_final(SHA256_CTX *ctx, BYTE hash[])
|
||||
{
|
||||
WORD i;
|
||||
|
||||
i = ctx->datalen;
|
||||
|
||||
// Pad whatever data is left in the buffer.
|
||||
if (ctx->datalen < 56) {
|
||||
ctx->data[i++] = 0x80;
|
||||
while (i < 56)
|
||||
ctx->data[i++] = 0x00;
|
||||
}
|
||||
else {
|
||||
ctx->data[i++] = 0x80;
|
||||
while (i < 64)
|
||||
ctx->data[i++] = 0x00;
|
||||
sha256_transform(ctx, ctx->data);
|
||||
memset(ctx->data, 0, 56);
|
||||
}
|
||||
|
||||
// Append to the padding the total message's length in bits and transform.
|
||||
ctx->bitlen += ctx->datalen * 8;
|
||||
ctx->data[63] = ctx->bitlen;
|
||||
ctx->data[62] = ctx->bitlen >> 8;
|
||||
ctx->data[61] = ctx->bitlen >> 16;
|
||||
ctx->data[60] = ctx->bitlen >> 24;
|
||||
ctx->data[59] = ctx->bitlen >> 32;
|
||||
ctx->data[58] = ctx->bitlen >> 40;
|
||||
ctx->data[57] = ctx->bitlen >> 48;
|
||||
ctx->data[56] = ctx->bitlen >> 56;
|
||||
sha256_transform(ctx, ctx->data);
|
||||
|
||||
// Since this implementation uses little endian byte ordering and SHA uses big endian,
|
||||
// reverse all the bytes when copying the final state to the output hash.
|
||||
for (i = 0; i < 4; ++i) {
|
||||
hash[i] = (ctx->state[0] >> (24 - i * 8)) & 0x000000ff;
|
||||
hash[i + 4] = (ctx->state[1] >> (24 - i * 8)) & 0x000000ff;
|
||||
hash[i + 8] = (ctx->state[2] >> (24 - i * 8)) & 0x000000ff;
|
||||
hash[i + 12] = (ctx->state[3] >> (24 - i * 8)) & 0x000000ff;
|
||||
hash[i + 16] = (ctx->state[4] >> (24 - i * 8)) & 0x000000ff;
|
||||
hash[i + 20] = (ctx->state[5] >> (24 - i * 8)) & 0x000000ff;
|
||||
hash[i + 24] = (ctx->state[6] >> (24 - i * 8)) & 0x000000ff;
|
||||
hash[i + 28] = (ctx->state[7] >> (24 - i * 8)) & 0x000000ff;
|
||||
}
|
||||
}
|
||||
35
src/sha256.h
Normal file
35
src/sha256.h
Normal file
@ -0,0 +1,35 @@
|
||||
/*********************************************************************
|
||||
* Filename: sha256.h
|
||||
* Author: Brad Conte (brad AT bradconte.com)
|
||||
* Copyright:
|
||||
* Disclaimer: This code is presented "as is" without any guarantees.
|
||||
* Details: Defines the API for the corresponding SHA1 implementation.
|
||||
*********************************************************************/
|
||||
|
||||
#ifndef SHA256_H
|
||||
#define SHA256_H
|
||||
|
||||
/*************************** HEADER FILES ***************************/
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
|
||||
/****************************** MACROS ******************************/
|
||||
#define SHA256_BLOCK_SIZE 32 // SHA256 outputs a 32 byte digest
|
||||
|
||||
/**************************** DATA TYPES ****************************/
|
||||
typedef uint8_t BYTE; // 8-bit byte
|
||||
typedef uint32_t WORD; // 32-bit word, change to "long" for 16-bit machines
|
||||
|
||||
typedef struct {
|
||||
BYTE data[64];
|
||||
WORD datalen;
|
||||
unsigned long long bitlen;
|
||||
WORD state[8];
|
||||
} SHA256_CTX;
|
||||
|
||||
/*********************** FUNCTION DECLARATIONS **********************/
|
||||
void sha256_init(SHA256_CTX *ctx);
|
||||
void sha256_update(SHA256_CTX *ctx, const BYTE data[], size_t len);
|
||||
void sha256_final(SHA256_CTX *ctx, BYTE hash[]);
|
||||
|
||||
#endif // SHA256_H
|
||||
@ -1,11 +1,62 @@
|
||||
#include <stdint.h>
|
||||
#include "sinkSender.h"
|
||||
#include "logging.h"
|
||||
#include "led.h"
|
||||
#include "sinkStruct.h"
|
||||
#include "sha256.h"
|
||||
#include "libconfig.h"
|
||||
|
||||
void sinkSenderInit() {
|
||||
|
||||
const char SINKSERVER_KEY[] = "sinkServer";
|
||||
const char DEFAULT_SINKSERVER[] = "sink.hottis.de";
|
||||
const char *sinkServer;
|
||||
const char SINKPORT_KEY[] = "sinkPort";
|
||||
const uint16_t DEFAULT_SINKPORT = 20169;
|
||||
const uint16_t sinkPort;
|
||||
const char DEVICE_ID_KEY[] = "deviceId";
|
||||
const char DEFAULT_DEVICE_ID[] = "mainscnt00";
|
||||
const char *deviceId;
|
||||
const char SHARED_SECRET_KEY[] = "sharedSecret";
|
||||
const char DEFAULT_SHARED_SECRET[] = "1234567890123456789012345678901";
|
||||
const char *sharedSecret;
|
||||
|
||||
static t_minuteBuffer minuteBuffer;
|
||||
static uint32_t secondOfMinute;
|
||||
|
||||
|
||||
void sinkSenderInit(config_t *pCfg) {
|
||||
if (! config_lookup_string(pCfg, SINKSERVER_KEY, &sinkServer)) {
|
||||
sinkServer = DEFAULT_SINKSERVER;
|
||||
}
|
||||
fprintf(stderr, "CONFIG: sinkServer=%s\n", sinkServer);
|
||||
if (! config_lookup_int(pCfg, SINKPORT_KEY, &sinkPort)) {
|
||||
sinkPort = DEFAULT_SINKPORT;
|
||||
}
|
||||
fprintf(stderr, "CONFIG: sinkPort=%u\n", sinkPort);
|
||||
if (! config_lookup_string(pCfg, DEVICE_ID_KEY, &deviceId)) {
|
||||
deviceId = DEFAULT_DEVICE_ID;
|
||||
}
|
||||
fprintf(stderr, "CONFIG: deviceId=%s\n", deviceId);
|
||||
if (! config_lookup_string(pCfg, SHARED_SECRET_KEY, &sharedSecret)) {
|
||||
sharedSecret = DEFAULT_SHARED_SECRET;
|
||||
}
|
||||
fprintf(stderr, "CONFIG: sharedSecret=%s\n", sharedSecret);
|
||||
|
||||
|
||||
secondOfMinute = 0;
|
||||
}
|
||||
|
||||
void sinkSenderPut(uint32_t seconds, uint32_t frequency) {
|
||||
led(E_GREEN, false);
|
||||
logmsg(LOG_DEBUG, "s: %lu, f: %lu", seconds, frequency);
|
||||
|
||||
if (secondOfMinute == 0) {
|
||||
minuteBuffer.s.timestamp = seconds;
|
||||
}
|
||||
minuteBuffer.s.frequency[secondOfMinute] = frequency;
|
||||
|
||||
|
||||
|
||||
|
||||
led(E_GREEN, true);
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
#ifndef _SINKSENDER_H_
|
||||
#define _SINKSENDER_H_
|
||||
|
||||
void sinkSenderInit();
|
||||
void sinkSenderInit(config_t *pCfg);
|
||||
void sinkSenderPut(uint32_t seconds, uint32_t frequency);
|
||||
|
||||
#endif // _SINKSENDER_H_
|
||||
|
||||
26
src/sinkStruct.h
Normal file
26
src/sinkStruct.h
Normal file
@ -0,0 +1,26 @@
|
||||
#ifndef _SINKSTRUCT_H_
|
||||
#define _SINKSTRUCT_H_
|
||||
|
||||
#include <stdint.h>
|
||||
#include "sha256.h"
|
||||
|
||||
#define DEVICE_ID_SIZE 16
|
||||
#define SECONDS_PER_MINUTE 60
|
||||
|
||||
typedef struct __attribute__((__packed__)) {
|
||||
char deviceId[DEVICE_ID_SIZE];
|
||||
uint8_t hash[SHA256_BLOCK_SIZE];
|
||||
uint32_t totalRunningHours;
|
||||
uint32_t totalPowercycles;
|
||||
uint32_t totalWatchdogResets;
|
||||
uint32_t version;
|
||||
uint64_t timestamp;
|
||||
uint32_t frequency[SECONDS_PER_MINUTE];
|
||||
} t_minuteStruct;
|
||||
|
||||
typedef union {
|
||||
t_minuteStruct s;
|
||||
uint8_t b[sizeof(t_minuteStruct)];
|
||||
} t_minuteBuffer;
|
||||
|
||||
#endif // _SINKSTRUCT_H_
|
||||
Reference in New Issue
Block a user