X-Git-Url: https://git.hcoop.net/clinton/Smoothieware.git/blobdiff_plain/fddf62959467d18aefa34f1484bbb0e16de22092..1c20d2ebff8366be6855aae8bee09eafb4f433e4:/src/modules/utils/panel/Panel.cpp
diff --git a/src/modules/utils/panel/Panel.cpp b/src/modules/utils/panel/Panel.cpp
index 64d0586c..137b8e23 100644
--- a/src/modules/utils/panel/Panel.cpp
+++ b/src/modules/utils/panel/Panel.cpp
@@ -1,8 +1,8 @@
-/*
+/*
This file is part of Smoothie (http://smoothieware.org/). The motion control part is heavily based on Grbl (https://github.com/simen/grbl).
Smoothie is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
Smoothie is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- You should have received a copy of the GNU General Public License along with Smoothie. If not, see .
+ You should have received a copy of the GNU General Public License along with Smoothie. If not, see .
*/
#include "libs/Kernel.h"
@@ -20,6 +20,7 @@ using namespace std;
#include "panels/VikiLCD.h"
#include "panels/Smoothiepanel.h"
#include "panels/ReprapDiscountGLCD.h"
+#include "panels/ST7565.h"
#include "version.h"
Panel::Panel(){
@@ -44,7 +45,7 @@ void Panel::on_module_loaded(){
if( !this->kernel->config->value( panel_checksum, enable_checksum )->by_default(false)->as_bool() ){
delete this;
return;
- }
+ }
// Initialise the LCD, see which LCD to use
if (this->lcd != NULL) delete this->lcd;
@@ -63,6 +64,8 @@ void Panel::on_module_loaded(){
this->lcd = new Smoothiepanel();
}else if(lcd_cksm == rrd_glcd_checksum) {
this->lcd = new ReprapDiscountGLCD();
+ }else if(lcd_cksm == st7565_glcd_checksum) {
+ this->lcd = new ST7565();
}else{
// no lcd type defined
return;
@@ -73,7 +76,7 @@ void Panel::on_module_loaded(){
// the number of screen lines the panel supports
this->screen_lines= this->lcd->get_screen_lines();
-
+
// some encoders may need more clicks to move menu, this is a divisor and is in config as it is
// an end user usability issue
this->menu_offset = this->kernel->config->value( panel_checksum, menu_offset_checksum )->by_default(0)->as_number();
@@ -88,7 +91,7 @@ void Panel::on_module_loaded(){
default_bed_temperature= this->kernel->config->value( panel_checksum, bed_temp_checksum )->by_default(60.0)->as_number();
this->encoder_click_resolution= this->lcd->getEncoderResolution();
-
+
this->up_button.up_attach( this, &Panel::on_up );
this->down_button.up_attach( this, &Panel::on_down );
this->click_button.up_attach( this, &Panel::on_select );
@@ -97,10 +100,11 @@ void Panel::on_module_loaded(){
this->kernel->slow_ticker->attach( 100, this, &Panel::button_tick );
this->kernel->slow_ticker->attach( 1000, this, &Panel::encoder_check );
-
+
// Register for events
this->register_for_event(ON_IDLE);
this->register_for_event(ON_MAIN_LOOP);
+ this->register_for_event(ON_GCODE_RECEIVED);
// Refresh timer
this->kernel->slow_ticker->attach( 20, this, &Panel::refresh_tick );
@@ -127,7 +131,7 @@ uint32_t Panel::refresh_tick(uint32_t dummy){
return 0;
}
-// Encoder pins changed
+// Encoder pins changed in interrupt
uint32_t Panel::encoder_check(uint32_t dummy){
// TODO if encoder reads go through i2c like on smoothie panel this needs to be
// optionally done in idle loop, however when reading encoder directly it needs to be done
@@ -150,6 +154,18 @@ uint32_t Panel::button_tick(uint32_t dummy){
return 0;
}
+void Panel::on_gcode_received(void* argument)
+{
+ Gcode* gcode = static_cast(argument);
+ if( gcode->has_m) {
+ if( gcode->m == 117 ) { // set LCD message
+ this->message= get_arguments(gcode->command);
+ if(this->message.size() > 20) this->message= this->message.substr(0, 20);
+ gcode->mark_as_taken();
+ }
+ }
+}
+
// on main loop, we can send gcodes or do anything that waits in this loop
void Panel::on_main_loop(void* argument){
if(this->current_screen != NULL) {
@@ -158,17 +174,28 @@ void Panel::on_main_loop(void* argument){
}
}
+
+#define ohw_logo_antipixel_width 80
+#define ohw_logo_antipixel_height 15
+static const uint8_t ohw_logo_antipixel_bits[] = {
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF, 0xFF,0xFF,0x80,0x00,0x00,0x00,0x00,0x00,
+ 0x00,0x00,0x00,0x01,0x80,0x0C,0x00,0x33, 0x18,0xBB,0xFF,0xFF,0xFF,0xFD,0x80,0x5E,
+ 0x80,0x2D,0x6B,0x9B,0xFF,0xFF,0xFF,0xFD, 0x80,0xFF,0xC0,0x2D,0x18,0xAB,0xFF,0xFF,
+ 0xFF,0xFD,0x80,0xFF,0xC0,0x2D,0x7B,0xB3, 0xFF,0xFF,0xFF,0xFD,0x80,0x7F,0x80,0x33,
+ 0x78,0xBB,0xFF,0xFF,0xFF,0xFD,0x81,0xF3, 0xE0,0x3F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFD,
+ 0x81,0xF3,0xE0,0x3F,0xFD,0xB3,0x18,0xDD, 0x98,0xC5,0x81,0xF3,0xE0,0x3F,0xFD,0xAD,
+ 0x6B,0x5D,0x6B,0x5D,0x80,0x73,0x80,0x3F, 0xFC,0x21,0x1B,0x55,0x08,0xC5,0x80,0xF3,
+ 0xC0,0x3F,0xFD,0xAD,0x5B,0x49,0x6A,0xDD, 0x80,0xE1,0xC0,0x3F,0xFD,0xAD,0x68,0xDD,
+ 0x6B,0x45,0x80,0x00,0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x01,0xFF,0xFF,0xFF,0xFF,
+ 0xFF,0xFF,0xFF,0xFF,0xFF,0xFF
+};
+
// On idle things, we don't want to do shit in interrupts
// don't queue gcodes in this
void Panel::on_idle(void* argument){
if(this->start_up) {
this->lcd->init();
- if(this->lcd->hasGraphics()) {
- // TODO display nifty graphics startup screen
-
- }
-
Version v;
string build(v.get_build());
string date(v.get_build_date());
@@ -178,13 +205,17 @@ void Panel::on_idle(void* argument){
this->lcd->setCursor(0,2); this->lcd->printf("%s", date.substr(0, 20).c_str());
this->lcd->setCursor(0,3); this->lcd->printf("Please wait....");
+ if(this->lcd->hasGraphics()) {
+ this->lcd->bltGlyph(24, 40, ohw_logo_antipixel_width, ohw_logo_antipixel_height, ohw_logo_antipixel_bits);
+ }
+
this->lcd->on_refresh(true); // tell lcd to display now
// Default top screen
this->top_screen = new MainMenuScreen();
this->top_screen->set_panel(this);
this->start_up= false;
- this->idle_time= 20*3; // only show for 2 seconds
+ //this->idle_time= 20*3; // only show for 2 seconds
}
// after being idle for a while switch to Watch screen
@@ -194,10 +225,10 @@ void Panel::on_idle(void* argument){
this->enter_screen(this->top_screen->watch_screen);
// TODO do we need to reset any state?
}
-
+
return;
}
-
+
if(this->do_buttons) {
// we don't want to do I2C in interrupt mode
this->do_buttons = false;
@@ -215,7 +246,7 @@ void Panel::on_idle(void* argument){
this->click_button.check_signal(but&BUTTON_SELECT);
this->pause_button.check_signal(but&BUTTON_PAUSE);
}
-
+
// If we are in menu mode and the position has changed
if( this->mode == MENU_MODE && this->counter_change() ){
this->menu_update();
@@ -297,28 +328,29 @@ void Panel::setup_menu(uint16_t rows){
void Panel::setup_menu(uint16_t rows, uint16_t lines){
this->menu_selected_line = 0;
- this->menu_start_line = 0;
+ this->menu_current_line= 0;
+ this->menu_start_line = 0;
this->menu_rows = rows;
this->menu_lines = lines;
}
-uint16_t Panel::menu_current_line(){
- return this->menu_selected_line >> this->menu_offset;
-}
-
void Panel::menu_update(){
+ // Limits, up and down
+ // NOTE menu_selected_line is changed in an interrupt and can change at any time
+ int msl= this->menu_selected_line; // hopefully this is atomic
+ msl = msl % ( this->menu_rows<menu_offset );
+ while( msl < 0 ){ msl += this->menu_rows << this->menu_offset; }
+ this->menu_selected_line= msl; // update atomically we hope
- // Limits, up and down
- this->menu_selected_line = this->menu_selected_line % ( this->menu_rows<menu_offset );
- while( this->menu_selected_line < 0 ){ this->menu_selected_line += this->menu_rows << this->menu_offset; }
+ this->menu_current_line= msl >> this->menu_offset;
// What to display
this->menu_start_line = 0;
if( this->menu_rows > this->menu_lines ){
- if( this->menu_current_line() >= 2 ){
- this->menu_start_line = this->menu_current_line() - 1;
+ if( this->menu_current_line >= 2 ){
+ this->menu_start_line = this->menu_current_line - 1;
}
- if( this->menu_current_line() > this->menu_rows - this->menu_lines ){
+ if( this->menu_current_line > this->menu_rows - this->menu_lines ){
this->menu_start_line = this->menu_rows - this->menu_lines;
}
}
@@ -334,14 +366,11 @@ bool Panel::control_value_change(){
if( this->control_value_changed ){ this->control_value_changed = false; return true; }else{ return false; }
}
-
bool Panel::enter_control_mode(double passed_normal_increment, double passed_pressed_increment){
this->mode = CONTROL_MODE;
this->normal_increment = passed_normal_increment;
- this->pressed_increment = passed_pressed_increment;
this->counter = &this->control_normal_counter;
this->control_normal_counter = 0;
- this->control_pressed_counter = 0;
this->control_base_value = 0;
return true;
}