rik/arduino-lcdkeypad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean project for successful make with renamed proto file

Browse Source
This commit is contained in:
Rik Veenboer
2016-08-27 17:01:39 +01:00
parent b58331bc28
commit 23eba94e9d
7 changed files with 57 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitmodules vendored
View File

@@ -3,7 +3,4 @@
url = https://github.com/google/protobuf.git
[submodule "nanopb"]
path = nanopb
url = https://github.com/nanopb/nanopb.git
[submodule "lib/TM1638"]
path = lib/TM1638
url = https://github.com/Boukefalos/tm1638-library.git
url = https://github.com/nanopb/nanopb.git

4
Makefile
View File

@@ -3,7 +3,7 @@ GOOGLE_PROTOBUF_INCLUDES = protobuf/src
NANOPB_DIR = nanopb/generator
PROTO_INCLUDES = -I$(PROTO_DIR) -I$(GOOGLE_PROTOBUF_INCLUDES) -I$(NANOPB_DIR)/proto
all: nanopb tm1638.pb
all: nanopb lcdkeypad.pb
nanopb: nanopb_nanopb nanopb_plugin
cp nanopb/pb.h src
@@ -27,4 +27,4 @@ run:
platformio run
test:
g++ src/pb_common.c src/pb_decode.c src/pb_encode.c src/tm1638.pb.c test.cpp -o test -Isrc
g++ src/pb_common.c src/pb_decode.c src/pb_encode.c src/lcdkeypad.pb.c test.cpp -o test -Isrc

0
proto/tm1638.proto → proto/lcdkeypad.proto
View File

138
src/main.cpp
View File

@@ -1,26 +1,17 @@
// #include <stdint.h>
#include "Arduino.h"
// extern "C" {
// #include "pb_decode.h"
// #include "pb_encode.h"
// #include "tm1638.pb.h"
// }
extern "C" {
#include "pb_decode.h"
#include "pb_encode.h"
#include "lcdkeypad.pb.h"
}
//Sample using LiquidCrystal library
#include <LiquidCrystal.h>
/*******************************************************
This program will test the LCD panel and the buttons
Mark Bramwell, July 2010
********************************************************/
// select the pins used on the LCD panel
// Select the pins used on the LCD panel
LiquidCrystal lcd(8, 9, 4, 5, 6, 7);
// define some values used by the panel and buttons
// Define some values used by the panel and buttons
int lcd_key = 0;
int adc_key_in = 0;
#define btnRIGHT 0
@@ -30,81 +21,60 @@ int adc_key_in = 0;
#define btnSELECT 4
#define btnNONE 5
// read the buttons
int read_LCD_buttons()
{
adc_key_in = analogRead(0); // read the value from the sensor
// my buttons when read are centered at these valies: 0, 144, 329, 504, 741
// we add approx 50 to those values and check to see if we are close
if (adc_key_in > 1000) return btnNONE; // We make this the 1st option for speed reasons since it will be the most likely result
// For V1.1 us this threshold
// if (adc_key_in < 50) return btnRIGHT;
// if (adc_key_in < 250) return btnUP;
// if (adc_key_in < 450) return btnDOWN;
// if (adc_key_in < 650) return btnLEFT;
// if (adc_key_in < 850) return btnSELECT;
// Read the buttons
int read_LCD_buttons() {
// Read the value from the sensor
adc_key_in = analogRead(0);
// For V1.0 comment the other threshold and use the one below:
// Map buttons (v1.0 hardware)
if (adc_key_in > 1000) return btnNONE;
if (adc_key_in < 50) return btnRIGHT;
if (adc_key_in < 195) return btnUP;
if (adc_key_in < 380) return btnDOWN;
if (adc_key_in < 555) return btnLEFT;
if (adc_key_in < 790) return btnSELECT;
if (adc_key_in < 50) return btnRIGHT;
if (adc_key_in < 195) return btnUP;
if (adc_key_in < 380) return btnDOWN;
if (adc_key_in < 555) return btnLEFT;
if (adc_key_in < 790) return btnSELECT;
return btnNONE; // when all others fail, return this...
return btnNONE; // when all others fail, return this...
}
void setup()
{
lcd.begin(16, 2); // start the library
lcd.setCursor(0,0);
lcd.print("Push the buttons"); // print a simple message
void setup() {
lcd.begin(16, 2);
lcd.setCursor(0, 0);
lcd.print("Push the buttons");
}
void loop()
{
lcd.setCursor(9,1); // move cursor to second line "1" and 9 spaces over
lcd.print(millis()/1000); // display seconds elapsed since power-up
void loop() {
// Move cursor to second line "1" and 9 spaces over
lcd.setCursor(9, 1);
// Display seconds elapsed since power-up
lcd.print(millis()/1000);
lcd.setCursor(0,1); // move to the begining of the second line
lcd_key = read_LCD_buttons(); // read the buttons
// Move to the start of the second line
lcd.setCursor(0, 1);
switch (lcd_key) // depending on which button was pushed, we perform an action
{
case btnRIGHT:
{
lcd.print("RIGHT ");
break;
}
case btnLEFT:
{
lcd.print("LEFT ");
break;
}
case btnUP:
{
lcd.print("UP ");
break;
}
case btnDOWN:
{
lcd.print("DOWN ");
break;
}
case btnSELECT:
{
lcd.print("SELECT");
break;
}
case btnNONE:
{
lcd.print("NONE ");
break;
}
}
// Read the buttons
lcd_key = read_LCD_buttons();
}
// Print button status
switch (lcd_key) {
case btnRIGHT:
lcd.print("RIGHT ");
break;
case btnLEFT:
lcd.print("LEFT ");
break;
case btnUP:
lcd.print("UP ");
break;
case btnDOWN:
lcd.print("DOWN ");
break;
case btnSELECT:
lcd.print("SELECT");
break;
case btnNONE:
lcd.print("NONE ");
break;
}
}

BIN
test.buffer
View File

Binary file not shown.

50
test.cpp
View File

@@ -1,50 +0,0 @@
#include <stdint.h>
#include <stdio.h>
#include <string.h>
extern "C" {
#include "pb_decode.h"
#include "pb_encode.h"
#include "tm1638.pb.h"
}
#define BUFFER_SIZE 256
bool callbackFont(pb_istream_t *stream, const pb_field_t *field, void **arg) {
memset(*arg, 0, BUFFER_SIZE);
int length = stream->bytes_left;
if (length > BUFFER_SIZE - 1) {
return false;
}
if (!pb_read(stream, (uint8_t*) *arg, length)) {
return false;
}
return true;
}
int main() {
FILE *fp = fopen("test.buffer", "r");
int packet_size = fgetc(fp);
uint8_t in_buffer[BUFFER_SIZE];
int bytes_read = fread((char*) in_buffer, 1, packet_size, fp);
if (bytes_read != packet_size) {
printf("length problem");
return 1;
}
pb_istream_t istream = pb_istream_from_buffer(in_buffer, bytes_read);
_tm1638_Command command;
command.setDisplayToString.string.funcs.decode = &callbackFont;
if (!pb_decode(&istream, tm1638_Command_fields, &command)) {
printf("decode problem");
return 1;
}
tm1638_SetDisplayToString setDisplayToString = command.setDisplayToString;
char dots = setDisplayToString.dots;
char pos = setDisplayToString.dots;
printf("%s\n", setDisplayToString.string.arg);
return 0;
}

BIN
test.exe
View File

Binary file not shown.